us_core_test_kit 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0646308cfd9f7fae1d17b4b4b9c3f1cb3d09b1c6cfd9a649104beb0a65077672'
-  data.tar.gz: bd6a3a0fa4427eed31e61d93da2b327bb43eaccf9accf5146fb089601a34a22e
+  metadata.gz: bf568ad98ad25b70c1ae8993657adb8eccc83f9ffeee841e6bb3a51b79ed9f56
+  data.tar.gz: 2c2761194d8edf9c70744ff832016d4f9643851041690c0c8bd71004e947083f
 SHA512:
-  metadata.gz: bceab9b2ccb933f2af3931d342e7b8a86b4c5c258c2f57187d6bffe7c6856916a1d4db4b58878fcd549d3b8354fbacde2191ab6b0062bc361acb988a7fa2938a
-  data.tar.gz: 031b914039a12f0263230605c6256a57864e4f0780db9379626a207f100adf824bffe03f32f99a55c751e8bced04de27043c1e12237d68c269bd85a9ea4358bb
+  metadata.gz: ea6bce62760d108adaeb3905bca2611b52059391a99b5ade0515fa2de61069a4d8bfa7479bb4c79dc0637297c9123bd28c274a276776330c8076ae2c2065a8ac
+  data.tar.gz: a29e81c48dd8965fa62a064ff69552e64e7b4cab0bab917c55e9b6ff402e3a8566d234c879852674d271156f46d656149d5de1b66023c853194327d43a06edba

data/lib/us_core_test_kit/custom_groups/granted_granular_scopes_test.rb

@@ -13,18 +13,30 @@ module USCoreTestKit
           .options[:required_scopes]
           .map { |scope| scope[scope.index('/') + 1, scope.length] }
 
+      required_granular_regexes = 
+        required_granular_scopes.flat_map do |scope|
+          [ 
+            Regexp.new(Regexp.quote(scope).gsub(".rs", ".r?s")),
+            Regexp.new(Regexp.quote(scope).gsub(".rs", ".rs?"))
+          ]
+        end
+
       received_granular_scopes =
         received_scopes
           .split(' ')
           .select { |scope| scope.include? '?' }
           .map { |scope| scope[scope.index('/') + 1, scope.length] }
 
-      missing_scopes = required_granular_scopes - received_granular_scopes
+      missing_scopes = 
+        required_granular_regexes
+          .reject do |required_scope|
+            received_granular_scopes.any? { |received_scope| received_scope.match?(required_scope) }
+          end
 
-      wrapped_missing_scopes = missing_scopes.map { |scope| "`#{scope}`" }
+      wrapped_missing_scopes = missing_scopes.map { |scope| "`#{scope.source}`" }
 
       assert missing_scopes.empty?,
-             "The following granular scopes were not granted: #{wrapped_missing_scopes.to_sentence}"
+             "Granular scopes matching the following were not matched: #{wrapped_missing_scopes.to_sentence}"
 
       granular_scope_resource_types =
         required_granular_scopes

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -28,7 +28,7 @@ module USCoreTestKit
           if request.status != 200
             []
           else
-            fetch_all_bundled_resources
+            fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
           end
 
         mismatched_ids = mismatched_resource_ids(found_resources)
@@ -78,6 +78,7 @@ module USCoreTestKit
 
     def expected_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .select do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])
@@ -88,6 +89,7 @@ module USCoreTestKit
 
     def mismatched_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .reject do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])

data/lib/us_core_test_kit/search_test.rb

@@ -737,16 +737,19 @@ module USCoreTestKit
 
       paths.each do |path|
         type = metadata.search_definitions[search_param_name.to_sym][:type]
-        values_found =
-          resolve_path(resource, path)
-            .map do |value|
-          if value.is_a? FHIR::Reference
-            value.reference
-          else
-            value
-          end
+
+        resolve_path(resource, path).each do |value|
+          values_found <<
+            if value.is_a? FHIR::Reference
+              value.reference
+            elsif value.is_a? USCoreTestKit::PrimitiveType
+              value.value
+            else
+              value
+            end
         end
 
+        values_found.compact!
         match_found =
           case type
           when 'Period', 'date', 'instant', 'dateTime'

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -2590,7 +2590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: US Core Inferno tests