us_core_test_kit 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac6a564a32ae165aafa5464db0cf48406798016af086d3f27eb3b89c7c6358a
-  data.tar.gz: 5dfd9dec3bc2559f5c02d985d08bcd8766673c5b292114c4f225d950125c35d3
+  metadata.gz: 100200153e9adc8ef4a768a34ab02fe1b2460a72bde04350f3681ad699aacb99
+  data.tar.gz: 41013e5c4b2161553a28bd73f9928fb00097455e3b547adbfe02fd0115a3f03e
 SHA512:
-  metadata.gz: 55352a177a081274e200990644114ba019c09d7e684b4d40edf3c1ce3e2138434058bd7b9c7eea21361c77d08f5010a51b06cf774a2a5ac97db08421d8f0700d
-  data.tar.gz: c1aa7c927b0cc9a3c3181ebc122a17f85bf8d9a9c8b411292a13bccd42520f3cdd5fe01da347f7a9e4121d17404df56cedfac2c686d37dec11ef743c669b02d9
+  metadata.gz: 37702b890daf5dc75452d610cd9cc70b2cca359b8d8580f842ed770ea24f3447dc6af0db058bc156a07344ad48f6ecbfba83e34427c5258c5270a418fda1145f
+  data.tar.gz: 6b658f5e99a0d62939d18f7316e57dc3bc901a6130eb668b24750a6e76ee33a456a732c87db8bb7e71efcbf848e2e1536aff28226b6b33bab4e811aa09e3bc7a

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

@@ -9,7 +9,9 @@ module USCoreTestKit
       The US Core Server SHALL:
       1. Support the US Core Patient resource profile.
       2. Support at least one additional resource profile from the list of US
-          Core Profiles.
+         Core Profiles.
+
+      In order to support USCDI, servers must support all USCDI resources.
       ```
     )
     uses_request :capability_statement
@@ -23,30 +25,25 @@ module USCoreTestKit
           &.each_with_object([]) do |rest, resources|
             rest.resource.each { |resource| resources << resource.type }
           end.uniq
-      supported_profiles =
-        capability_statement.rest
-          &.flat_map(&:resource)
-          &.flat_map { |resource| resource.supportedProfile + [resource.profile] }
-          &.compact || []
-      supported_profiles.map! { |profile_url| profile_url.split('|').first }
 
       assert supported_resources.include?('Patient'), 'US Core Patient profile not supported'
 
-      target_profiles = config.options[:target_profiles]
+      us_core_resources = config.options[:us_core_resources]
 
-      other_resources = target_profiles.keys.reject { |resource_type| resource_type == 'Patient' }
+      other_resources = us_core_resources.reject { |resource_type| resource_type == 'Patient' }
       other_resources_supported = other_resources.any? { |resource| supported_resources.include? resource }
       assert other_resources_supported, 'No US Core resources other than Patient are supported'
 
-      target_profiles.each do |resource_type, profiles|
-        next unless supported_resources.include? resource_type
+      if config.options[:required_resources].present?
+        missing_resources = config.options[:required_resources] - supported_resources
+
+        missing_resource_list =
+          missing_resources
+          .map { |resource| "`#{resource}`" }
+          .join(', ')
 
-        profiles.each do |profile|
-          warning do
-            assert supported_profiles&.include?(profile),
-                    "CapabilityStatement does not claim support for US Core #{resource_type} profile: #{profile}"
-          end
-        end
+        assert missing_resources.empty?,
+               "The CapabilityStatement did not list support for the following resources: #{missing_resource_list}"
       end
     end
   end

data/lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb

@@ -102,7 +102,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       end
     end

data/lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb

@@ -106,7 +106,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       end
 

data/lib/us_core_test_kit/custom_groups/v5.0.1/capability_statement_group.rb

@@ -118,7 +118,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       end
 

data/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb

@@ -54,8 +54,8 @@ module USCoreTestKit
       version VERSION
 
       VALIDATION_MESSAGE_FILTERS = [
-        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
         /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1

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

@@ -56,8 +56,8 @@ module USCoreTestKit
       version VERSION
 
       VALIDATION_MESSAGE_FILTERS = [
-        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
         /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1

data/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb

@@ -65,8 +65,8 @@ module USCoreTestKit
       version VERSION
 
       VALIDATION_MESSAGE_FILTERS = [
-        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
         /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core