us_core_test_kit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c99914668f955a93193b97ca8d5ab37ef25159b41146eb77634380f8df0ad5'
-  data.tar.gz: 15f69930bf9b8afccfd27975001b9ebbfb7ad74a8eec817a3f93e72f2b19e2e1
+  metadata.gz: a121ebdf4c6d4f64205243404d6a60ffa914c360c82b12a5d87db7dfdc5cdcea
+  data.tar.gz: 653526a65dbbba58f5e2b2e1022c82f61e7df87dc988af09f9d7da0c041f9f9f
 SHA512:
-  metadata.gz: 037c12c604ab66cb5bb0c02e89089ed4853c7d6f3042d3c4f599210e8132b81cd6b59315a88298956c8421979bd5a50326508b44d7be46659e4c3391e042c7c7
-  data.tar.gz: e11c3d1bd77b8bb1ca4bb6bf3ef92b22baa1def830f68b0e096534744c7490cbf8878e0e535baac09e677f6c4cac99ca62c5e26bb35146d283ec0e4e51a0805a
+  metadata.gz: deb705f62b68c74d8dbe4875bbb5eeeb03320d62b725229a797882558469d8cb8e09c75bd2ce71fa9c9426c2d2e8cab363ee77af621fc3ad83bb36b141f052f6
+  data.tar.gz: dac0ba9320a455434c6d976b926828ed16997d6f7434f121683a9d6ef8671315af861a6d6887cf2b4f240043718481a9d2a1c8e9bafac7ec4b62577e501f9da3

data/config/presets/client_demo_against_server_800_preset.json.erb

@@ -0,0 +1,46 @@
+{
+  "title": "Demo: Run Against the US Core Server Suite",
+  "id": "demo_us_core_client_against_server_v800",
+  "test_suite_id": "us_core_client_v800",
+  "inputs": [
+    {
+      "name": "client_id",
+      "description": "Testers may provide a specific value for Inferno to assign as the client id. If no value is provided, the Inferno session id will be used.",
+      "optional": true,
+      "title": "Client Id",
+      "type": "text",
+      "value": "us_core_client_demo"
+    },
+    {
+      "name": "smart_launch_urls",
+      "description": "If the client app supports EHR launch, a comma-delimited list of one or more URLs that Inferno can use to launch the app.",
+      "optional": true,
+      "title": "SMART App Launch URL(s)",
+      "type": "textarea",
+      "value": ""
+    },
+    {
+      "name": "smart_redirect_uris",
+      "description": "A comma-separated list of one or more URIs that the app will sepcify as the target of the redirect for Inferno to use when providing the authorization code.",
+      "title": "SMART App Launch Redirect URI(s)",
+      "type": "textarea",
+      "value": "<%= Inferno::Application['base_url'] %>/custom/smart/redirect"
+    },
+    {
+      "name": "launch_context",
+      "description": "Launch context details to be included in access token responses, specified as a JSON array. If provided, the contents will be merged into Inferno's token responses.",
+      "optional": true,
+      "title": "Launch Context",
+      "type": "textarea",
+      "value": ""
+    },
+    {
+      "name": "fhir_user_relative_reference",
+      "description": "A FHIR relative reference (<resource type>/<id>) for the FHIR user record to return when the openid and fhirUser scopes are requested. Include this resource in the **Available Resources** input so that it can be accessed via FHIR read.",
+      "optional": true,
+      "title": "FHIR User Relative Reference",
+      "type": "text",
+      "value": "Patient/us-core-client-tests-patient"
+    }
+  ]
+}

data/config/presets/server_demo_against_client_800_preset.json.erb

@@ -0,0 +1,30 @@
+{
+  "title": "Demo: Run Against the US Core Client Suite",
+  "id": "demo_us_core_server_against_client_v800",
+  "test_suite_id": "us_core_v800",
+  "inputs": [
+    {
+      "name": "url",
+      "type": "text",
+      "title": "FHIR Endpoint",
+      "description": "URL of the FHIR endpoint",
+      "value": "<%= Inferno::Application['base_url'] %>/custom/us_core_client_v800/fhir"
+    },
+    {
+      "name": "smart_auth_info",
+      "type": "auth_info",
+      "value": {
+        "auth_type": "public",
+        "use_discovery": "true",
+        "client_id": "us_core_client_demo"
+      }
+    },
+    {
+      "name": "patient_ids",
+      "type": "text",
+      "title": "Patient IDs",
+      "description": "Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements",
+      "value": "us-core-client-tests-patient"
+    }
+  ]
+}

data/lib/us_core_test_kit/client/generated/v3.1.1/bodyheight_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-bodyheight`
+* `us-core-client-tests-body-height`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/bodytemp_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-bodytemp`
+* `us-core-client-tests-body-temperature`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/bodyweight_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-bodyweight`
+* `us-core-client-tests-body-weight`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/bp_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-bp`
+* `us-core-client-tests-blood-pressure`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/condition_client_group.rb

@@ -37,7 +37,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-condition`
+* `us-core-client-tests-condition-encounter-diagnosis`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/head_circumference_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/heartrate_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-heartrate`
+* `us-core-client-tests-heart-rate`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/resprate_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-resprate`
+* `us-core-client-tests-respiratory-rate`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v3.1.1/us_core_client_test_suite.rb

@@ -290,7 +290,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generated/v4.0.0/condition_client_group.rb

@@ -37,7 +37,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-condition`
+* `us-core-client-tests-condition-encounter-diagnosis`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v4.0.0/head_circumference_client_group.rb

@@ -38,7 +38,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v4.0.0/us_core_client_test_suite.rb

@@ -294,7 +294,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generated/v5.0.1/head_circumference_client_group.rb

@@ -33,7 +33,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v5.0.1/us_core_client_test_suite.rb

@@ -314,7 +314,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generated/v6.1.0/head_circumference_client_group.rb

@@ -33,7 +33,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v6.1.0/observation_clinical_result/observation_clinical_result_client_read_test.rb

@@ -17,14 +17,14 @@ module USCoreTestKit
         end
 
         def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`."
+          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`, `Observation/us-core-client-tests-observation-lab`."
         end
 
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
 
-          requests_for_id = filter_requests_by_resource_id(requests, 'us-core-client-tests-observation-clinical-result')
+          requests_for_id = filter_requests_by_resource_id(requests, ["us-core-client-tests-observation-clinical-result", "us-core-client-tests-observation-lab"])
           assert requests_for_id.any?, failure_message
         end
       end

data/lib/us_core_test_kit/client/generated/v6.1.0/observation_clinical_result_client_group.rb

@@ -31,9 +31,10 @@ Observation resource type. In this case, the test will be marked as skip if supp
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
+This test will check that the client performed a read of one of the following ids:
 
 * `us-core-client-tests-observation-clinical-result`
+* `us-core-client-tests-observation-lab`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v6.1.0/us_core_client_test_suite.rb

@@ -332,7 +332,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generated/v7.0.0/head_circumference_client_group.rb

@@ -34,7 +34,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v7.0.0/observation_clinical_result/observation_clinical_result_client_read_test.rb

@@ -17,14 +17,14 @@ module USCoreTestKit
         end
 
         def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`."
+          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`, `Observation/us-core-client-tests-observation-lab`."
         end
 
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
 
-          requests_for_id = filter_requests_by_resource_id(requests, 'us-core-client-tests-observation-clinical-result')
+          requests_for_id = filter_requests_by_resource_id(requests, ["us-core-client-tests-observation-clinical-result", "us-core-client-tests-observation-lab"])
           assert requests_for_id.any?, failure_message
         end
       end

data/lib/us_core_test_kit/client/generated/v7.0.0/observation_clinical_result_client_group.rb

@@ -32,9 +32,10 @@ Observation resource type. In this case, the test will be marked as skip if supp
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
+This test will check that the client performed a read of one of the following ids:
 
 * `us-core-client-tests-observation-clinical-result`
+* `us-core-client-tests-observation-lab`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v7.0.0/us_core_client_test_suite.rb

@@ -319,6 +319,7 @@ The current version of this test suite does not:
           }
         )
 
+
         suite_option  :client_type,
                       title: 'Client Security Type',
                       list_options: [
@@ -340,7 +341,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generated/v8.0.0/head_circumference_client_group.rb

@@ -34,7 +34,7 @@ for the resource type is required, and omitted otherwise.
 ## Reading
 This test will check that the client performed a read of the following id:
 
-* `us-core-client-tests-head-circumference`
+* `us-core-client-tests-head-circumference-percentile`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v8.0.0/observation_clinical_result/observation_clinical_result_client_read_test.rb

@@ -17,14 +17,14 @@ module USCoreTestKit
         end
 
         def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`."
+          "Inferno did not receive the expected read request for the target instance of the US Core Observation Clinical Result Profile: `Observation/us-core-client-tests-observation-clinical-result`, `Observation/us-core-client-tests-observation-lab`."
         end
 
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
 
-          requests_for_id = filter_requests_by_resource_id(requests, 'us-core-client-tests-observation-clinical-result')
+          requests_for_id = filter_requests_by_resource_id(requests, ["us-core-client-tests-observation-clinical-result", "us-core-client-tests-observation-lab"])
           assert requests_for_id.any?, failure_message
         end
       end

data/lib/us_core_test_kit/client/generated/v8.0.0/observation_clinical_result_client_group.rb

@@ -32,9 +32,10 @@ Observation resource type. In this case, the test will be marked as skip if supp
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
+This test will check that the client performed a read of one of the following ids:
 
 * `us-core-client-tests-observation-clinical-result`
+* `us-core-client-tests-observation-lab`
 
 ## Searching
 These tests will check that the client performed searches agains the

data/lib/us_core_test_kit/client/generated/v8.0.0/us_core_client_test_suite.rb

@@ -315,6 +315,15 @@ The current version of this test suite does not:
           }
         ]
 
+        requirement_sets(
+          {
+            identifier: 'hl7.fhir.us.core_8.0.0',
+            title: 'US Core Implementation Guide',
+            actor: 'Client'
+          }
+        )
+
+
         suite_option  :client_type,
                       title: 'Client Security Type',
                       list_options: [
@@ -336,7 +345,7 @@ The current version of this test suite does not:
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/generator/group_generator.rb

@@ -37,7 +37,7 @@ module USCoreTestKit
             conforming to the #{profile_name}.
 
             # Testing Methodology
-            
+
             ## Data Access Supported
 
             Clients may not be required to support the #{resource_type} FHIR resource type. However, if they
@@ -47,20 +47,20 @@ module USCoreTestKit
             for the resource type is required, and omitted otherwise.
 
             ## Reading
-            This test will check that the client performed a read of the following id:
+            This test will check that the client performed a read of #{expected_resource_id.length > 1 ? 'one of the following ids' : 'the following id'}:
 
-            * `us-core-client-tests-#{profile_identifier.underscore.dasherize}`
+            #{expected_resource_id_string}
 
             ## Searching
             These tests will check that the client performed searches agains the
             #{resource_type} resource type with the following required parameters:
 
             #{search_param_name_string}
-            
+
             Inferno will also look for searches using the following optional parameters:
 
             #{optional_search_param_name_string}
-            
+
           DESCRIPTION
         end
 
@@ -84,6 +84,20 @@ module USCoreTestKit
           group_metadata.id = group_id
           group_metadata.file_name = base_output_file_name
         end
+
+        def expected_resource_id
+           resource_id = [ Naming.instance_id_for_profile_identifier(profile_identifier) ]
+
+          if profile_identifier == 'observation_clinical_result'
+            resource_id << Naming.instance_id_for_profile_identifier('observation_lab')
+          end
+
+          resource_id
+        end
+
+        def expected_resource_id_string
+          expected_resource_id.map { |id| "* `#{id}`"}.join("\n")
+        end
       end
     end
   end

data/lib/us_core_test_kit/client/generator/read_test_generator.rb

@@ -38,7 +38,15 @@ module USCoreTestKit
         end
 
         def expected_resource_id
-          Naming.instance_id_for_profile_identifier(profile_identifier)
+          if profile_identifier == 'observation_clinical_result'
+            return [ Naming.instance_id_for_profile_identifier(profile_identifier), Naming.instance_id_for_profile_identifier('observation_lab') ]
+          else
+            Naming.instance_id_for_profile_identifier(profile_identifier)
+          end
+        end
+
+        def expected_resource_id_string
+          Array(expected_resource_id).map { |id| "`#{resource_type}/#{id}`"}.join(', ')
         end
 
         def title

data/lib/us_core_test_kit/client/generator/templates/read_test.rb.erb

@@ -31,14 +31,18 @@ module USCoreTestKit
         end
 
         def failure_message
-          "Inferno did not receive the expected read request for the target instance of the <%= group_metadata.profile_name %>: `<%= resource_type %>/<%= expected_resource_id %>`."
+          "Inferno did not receive the expected read request for the target instance of the <%= group_metadata.profile_name %>: <%= expected_resource_id_string %>."
         end
 
         run do
           requests = load_tagged_requests(READ_<%= resource.underscore.upcase %>_TAG)
           skip_if requests.blank?, skip_message
 
+          <%- if profile_identifier == 'observation_clinical_result' -%>
+          requests_for_id = filter_requests_by_resource_id(requests, <%= expected_resource_id %>)
+          <%- else -%>
           requests_for_id = filter_requests_by_resource_id(requests, '<%= expected_resource_id %>')
+          <%- end -%>
           assert requests_for_id.any?, failure_message
         end
       end

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

@@ -69,6 +69,17 @@ module USCoreTestKit
             actor: 'Client'
           }
         )
+
+        <%- elsif module_name == 'USCoreClientV800'-%>
+
+        requirement_sets(
+          {
+            identifier: 'hl7.fhir.us.core_8.0.0',
+            title: 'US Core Implementation Guide',
+            actor: 'Client'
+          }
+        )
+
         <%- end -%>
 
         suite_option  :client_type,
@@ -92,7 +103,7 @@ module USCoreTestKit
         route(:get, SMARTAppLaunch::SMART_DISCOVERY_PATH, lambda { |_env|
           SMARTAppLaunch::MockSMARTServer.smart_server_metadata(id)
         })
-        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) }) 
+        route(:get, SMARTAppLaunch::OIDC_DISCOVERY_PATH, ->(_env) {SMARTAppLaunch::MockSMARTServer.openid_connect_metadata(id) })
         route(
           :get,
           SMARTAppLaunch::OIDC_JWKS_PATH,

data/lib/us_core_test_kit/client/test_helper.rb

@@ -10,14 +10,16 @@ module USCoreTestKit
       end
 
       def filter_requests_by_resource_id(requests, resource_id)
-        requests.select do |request|
-          request.url.split('/').last.split('?').first&.casecmp?(resource_id)
+        Array(resource_id).flat_map do |id|
+          requests.select do |request|
+            request.url.split('/').last.split('?').first&.casecmp?(id)
+          end
         end
       end
 
       def filter_requests_by_search_parameters(requests, search_parameters)
         requests.select do |request|
-          included_params = 
+          included_params =
             if request.verb.downcase == 'get'
               url_params(request.url).keys
             elsif request.verb.downcase == 'post'

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_search_test.rb

@@ -12,7 +12,20 @@ module USCoreTestKit
       description %(
 This test repeats all Condition searches by
 patient + abatement-date and verifies that the results have been
-filtered based on the granted granular scopes.
+filtered based on the granted granular scopes. The response to each
+repeated request will be compared to the corresponding original response
+independently using the following logic:
+- If the repeated search filters on a category value that
+  is explicitly included within the granted scopes, e.g., a search for
+  `Observation?category=survey` when the granted scopes includes
+  `patient/Observation.rs?category=survey`, then the server is required to
+  return the original response filtered to include only entries that match
+  one of the granted scopes.
+- Otherwise, e.g., a search for `Observation?category=cognitive-status`
+  when the granted scopes include only `patient/Observation.rs?category=survey`,
+  servers may indicate that the request is unauthorized either through an empty
+  Bundle or an explicit HTTP error, or they may return the original response
+  filtered to include only entries that match one of the granted scopes.
 
       )
 

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_search_test.rb

@@ -12,7 +12,20 @@ module USCoreTestKit
       description %(
 This test repeats all Condition searches by
 patient + asserted-date and verifies that the results have been
-filtered based on the granted granular scopes.
+filtered based on the granted granular scopes. The response to each
+repeated request will be compared to the corresponding original response
+independently using the following logic:
+- If the repeated search filters on a category value that
+  is explicitly included within the granted scopes, e.g., a search for
+  `Observation?category=survey` when the granted scopes includes
+  `patient/Observation.rs?category=survey`, then the server is required to
+  return the original response filtered to include only entries that match
+  one of the granted scopes.
+- Otherwise, e.g., a search for `Observation?category=cognitive-status`
+  when the granted scopes include only `patient/Observation.rs?category=survey`,
+  servers may indicate that the request is unauthorized either through an empty
+  Bundle or an explicit HTTP error, or they may return the original response
+  filtered to include only entries that match one of the granted scopes.
 
       )
 

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_search_test.rb

@@ -12,7 +12,20 @@ module USCoreTestKit
       description %(
 This test repeats all Condition searches by
 patient + category + clinical-status and verifies that the results have been
-filtered based on the granted granular scopes.
+filtered based on the granted granular scopes. The response to each
+repeated request will be compared to the corresponding original response
+independently using the following logic:
+- If the repeated search filters on a category value that
+  is explicitly included within the granted scopes, e.g., a search for
+  `Observation?category=survey` when the granted scopes includes
+  `patient/Observation.rs?category=survey`, then the server is required to
+  return the original response filtered to include only entries that match
+  one of the granted scopes.
+- Otherwise, e.g., a search for `Observation?category=cognitive-status`
+  when the granted scopes include only `patient/Observation.rs?category=survey`,
+  servers may indicate that the request is unauthorized either through an empty
+  Bundle or an explicit HTTP error, or they may return the original response
+  filtered to include only entries that match one of the granted scopes.
 
       )