us_core_test_kit 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b693ad77df0cc7296b9ae07942cf5ea4f3496fb47ca199d63f3066f906f142f
-  data.tar.gz: 34d31851aabbf208e7f0db087a2f72f355e42c1c8e61da20b3c5a62885db1b72
+  metadata.gz: cc3ca68e2a7b8f7609f1eaf4f983afd2813252e706a65f096733412d3aa4e118
+  data.tar.gz: 3458eaaeb4d904b728b16f92524da58598d1d84d12b82458614d014d8959efcc
 SHA512:
-  metadata.gz: 325e5643f37e0da1e02e5e4fe3d4808ed3dc4e62a24e7f290ebe146e275b86cc13db3d51f79a331f5207bca117c1d7b8fcd2707170158aa29d21f50ed38605de
-  data.tar.gz: 2b11e159d4e26f24571fd040155a6ac924c2b5ccda1e5474380b24caac4486d0d8ea83e7ed4b6005f57aee2df0f25cd1e1073e36057409226b17840469bb3a99
+  metadata.gz: 0b8df109a82023aa02b8eeadfd4a024cd41e1b00570c6d7e3aa55e68d910ac17031874e62bed5f8a09392f5b6b70cc594a6a60ec47b1c1c34620f71c526f2d2f
+  data.tar.gz: 87e2ed36f19a5a5815d13c64f74afa0b8c3824fa751fb52b5b013bf9f0449b3d2d47bf36e8d9bd26341e6cd25a8731a27d7f8a1b5fe38ce21c250a02187ab37b

data/lib/us_core_test_kit/custom_groups/capability_statement/instantiate_test.rb

@@ -12,8 +12,12 @@ module USCoreTestKit
       assert_resource_type(:capability_statement)
       capability_statement = resource
 
-      assert capability_statement.instantiates.include?('http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'),
-        "Server CapabilityStatement.instantiates does not include 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'"
+      include_us_core = capability_statement.instantiates&.any? do |url|
+        url.split('|').first == 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'
+      end
+
+      assert include_us_core,
+             "Server CapabilityStatement.instantiates does not include 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'"
     end
   end
 end

data/lib/us_core_test_kit/custom_groups/capability_statement/profile_support_test.rb

@@ -20,13 +20,15 @@ module USCoreTestKit
       assert_resource_type(:capability_statement)
       capability_statement = resource
 
-      supported_profiles =
-        capability_statement.rest
-          &.each_with_object([]) do |rest, profiles|
-            rest.resource.each { |resource| profiles.concat(resource.supportedProfile) }
-          end.uniq
+      supported_profiles = capability_statement.rest&.flat_map do |rest|
+        rest.resource.flat_map do |resource|
+          # Remove trailing version from canonical url
+          resource.supportedProfile&.map { |profile| profile.split('|').first }
+        end.compact
+      end&.uniq || []
 
-      assert supported_profiles.include?('http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'), 'US Core Patient profile not supported'
+      assert supported_profiles.include?('http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'),
+             'US Core Patient profile not supported'
 
       us_core_profiles = config.options[:us_core_profiles]
 
@@ -45,7 +47,8 @@ module USCoreTestKit
             .join(', ')
 
         assert missing_profiles.empty?,
-               "The CapabilityStatement did not list support for the following resources: #{missing_profiles_list}"
+               'The CapabilityStatement does not list support for the following' \
+               "US Core profiles: #{missing_profiles_list}"
       end
     end
   end

data/lib/us_core_test_kit/custom_groups/smart_scopes_constants.rb

@@ -6,12 +6,8 @@ module USCoreTestKit
       'v610' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis',
           'patient/Condition.rs?category=http://hl7.org/fhir/us/core/CodeSystem/condition-category|health-concern',
-          'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
           'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory',
           'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history',
-          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs',
-          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey',
-          'patient/Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh'
         ].map(&:freeze).freeze,
       'v700_ballot' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis',
@@ -28,6 +24,12 @@ module USCoreTestKit
     }.freeze
 
     SMART_GRANULAR_SCOPES_GROUP2 = {
+      'v610' => [
+          'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
+          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs',
+          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey',
+          'patient/Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh'
+      ].map(&:freeze).freeze,
       'v700_ballot' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
           'patient/DiagnosticReport.rs?category=http://loinc.org|LP7839-6',

data/lib/us_core_test_kit/custom_groups/v6.1.0/smart_granular_scopes_group.rb

@@ -1,33 +1,12 @@
 require_relative '../base_smart_granular_scopes_group'
-require_relative '../smart_scopes_constants'
-require_relative '../granted_granular_scopes_test'
 require_relative '../../generated/v6.1.0/granular_scopes1_group'
+require_relative '../../generated/v6.1.0/granular_scopes2_group'
 
 module USCoreTestKit
   module USCoreV610
-    class SmartGranularScopesGroup < Inferno::TestGroup
-      include SmartScopesConstants
-      title 'US Core SMART Granular Scopes'
+    class SmartGranularScopesGroup < BaseSmartGranularScopesGroup
       id :us_core_v610_smart_granular_scopes
-
-      description <<~DESCRIPTION
-        These tests verify that servers honor [SMART App Launch granular
-        scopes](http://hl7.org/fhir/smart-app-launch/STU2/scopes-and-launch-context.html#finer-grained-resource-constraints-using-search-parameters).
-        Support for these scopes is [required in US Core
-        7](http://hl7.org/fhir/us/core/2024Jan/scopes.html#us-core-scopes).
-
-        Prior to running these tests, first run the US Core FHIR API tests using
-        resource-level scopes. This group includes a SMART App Launch followed by
-        FHIR API tests. The app launches require that a granular scopes be
-        granted. The FHIR API tests then repeat all of the queries from the
-        original FHIR API tests that were run using resource-level scopes, and
-        verify that only resources matching the granted granular scopes are
-        returned.
-      DESCRIPTION
-
-      def self.default_group_scopes(version)
-        [DEFAULT_SCOPES, *SMART_GRANULAR_SCOPES_GROUP1[version]].join(' ')
-      end
+      title 'US Core SMART Granular Scopes'
 
       def self.scopes_string(scopes)
         scopes
@@ -36,91 +15,65 @@ module USCoreTestKit
           .join("\n")
       end
 
-      config(
-        inputs: {
-          url: {
-            locked: true
+      groups
+        .first
+        .description %(
+These tests perform a SMART app launch to receive the following granular scopes:
+
+#{scopes_string(SMART_GRANULAR_SCOPES_GROUP1['v610'])}
+
+Then all of the searches which have been performed in the US Core FHIR API tests
+are repeated to verify that the results have been filtered according to the
+above scopes.
+        )
+
+      groups
+        .first
+        .config(
+          inputs: {
+            requested_scopes: {
+              name: :requested_scopes_group1,
+              default: groups.first.default_group_scopes('v610')
+            }
           },
-          requested_scopes: {
-            name: :requested_scopes_group1,
-            default: default_group_scopes('v610')
+          options: {
+            required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
           }
-        }
-      )
-
-      group do
-        title 'SMART App Launch w/Granular Scopes'
+        )
 
-        def self.scopes_string(scopes)
-          scopes
-            .map { |scope| scope.delete_prefix 'patient/' }
-            .map { |scope| "* `#{scope}`" }
-            .join("\n")
-        end
+      groups
+        .first
+        .group from: :us_core_v610_smart_granular_scopes_1
 
-        description %(
+      groups
+        .last
+        .description %(
 These tests perform a SMART app launch to receive the following granular scopes:
 
-#{scopes_string(SMART_GRANULAR_SCOPES_GROUP1['v610'])}
+#{scopes_string(SMART_GRANULAR_SCOPES_GROUP2['v610'])}
 
 Then all of the searches which have been performed in the US Core FHIR API tests
 are repeated to verify that the results have been filtered according to the
 above scopes.
         )
 
-        config(
-          outputs: {
-            smart_credentials: {
-              name: :granular_scopes_1_credentials
+      groups
+        .last
+        .config(
+          inputs: {
+            requested_scopes: {
+              name: :requested_scopes_group2,
+              default: groups.last.default_group_scopes('v610')
             }
+          },
+          options: {
+            required_scopes: SMART_GRANULAR_SCOPES_GROUP2['v610']
           }
         )
-        group from: :us_core_smart_standalone_launch_stu2,
-              optional: true,
-              config: {
-                inputs: {
-                  smart_credentials: {
-                    name: :granular_scopes_1_credentials
-                  }
-                }
-              } do
-          groups[1].test from: :us_core_granted_granular_scopes,
-                         config: {
-                           inputs: {
-                             received_scopes: {
-                               name: :standalone_received_scopes
-                             }
-                           },
-                           options: {
-                             required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
-                           }
-                         }
-        end
-        group from: :us_core_smart_ehr_launch_stu2,
-              optional: true,
-              config: {
-                inputs: {
-                  smart_credentials: {
-                    name: :granular_scopes_1_credentials
-                  }
-                }
-              } do
-          groups[1].test from: :us_core_granted_granular_scopes,
-                         config: {
-                           inputs: {
-                             received_scopes: {
-                               name: :ehr_received_scopes
-                             }
-                           },
-                           options: {
-                             required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
-                           }
-                         }
-        end
-      end
 
-      group from: :us_core_v610_smart_granular_scopes_1,
-            title: 'US Core FHIR API w/Granular Scopes'
+      groups
+        .last
+        .group from: :us_core_v610_smart_granular_scopes_2
     end
   end
 end

data/lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope1_group.rb

@@ -22,7 +22,6 @@ based on the following granular scopes:
 
 * `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis`
 * `Condition.rs?category=http://hl7.org/fhir/us/core/CodeSystem/condition-category|health-concern`
-* `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item`
 
       )
 

data/lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope2_group.rb

@@ -0,0 +1,44 @@
+require_relative './granular_scope_tests/condition/condition_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_onset_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ConditionGranularScope2Group < Inferno::TestGroup
+      title 'Condition Granular Scope Tests Tests'
+      short_description 'Verify support for the server capabilities required by the US Core Condition Encounter Diagnosis Profile.'
+      description %(
+  The tests in this group repeat all of the searches from the US Core
+FHIR API tests, and verify that the resources returned are filtered
+based on the following granular scopes:
+
+* `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item`
+
+      )
+
+      id :us_core_v610_condition_granular_scope_2_group
+      run_as_group
+
+    
+      test from: :us_core_v610_Condition_patient_category_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_recorded_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_onset_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_code_granular_scope_search_test
+      test from: :us_core_v610_Condition_granular_scope_read_test
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/metadata.yml

@@ -372,6 +372,6 @@
   :file_name: condition_patient_code_granular_scope_search_test.rb
 - :id: us_core_v610_Condition_granular_scope_read_test
   :file_name: condition_granular_scope_read_test.rb
-:id: us_core_v610_condition_granular_scope_1_group
-:file_name: condition_granular_scope1_group.rb
+:id: us_core_v610_condition_granular_scope_2_group
+:file_name: condition_granular_scope2_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/metadata.yml

@@ -275,8 +275,8 @@
   :file_name: observation_patient_code_granular_scope_search_test.rb
 - :id: us_core_v610_Observation_granular_scope_read_test
   :file_name: observation_granular_scope_read_test.rb
-:id: us_core_v610_observation_granular_scope_1_group
-:file_name: observation_granular_scope1_group.rb
+:id: us_core_v610_observation_granular_scope_2_group
+:file_name: observation_granular_scope2_group.rb
 :delayed_references:
 - :path: specimen
   :resources:

data/lib/us_core_test_kit/generated/v6.1.0/granular_scopes1_group.rb

@@ -14,12 +14,8 @@ based on the following granular scopes:
 
 * `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis`
 * `Condition.rs?category=http://hl7.org/fhir/us/core/CodeSystem/condition-category|health-concern`
-* `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
-* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
 
       )
 

data/lib/us_core_test_kit/generated/v6.1.0/granular_scopes2_group.rb

@@ -0,0 +1,51 @@
+require_relative './condition_granular_scope2_group'
+require_relative './observation_granular_scope2_group'
+
+module USCoreTestKit
+  module USCoreV610
+    class SmartGranularScopes2Group < Inferno::TestGroup
+      id :us_core_v610_smart_granular_scopes_2
+      title 'US Core FHIR API w/Granular Scopes 2'
+
+      description %(
+The tests in this group repeat all of the searches from the US Core
+FHIR API tests, and verify that the resources returned are filtered
+based on the following granular scopes:
+
+* `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
+* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
+
+      )
+
+      input :granular_scopes_2_credentials,
+            title: 'SMART Credentials for Granular Scopes 2',
+            type: :oauth_credentials,
+            locked: true
+
+      config(
+        inputs: {
+          patient_ids: {
+            locked: true
+          },
+          received_scopes: {
+            title: 'Received Scopes',
+            locked: true
+          },
+          url: {
+            locked: true
+          }
+        }
+      )
+
+      fhir_client do
+        oauth_credentials :granular_scopes_2_credentials
+        url :url
+      end
+
+      group from: :us_core_v610_condition_granular_scope_2_group
+      group from: :us_core_v610_observation_granular_scope_2_group
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/metadata.yml

@@ -12128,9 +12128,15 @@
   Condition:
   - :id: us_core_v610_condition_granular_scope_1_group
     :file_name: condition_granular_scope1_group.rb
+  - :id: us_core_v610_condition_granular_scope_2_group
+    :file_name: condition_granular_scope2_group.rb
   Observation:
   - :id: us_core_v610_observation_granular_scope_1_group
     :file_name: observation_granular_scope1_group.rb
+  - :id: us_core_v610_observation_granular_scope_2_group
+    :file_name: observation_granular_scope2_group.rb
 :granular_scope_groups:
 - :id: us_core_v610_smart_granular_scopes_1
   :file_name: granular_scopes1_group.rb
+- :id: us_core_v610_smart_granular_scopes_2
+  :file_name: granular_scopes2_group.rb

data/lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope1_group.rb

@@ -17,9 +17,6 @@ based on the following granular scopes:
 
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
-* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
 
       )
 

data/lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope2_group.rb

@@ -0,0 +1,36 @@
+require_relative './granular_scope_tests/observation/observation_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_status_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ObservationGranularScope2Group < Inferno::TestGroup
+      title 'Observation Granular Scope Tests Tests'
+      short_description 'Verify support for the server capabilities required by the US Core Laboratory Result Observation Profile.'
+      description %(
+  The tests in this group repeat all of the searches from the US Core
+FHIR API tests, and verify that the resources returned are filtered
+based on the following granular scopes:
+
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
+* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
+
+      )
+
+      id :us_core_v610_observation_granular_scope_2_group
+      run_as_group
+
+    
+      test from: :us_core_v610_Observation_patient_category_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_status_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_granular_scope_search_test
+      test from: :us_core_v610_Observation_granular_scope_read_test
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/us_core_test_suite.rb

@@ -204,7 +204,7 @@ module USCoreTestKit
         group from: :us_core_311_data_absent_reason
       end
 
-      group from: :'us_core_v610_smart_granular_scopes',
+      group from: :us_core_v610_smart_granular_scopes,
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
       
     end

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

@@ -212,7 +212,7 @@ module USCoreTestKit
         group from: :us_core_311_data_absent_reason
       end
 
-      group from: :'us_core_v700_ballot_smart_granular_scopes',
+      group from: :us_core_v700_ballot_smart_granular_scopes,
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
       
     end

data/lib/us_core_test_kit/generator/granular_scope_group_generator.rb

@@ -4,18 +4,11 @@ require_relative '../custom_groups/smart_scopes_constants'
 module USCoreTestKit
   class Generator
     class GranularScopeGroupGenerator
-      include SmartScopesConstants
-
       class << self
         def generate(ig_metadata, base_output_dir)
           return unless ['6', '7'].include? ig_metadata.ig_version[1]
 
           [1, 2].each do |group_number|
-            scopes =
-              SmartScopesConstants
-                .const_get("SMART_GRANULAR_SCOPES_GROUP#{group_number}")[ig_metadata.reformatted_version]
-            next if scopes.blank?
-
             new(ig_metadata, base_output_dir, group_number).generate
           end
         end

data/lib/us_core_test_kit/generator/granular_scope_resource_type_group_generator.rb

@@ -16,7 +16,7 @@ module USCoreTestKit
                 .const_get("SMART_GRANULAR_SCOPES_GROUP#{group_number}")[ig_metadata.reformatted_version]
 
             groups.each do |group_metadata|
-              next if scopes.blank? || scopes.none? { |scope| scope.start_with? "patient/#{group_metadata.resource}" }
+              next if scopes.none? { |scope| scope.start_with? "patient/#{group_metadata.resource}" }
 
               new(GroupMetadata.new(group_metadata.to_hash), ig_metadata, base_output_dir, group_number).generate
             end

data/lib/us_core_test_kit/generator/granular_scope_test_generator.rb

@@ -11,12 +11,12 @@ module USCoreTestKit
 
           scopes =
             SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP1[ig_metadata.reformatted_version] +
-            (SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP2[ig_metadata.reformatted_version] || [])
+            SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP2[ig_metadata.reformatted_version]
 
           SmartScopesConstants::SMART_GRANULAR_SCOPE_RESOURCES.each do |resource_type|
             group = ig_metadata.groups.find { |group| group.resource == resource_type }
 
-            next if scopes.blank? || scopes.none? { |scope| scope.start_with? "patient/#{group.resource}" }
+            next if scopes.none? { |scope| scope.start_with? "patient/#{group.resource}" }
 
             group.searches
               .each { |search| new(group, search, base_output_dir).generate }

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -1411,6 +1411,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_patient_abatement_date_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_patient_asserted_date_search_test.rb
@@ -1533,6 +1534,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/granular_scopes1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scopes2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_patient_category_date_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_patient_category_search_test.rb
@@ -1615,6 +1617,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/observation_clinical_result/observation_clinical_result_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_clinical_result_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_patient_category_date_search_test.rb