us_core_test_kit 0.10.0 → 0.11.0

data/lib/us_core_test_kit/generated/v7.0.0/granular_scopes1_group.rb

@@ -19,9 +19,9 @@ based on the following granular scopes:
 
       )
 
-      input :granular_scopes_1_credentials,
+      input :granular_scopes_1_auth_info,
             title: 'SMART Credentials for Granular Scopes 1',
-            type: :oauth_credentials,
+            type: :auth_info,
             locked: true
 
       config(
@@ -40,7 +40,7 @@ based on the following granular scopes:
       )
 
       fhir_client do
-        oauth_credentials :granular_scopes_1_credentials
+        auth_info :granular_scopes_1_auth_info
         url :url
       end
 

data/lib/us_core_test_kit/generated/v7.0.0/granular_scopes2_group.rb

@@ -19,9 +19,9 @@ based on the following granular scopes:
 
       )
 
-      input :granular_scopes_2_credentials,
+      input :granular_scopes_2_auth_info,
             title: 'SMART Credentials for Granular Scopes 2',
-            type: :oauth_credentials,
+            type: :auth_info,
             locked: true
 
       config(
@@ -40,7 +40,7 @@ based on the following granular scopes:
       )
 
       fhir_client do
-        oauth_credentials :granular_scopes_2_credentials
+        auth_info :granular_scopes_2_auth_info
         url :url
       end
 

data/lib/us_core_test_kit/generated/v7.0.0/us_core_test_suite.rb

@@ -90,7 +90,8 @@ module USCoreTestKit
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         /\A\S+: \S+: URL value '.*' does not resolve/,
-        %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'} # Known issue with the Pulse Oximetry Profile
+        %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'}, # Known issue with the Pulse Oximetry Profile
+        %r{Slice 'Observation\.value\[x\]:valueQuantity': a matching slice is required, but not found \(from (http://hl7\.org/fhir/StructureDefinition/bmi\|4\.0\.1|http://hl7\.org/fhir/StructureDefinition/bmi\%7C4\.0\.1)\)}
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -125,6 +126,7 @@ module USCoreTestKit
 
       suite_option :smart_app_launch_version,
         title: 'SMART App Launch Version',
+        default: USCoreOptions::SMART_2,
         list_options: [
           {
             label: 'SMART App Launch 1.0.0',
@@ -132,7 +134,7 @@ module USCoreTestKit
           },
           {
             label: 'SMART App Launch 2.0.0',
-            value: USCoreOptions::SMART_2
+            value: USCoreOptions::SMART_2,
           },
           {
             label: 'SMART App Launch 2.2.0',
@@ -149,14 +151,14 @@ module USCoreTestKit
             required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT
 
       group do
-        input :smart_credentials,
+        input :smart_auth_info,
           title: 'OAuth Credentials',
-          type: :oauth_credentials,
+          type: :auth_info,
           optional: true
 
         fhir_client do
           url :url
-          oauth_credentials :smart_credentials
+          auth_info :smart_auth_info
         end
 
         title 'US Core FHIR API'

data/lib/us_core_test_kit/generator/templates/granular_scope_group.rb.erb

@@ -10,9 +10,9 @@ module USCoreTestKit
 <%= description %>
       )
 
-      input :granular_scopes_<%= group_number %>_credentials,
+      input :granular_scopes_<%= group_number %>_auth_info,
             title: 'SMART Credentials for Granular Scopes <%= group_number %>',
-            type: :oauth_credentials,
+            type: :auth_info,
             locked: true
 
       config(
@@ -31,7 +31,7 @@ module USCoreTestKit
       )
 
       fhir_client do
-        oauth_credentials :granular_scopes_<%= group_number %>_credentials
+        auth_info :granular_scopes_<%= group_number %>_auth_info
         url :url
       end
 <% group_id_list.each do |group_id| %>

data/lib/us_core_test_kit/generator/templates/suite.rb.erb

@@ -41,7 +41,8 @@ module USCoreTestKit
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         /\A\S+: \S+: URL value '.*' does not resolve/,
-        %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'} # Known issue with the Pulse Oximetry Profile
+        %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'}, # Known issue with the Pulse Oximetry Profile
+        %r{Slice 'Observation\.value\[x\]:valueQuantity': a matching slice is required, but not found \(from (http://hl7\.org/fhir/StructureDefinition/bmi\|4\.0\.1|http://hl7\.org/fhir/StructureDefinition/bmi\%7C4\.0\.1)\)}
       ].freeze
 <% if version_specific_message_filters.empty? %>
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -80,6 +81,7 @@ module USCoreTestKit
 
       suite_option :smart_app_launch_version,
         title: 'SMART App Launch Version',
+        default: USCoreOptions::SMART_2,
         list_options: [
           {
             label: 'SMART App Launch 1.0.0',
@@ -87,7 +89,7 @@ module USCoreTestKit
           },
           {
             label: 'SMART App Launch 2.0.0',
-            value: USCoreOptions::SMART_2
+            value: USCoreOptions::SMART_2,
           },
           {
             label: 'SMART App Launch 2.2.0',
@@ -104,14 +106,14 @@ module USCoreTestKit
             required_suite_options: USCoreOptions::SMART_2_2_REQUIREMENT<% end %>
 
       group do
-        input :smart_credentials,
+        input :smart_auth_info,
           title: 'OAuth Credentials',
-          type: :oauth_credentials,
+          type: :auth_info,
           optional: true
 
         fhir_client do
           url :url
-          oauth_credentials :smart_credentials
+          auth_info :smart_auth_info
         end
 
         title 'US Core FHIR API'

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -28,7 +28,8 @@ module USCoreTestKit
           if request.status != 200
             []
           else
-            fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+            fetch_all_bundled_resources(resource_type: resource_type, bundle: resource)
+              .select { |resource| resource.resourceType == resource_type }
           end
 
         mismatched_ids = mismatched_resource_ids(found_resources)

data/lib/us_core_test_kit/search_test.rb

@@ -69,7 +69,7 @@ module USCoreTestKit
 
             # TODO: check that only provenance resources for resources matching
             # granular scopes returned
-            fetch_all_bundled_resources(additional_resource_types: ['Provenance'], params:)
+            fetch_and_assert_all_bundled_resources(additional_resource_types: ['Provenance'], params:)
               .select { |resource| resource.resourceType == 'Provenance' }
           end
         end
@@ -104,7 +104,7 @@ module USCoreTestKit
       check_search_response
 
       resources_returned =
-        fetch_all_bundled_resources(params:).select { |resource| resource.resourceType == resource_type }
+        fetch_and_assert_all_bundled_resources(params:).select { |resource| resource.resourceType == resource_type }
 
       return [] if resources_returned.blank?
 
@@ -139,7 +139,7 @@ module USCoreTestKit
 
       check_search_response
 
-      post_search_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+      post_search_resources = fetch_and_assert_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
 
       filter_conditions(post_search_resources) if resource_type == 'Condition' && metadata.version == 'v5.0.1'
       filter_devices(post_search_resources) if resource_type == 'Device'
@@ -247,7 +247,7 @@ module USCoreTestKit
 
           search_and_check_response(params_with_comparator)
 
-          comparator_resources = fetch_all_bundled_resources(params: params_with_comparator).each do |resource|
+          comparator_resources = fetch_and_assert_all_bundled_resources(params: params_with_comparator).each do |resource|
             check_resource_against_params(resource, params_with_comparator) if resource.resourceType == resource_type
           end
         end
@@ -264,7 +264,7 @@ module USCoreTestKit
       search_and_check_response(new_search_params)
 
       reference_with_type_resources =
-        fetch_all_bundled_resources(params: new_search_params)
+        fetch_and_assert_all_bundled_resources(params: new_search_params)
           .select { |resource| resource.resourceType == resource_type }
 
       filter_conditions(reference_with_type_resources) if resource_type == 'Condition' && metadata.version == 'v5.0.1'
@@ -290,7 +290,7 @@ module USCoreTestKit
       search_and_check_response(search_params)
 
       resources_returned =
-        fetch_all_bundled_resources(params: search_params)
+        fetch_and_assert_all_bundled_resources(params: search_params)
           .select { |resource| resource.resourceType == resource_type }
 
       assert resources_returned.present?, "No resources were returned when searching by `system|code`"
@@ -361,7 +361,7 @@ module USCoreTestKit
         search_and_check_response(search_params)
 
         resources_returned =
-          fetch_all_bundled_resources(params: search_params)
+          fetch_and_assert_all_bundled_resources(params: search_params)
             .select { |resource| resource.resourceType == resource_type }
 
         multiple_or_search_params.each do |param_name|
@@ -409,7 +409,7 @@ module USCoreTestKit
       search_and_check_response(search_params)
 
       medications =
-        fetch_all_bundled_resources(params: search_params)
+        fetch_and_assert_all_bundled_resources(params: search_params)
           .select { |resource| resource.resourceType == 'Medication' }
       assert medications.present?, 'No Medications were included in the search results'
 
@@ -546,56 +546,32 @@ module USCoreTestKit
       msg + ". Please use patients with more information"
     end
 
-    def fetch_all_bundled_resources(
+    def fetch_and_assert_all_bundled_resources(
+          resource_type: self.resource_type,
           reply_handler: nil,
           max_pages: 20,
           additional_resource_types: [],
-          resource_type: self.resource_type,
           params: nil
         )
-      page_count = 1
-      resources = []
-      bundle = resource
-
-      until bundle.nil? || page_count == max_pages
-        resources += bundle&.entry&.map { |entry| entry&.resource }
-        next_bundle_link = bundle&.link&.find { |link| link.relation == 'next' }&.url
-        reply_handler&.call(response)
-
-        break if next_bundle_link.blank?
-
-        reply = fhir_client.raw_read_url(next_bundle_link)
-
-        store_request('outgoing', tags: tags(params)) { reply }
-        error_message = cant_resolve_next_bundle_message(next_bundle_link)
-
-        assert_response_status(200)
-        assert_valid_json(reply.body, error_message)
-
-        bundle = fhir_client.parse_reply(FHIR::Bundle, fhir_client.default_format, reply)
-
-        page_count += 1
-      end
-
-      valid_resource_types = [resource_type, 'OperationOutcome'].concat(additional_resource_types)
-      valid_resource_types << 'Medication' if ['MedicationRequest', 'MedicationDispense'].include?(resource_type)
-
-      invalid_resource_types =
-        resources.reject { |entry| valid_resource_types.include? entry.resourceType }
-                 .map(&:resourceType)
-                 .uniq
+        tags = tags(params)
+        bundle = resource
+        additional_resource_types << 'Medication' if ['MedicationRequest', 'MedicationDispense'].include?(resource_type)
 
-      if invalid_resource_types.any?
-        info "Received resource type(s) #{invalid_resource_types.join(', ')} in search bundle, " \
-             "but only expected resource types #{valid_resource_types.join(', ')}. " + \
-             "This is unusual but allowed if the server believes additional resource types are relevant."
-      end
+        assert_handler = Proc.new do |response|
+          assert_response_status(200, response: response)
+          assert_valid_json(response[:body], "Could not resolve bundle as JSON: #{response[:body]}")
+        end
 
-      resources
-    end
+        if reply_handler
+          reply_and_assert_handler = Proc.new do |response|
+            assert_handler.call(response)
+            reply_handler.call(response)
+          end
+        else
+          reply_and_assert_handler = assert_handler
+        end
 
-    def cant_resolve_next_bundle_message(link)
-      "Could not resolve next bundle: #{link}"
+        fetch_all_bundled_resources(resource_type:, bundle:, reply_handler: reply_and_assert_handler, max_pages:, additional_resource_types:, tags:)
     end
 
     def search_param_value(name, resource, include_system: false)

data/lib/us_core_test_kit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.10.0'
-  LAST_UPDATED = '2024-02-10'
+  VERSION = '0.11.0'
+  LAST_UPDATED = '2025-03-18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: smart_app_launch_test_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement