davinci_dtr_test_kit 0.14.2 → 0.15.1

data/lib/davinci_dtr_test_kit/client_groups/smart_app/dtr_smart_app_saving_questionnaire_response_group.rb

@@ -1,10 +1,9 @@
 require_relative 'dtr_smart_app_questionnaire_response_save_test'
 require_relative '../shared/dtr_questionnaire_response_basic_conformance_test'
-require_relative '../shared/dtr_questionnaire_response_pre_population_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppSavingQuestionnaireResponseGroup < Inferno::TestGroup
-    id :dtr_smart_app_saving_questionnaire_response
+    id :dtr_smart_app_saving_qr
     title 'Saving the QuestionnaireResponse'
     description %(
       The tester will complete the questionnaire such that a QuestionnaireResponse is stored
@@ -15,13 +14,10 @@ module DaVinciDTRTestKit
     run_as_group
 
     # Test 1: wait for a QuestionnaireResponse
-    test from: :dtr_smart_app_questionnaire_response_save,
+    test from: :dtr_smart_app_qr_save,
          receives_request: :questionnaire_response_save
     # Test 2: validate basic conformance of the QuestionnaireResponse
-    test from: :dtr_questionnaire_response_basic_conformance,
-         uses_request: :questionnaire_response_save
-    # Test 3: validate workflow-specific details such as pre-population and overrides
-    test from: :dtr_questionnaire_response_pre_population,
+    test from: :dtr_qr_basic_conformance,
          uses_request: :questionnaire_response_save
   end
 end

data/lib/davinci_dtr_test_kit/cql_test.rb

@@ -1,5 +1,19 @@
 module DaVinciDTRTestKit
   module CQLTest
+    STATIC_QUESTIONNAIRE_PACKAGE_BUNDLE_PROFILE = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle|2.0.1'.freeze
+    STATIC_QUESTIONNAIRE_PACKAGE_PARAMETER_PROFILE = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters|2.0.1'.freeze
+    ADAPTIVE_QUESTIONNAIRE_PACKAGE_BUNDLE_PROFILE = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle|2.0.1'.freeze
+    ADAPTIVE_QUESTIONNAIRE_PACKAGE_PARAMETER_PROFILE = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters|2.0.1'.freeze
+
+    def questionnaire_package_profile_urls
+      {
+        static_bundle: STATIC_QUESTIONNAIRE_PACKAGE_BUNDLE_PROFILE,
+        static_parameter: STATIC_QUESTIONNAIRE_PACKAGE_PARAMETER_PROFILE,
+        adaptive_bundle: ADAPTIVE_QUESTIONNAIRE_PACKAGE_BUNDLE_PROFILE,
+        adaptive_parameter: ADAPTIVE_QUESTIONNAIRE_PACKAGE_PARAMETER_PROFILE
+      }
+    end
+
     def extension_presence
       @extension_presence ||= { 'found_min_launch_context' => false, 'found_min_variable' => false,
                                 'found_min_pop_context' => false, 'found_min_init_expression' => false,
@@ -320,6 +334,50 @@ module DaVinciDTRTestKit
       end&.flatten&.compact
     end
 
+    def perform_questionnaire_package_validation(resource, form = 'static')
+      scratch[:"#{form}_questionnaire_bundles"] = extract_questionnaire_bundles(resource)
+      validate_questionnaire_package(resource, form)
+      assert scratch[:"#{form}_questionnaire_bundles"].present?, 'No questionnaire bundle found in the response'
+    end
+
+    def validate_questionnaire_package(resource, form)
+      case resource&.resourceType
+      when 'Bundle'
+        assert_valid_resource(resource:, profile_url: questionnaire_package_profile_urls[:"#{form}_bundle"])
+      when 'Parameters'
+        assert_valid_resource(resource:, profile_url: questionnaire_package_profile_urls[:"#{form}_parameter"])
+      else
+        assert(false, "Unexpected resourceType: #{resource&.resourceType}. Expected Parameters or Bundle")
+      end
+    end
+
+    def extract_questionnaire_bundles(resource)
+      case resource&.resourceType
+      when 'Bundle'
+        [resource]
+      when 'Parameters'
+        extract_bundles_from_parameter(resource)
+      else
+        []
+      end
+    end
+
+    def extract_bundles_from_parameter(parameter)
+      return [] if parameter.blank?
+
+      parameter.parameter&.filter_map do |param|
+        param.resource if param.resource&.resourceType == 'Bundle'
+      end
+    end
+
+    def extract_questionnaire_from_questionnaire_package(questionnaire_pkg_json, questionnaire_url)
+      resource = FHIR.from_contents(questionnaire_pkg_json)
+      questionnaire_bundles = extract_questionnaire_bundles(resource)
+      questionnaires = extract_questionnaires_from_bundles(questionnaire_bundles)
+
+      questionnaires.find { |q| q.url == questionnaire_url }
+    end
+
     def extract_libraries_from_bundles(questionnaire_bundles)
       questionnaire_bundles.filter_map do |qb|
         qb.entry.filter_map { |entry| entry.resource if entry&.resource.is_a?(FHIR::Library) }

data/lib/davinci_dtr_test_kit/docs/dtr_light_ehr_suite_description_v201.md

@@ -12,11 +12,18 @@ requirements and may change the test validation logic.
 
 ## Test Methodology
 
-Inferno will simulate a DTR SMART App that will connect to the DTR Light EHR system under test. The tester will need to launch Inferno using either an EHR launch or a Standalone launch. Once the connection between Inferno's simulated DTR SMART App and the DTR Light EHR under test is established, tests within this suite will make FHIR API requests corresponding to capabilities required by the [Light DTR EHR Capability Statement](https://hl7.org/fhir/us/davinci-dtr/STU2/CapabilityStatement-light-dtr-ehr) and check that the EHR's responses are conformant.
+Inferno will simulate a DTR SMART App that will connect to the DTR Light EHR system under test. The tester will need to launch Inferno using an EHR launch. Once the connection between Inferno's simulated DTR SMART App and the DTR Light EHR under test is established, tests within this suite will make FHIR API requests corresponding to capabilities required by the [Light DTR EHR Capability Statement](https://hl7.org/fhir/us/davinci-dtr/STU2/CapabilityStatement-light-dtr-ehr) and check that the EHR's responses are conformant.
 
 ## Running the Tests
 
-If you would like to try out the tests but don't have a DTR Light EHR implementation, you can run these tests against the [public instance of the Inferno Reference Server](https://inferno.healthit.gov/reference-server/r4/) by using the Inferno Reference Server preset in the test suite. In order to get the Inferno Reference Server to do an EHR launch, navigate to https://inferno.healthit.gov/reference-server/app/app-launch and use https://inferno.healthit.gov/suites/custom/smart/launch as the App Launch URL. When using the Inferno Reference Server preset for the DTR Light EHR test suite, note that the sample patient used for testing (`dtr_bundle_patient_pat015.json`) is focused on DTR-specific data and does not have the complete set of US Core data needed to pass all the US Core tests. In addition, this preset does not test the `create` or `update` tests for DTR QuestionnaireResponse resources and PAS Task resources.
+If you would like to try out the tests but don't have a Light DTR EHR implementation, you can run these tests against the [public instance of the Inferno Reference Server](https://inferno.healthit.gov/reference-server/r4/) by using the Inferno Reference Server preset in the test suite. In order to get the Inferno Reference Server to do an EHR launch, navigate to https://inferno.healthit.gov/reference-server/app/app-launch and use https://inferno.healthit.gov/suites/custom/smart/launch as the App Launch URL. When using the Inferno Reference Server preset for the DTR Light EHR test suite, note that the sample patient used for testing (`dtr_bundle_patient_pat015.json`) is focused on DTR-specific data and does not have the complete set of US Core data needed to pass all the US Core tests. In addition, this preset does not test the `create` or `update` tests for DTR QuestionnaireResponse resources and PAS Task resources.
+
+In addition, if you would like to try out the DTR-specific SMART Launch tests, meaning the tests that check for DTR `fhirContext` conformance, but do not have a Light DTR EHR implementation, you can run these tests against an instance of Inferno running the DTR Smart App Test Suite as your Light DTR EHR. This process is described in the following steps:
+
+1. In the tab with the Light DTR EHR Test Suite open, click "1 Authorization" test group and click "Run all tests". The FHIR Server Base Url should be `[URL prefix]/custom/dtr_smart_app/fhir` where `[URL prefix]` comes from the URL of the test session which will be of the form `[URL prefix]/dtr_smart_app/[session id]` and the EHR Launch Client ID should be `sample`. Click "Submit". Take note of the launch_uri provided by the following prompt.
+2. In a separate tab from the DTR Light EHR Test Suite, pull up the Da Vinci DTR SMART App Test Suite and click "Run all tests".
+3. Start off by launching it with "EHR Launch from Inferno" with a client_id of `sample` and a launch_uri provided by the DTR Light EHR prompt in step 1. Before clicking "Submit", change the SMART App Launch fhirContext input to be an array of strings, rather than the default JSON object since the DTR Light EHR tests use STU2.0 version of SMART Launch. The input should be `["Coverage/cov015","DeviceRequest/devreqe0470"]`. Click "Submit".
+4. Right click on the link in the resulting popup and click "Open Link in New Window" to complete the Authorization Test Group of the DTR Light EHR Test Suite.
 
 ## Limitations
 
@@ -24,10 +31,6 @@ The DTR IG is a complex specification and these tests currently validate conform
 a subset of IG requirements. Future versions of the test suite will test further
 features.
 
-Specific limitations include:
-- *SMART Launch `fhirContext`*: Inferno does not currently verify the use of `fhirContext` to convey details
-  about the DTR SMART App launch.
-
 ## DTR 2.0.1 Corrections
 
 The DTR 2.0.1 version of the [Light EHR CapabilityStatement](http://hl7.org/fhir/us/davinci-dtr/CapabilityStatement/light-dtr-ehr) includes two pieces of missing or misleading information that have been corrected:

data/lib/davinci_dtr_test_kit/dtr_full_ehr_suite.rb

@@ -1,5 +1,6 @@
-require_relative 'client_groups/dinner_static/dtr_full_ehr_questionnaire_workflow_group'
-require_relative 'client_groups/dinner_adaptive/dtr_full_ehr_adaptive_dinner_questionnaire_workflow_group'
+require_relative 'client_groups/custom_static/dtr_full_ehr_custom_static_workflow_group'
+require_relative 'client_groups/dinner_static/dtr_full_ehr_static_dinner_workflow_group'
+require_relative 'client_groups/dinner_adaptive/dtr_full_ehr_adaptive_dinner_workflow_group'
 require_relative 'auth_groups/oauth2_authentication_group'
 require_relative 'endpoints/cors'
 require_relative 'endpoints/mock_authorization/simple_token_endpoint'
@@ -15,8 +16,6 @@ module DaVinciDTRTestKit
     title 'Da Vinci DTR Full EHR Test Suite'
     description File.read(File.join(__dir__, 'docs', 'dtr_full_ehr_suite_description_v201.md'))
 
-    version VERSION
-
     links [
       {
         label: 'Report Issue',
@@ -61,7 +60,21 @@ module DaVinciDTRTestKit
     end
 
     group from: :oauth2_authentication
-    group from: :dtr_full_ehr_static_dinner_questionnaire_workflow
-    group from: :dtr_full_ehr_adaptive_dinner_questionnaire_workflow
+    group do
+      id :dtr_full_ehr_basic_workflows
+      title 'Basic Workflows'
+
+      group from: :dtr_full_ehr_custom_static_workflow
+      group from: :dtr_full_ehr_adaptive_dinner_workflow
+    end
+    group do
+      id :dtr_full_ehr_questionnaire_functionality
+      title 'Questionnaire Functionality Coverage'
+      description %(
+        Tests in this group validate that the client can complete additional DTR workflows
+        covering additional pre-population features of questionnaires.
+      )
+      group from: :dtr_full_ehr_static_dinner_workflow
+    end
   end
 end

data/lib/davinci_dtr_test_kit/dtr_light_ehr_suite.rb

@@ -12,6 +12,9 @@ require_relative 'profiles/nutrition_order_group'
 require_relative 'profiles/service_request_group'
 require_relative 'profiles/task_group'
 require_relative 'profiles/vision_prescription_group'
+require_relative 'client_groups/light_ehr/dtr_smart_ehr_launch'
+require_relative 'endpoints/mock_payer/light_ehr_supported_payer_endpoint'
+require_relative 'client_groups/light_ehr/dtr_light_ehr_supported_endpoints_group'
 require 'smart_app_launch/smart_stu1_suite'
 require 'smart_app_launch/smart_stu2_suite'
 
@@ -21,8 +24,6 @@ module DaVinciDTRTestKit
     title 'Da Vinci DTR Light EHR Test Suite'
     description File.read(File.join(__dir__, 'docs', 'dtr_light_ehr_suite_description_v201.md'))
 
-    version VERSION
-
     links [
       {
         label: 'Report Issue',
@@ -42,10 +43,6 @@ module DaVinciDTRTestKit
       }
     ]
 
-    input :url,
-          title: 'FHIR Server Base Url',
-          description: 'URL of the target DTR Light EHR'
-
     # Hl7 Validator Wrapper:
     fhir_resource_validator do
       igs('hl7.fhir.us.davinci-dtr#2.0.1', 'hl7.fhir.us.davinci-pas#2.0.1', 'hl7.fhir.us.davinci-crd#2.0.1')
@@ -55,6 +52,16 @@ module DaVinciDTRTestKit
       end
     end
 
+    suite_endpoint :get, SUPPORTED_PAYER_PATH, LightEHRSupportedPayerEndpoint
+
+    resume_test_route :get, RESUME_PASS_PATH do |request|
+      request.query_parameters['token']
+    end
+
+    resume_test_route :get, RESUME_FAIL_PATH, result: 'fail' do |request|
+      request.query_parameters['token']
+    end
+
     group do
       title 'Authorization'
 
@@ -83,13 +90,18 @@ module DaVinciDTRTestKit
         end
       end
 
-      group from: :smart_ehr_launch_stu2,
-            required_suite_options: DTROptions::SMART_2_REQUIREMENT,
-            run_as_group: true
-
-      group from: :smart_standalone_launch_stu2,
+      group from: :dtr_smart_ehr_launch,
             required_suite_options: DTROptions::SMART_2_REQUIREMENT,
-            run_as_group: true
+            run_as_group: true,
+            config: {
+              outputs: {
+                id_token: { name: :id_token },
+                client_id: { name: :client_id },
+                requested_scopes: { name: :requested_scopes },
+                access_token: { name: :access_token },
+                smart_credentials: { name: :smart_credentials }
+              }
+            }
     end
 
     group do
@@ -101,40 +113,48 @@ module DaVinciDTRTestKit
 
       )
 
+      input :url,
+            title: 'FHIR Server Base Url',
+            description: 'URL of the target DTR Light EHR'
+
       group from: :'us_core_v311-us_core_v311_fhir_api',
-            run_as_group: true
-    end
+            run_as_group: true,
+            verifies_requirements: ['hl7.fhir.us.davinci-dtr_2.0.1@2', 'hl7.fhir.us.davinci-dtr_2.0.1@281']
 
-    group do
-      title 'DTR Light EHR Profiles'
-      description %(This test group tests system for their conformance to
-      the RESTful capabilities by specified Resources/Profiles as defined by
-      the DaVinci Documentation Templates and Rules (DTR) v2.0,1 Implementation
-      Guide Light DTR EHR Capability Statement.
+      group do
+        title 'DTR Light EHR Profiles'
+        description %(This test group tests system for their conformance to
+                              the RESTful capabilities by specified Resources/Profiles as defined by
+                              the DaVinci Documentation Templates and Rules (DTR) v2.0,1 Implementation
+                              Guide Light DTR EHR Capability Statement.
 
-      )
+                              )
+        run_as_group
 
-      input :credentials,
-            title: 'OAuth Credentials',
-            type: :oauth_credentials,
-            optional: true
+        input :smart_credentials,
+              title: 'OAuth Credentials',
+              type: :oauth_credentials,
+              optional: true
 
-      # All FHIR requests in this suite will use this FHIR client
-      fhir_client do
-        url :url
-        oauth_credentials :credentials
-      end
+        # All FHIR requests in this suite will use this FHIR client
+        fhir_client do
+          url :url
+          oauth_credentials :smart_credentials
+        end
 
-      group from: :questionnaire_response_group
-      group from: :coverage_group
-      group from: :communication_request_group
-      group from: :device_request_group
-      group from: :encounter_group
-      group from: :medication_request_group
-      group from: :nutrition_order_group
-      group from: :service_request_group
-      group from: :task_group
-      group from: :vision_prescription_group
+        group from: :questionnaire_response_group
+        group from: :coverage_group
+        group from: :communication_request_group
+        group from: :device_request_group
+        group from: :encounter_group
+        group from: :medication_request_group
+        group from: :nutrition_order_group
+        group from: :service_request_group
+        group from: :task_group
+        group from: :vision_prescription_group
+      end
     end
+
+    group from: :dtr_light_ehr_supported_endpoints
   end
 end

data/lib/davinci_dtr_test_kit/dtr_payer_server_suite.rb

@@ -15,8 +15,6 @@ module DaVinciDTRTestKit
     title 'Da Vinci DTR Payer Server Test Suite'
     description File.read(File.join(__dir__, 'docs', 'dtr_payer_server_suite_description_v201.md'))
 
-    version VERSION
-
     links [
       {
         label: 'Report Issue',

data/lib/davinci_dtr_test_kit/dtr_questionnaire_response_validation.rb

@@ -1,13 +1,51 @@
-# frozen_string_literal: true
-
+require_relative 'cql_test'
 module DaVinciDTRTestKit
   module DTRQuestionnaireResponseValidation
+    include DaVinciDTRTestKit::CQLTest
+
     CQL_EXPRESSION_EXTENSIONS = [
       'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
       'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
       'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-candidateExpression'
     ].freeze
 
+    def validate_questionnaire_response_correctness(questionnaire_response_json, custom_response = nil)
+      check_is_questionnaire_response(questionnaire_response_json)
+      qr = FHIR.from_contents(questionnaire_response_json)
+      questionnaire = nil
+      expected_overrides = []
+      if custom_response.blank?
+        questionnaire = Fixtures.questionnaire_for_test(id)
+        expected_overrides = ['PBD.2']
+      else
+        assert_valid_json custom_response, 'Custom response provided is not a valid JSON'
+
+        # Find the questionnaire that is referenced in the QuestionnaireResponse
+        questionnaire = extract_questionnaire_from_questionnaire_package(
+          custom_response, qr.questionnaire
+        )
+
+        skip_if questionnaire.blank?,
+                "Couldn't find Questionnaire #{qr.questionnaire} in the provided custom questionnaire package
+                to validate the QuestionnaireResponse."
+
+        missing_origin_sources = ['auto', 'manual', 'override'] - extract_origin_sources(qr.item)
+        unless missing_origin_sources.empty?
+          add_message(
+            'error',
+            'All origin sources (auto, manual, override) must be present in the QuestionnaireResponse. ' \
+            "Missing #{missing_origin_sources.to_sentence}"
+          )
+        end
+      end
+
+      check_origin_sources(questionnaire.item, qr.item, expected_overrides:)
+
+      required_link_ids = extract_required_link_ids(questionnaire.item)
+      check_answer_presence(qr.item, required_link_ids)
+      assert(messages.none? { |m| m[:type] == 'error' }, 'QuestionnaireResponse is not correct, see error message(s)')
+    end
+
     def check_is_questionnaire_response(questionnaire_response_json)
       assert_valid_json(questionnaire_response_json)
       questionnaire_response = begin
@@ -55,6 +93,15 @@ module DaVinciDTRTestKit
       end
     end
 
+    def extract_origin_sources(items, origin_sources = [])
+      items&.each do |item|
+        extract_origin_sources(item&.item, origin_sources)
+        origin_sources << find_origin_source(item) if item&.answer&.any?
+      end
+
+      origin_sources
+    end
+
     # Ensures that all required questions have been answered.
     # If required_link_ids not provided, all questions are treated as optional.
     def check_answer_presence(response_items, required_link_ids = [])
@@ -108,7 +155,6 @@ module DaVinciDTRTestKit
 
     def validate_cql_executed(actual_items, questionnaire_cql_expression_link_ids, template_prepopulation_expectations,
                               template_override_expectations)
-
       actual_items&.each do |item_to_validate|
         link_id = item_to_validate.linkId
         if questionnaire_cql_expression_link_ids.include?(link_id)
@@ -225,7 +271,7 @@ module DaVinciDTRTestKit
     end
 
     def item_is_cql_expression?(item)
-      item.extension&.any? { |ext| CQL_EXPRESSION_EXTENSIONS.include?(ext.url) }
+      item&.extension&.any? { |ext| CQL_EXPRESSION_EXTENSIONS.include?(ext.url) }
     end
 
     def answer_value_equal?(expected, actual)

data/lib/davinci_dtr_test_kit/dtr_smart_app_suite.rb

@@ -1,7 +1,8 @@
 require_relative 'auth_groups/oauth2_authentication_group'
-require_relative 'client_groups/resp_assist_device/dtr_smart_app_questionnaire_workflow_group'
-require_relative 'client_groups/dinner_static/dtr_smart_app_questionnaire_workflow_group'
-require_relative 'client_groups/dinner_adaptive/dtr_smart_app_questionnaire_workflow_group'
+require_relative 'client_groups/respiratory/dtr_smart_app_respiratory_workflow_group'
+require_relative 'client_groups/dinner_static/dtr_smart_app_static_dinner_workflow_group'
+require_relative 'client_groups/dinner_adaptive/dtr_smart_app_adaptive_dinner_workflow_group'
+require_relative 'client_groups/custom_static/dtr_smart_app_custom_static_workflow_group'
 require_relative 'endpoints/cors'
 require_relative 'endpoints/mock_authorization'
 require_relative 'endpoints/mock_authorization/authorize_endpoint'
@@ -21,8 +22,6 @@ module DaVinciDTRTestKit
     title 'Da Vinci DTR SMART App Test Suite'
     description File.read(File.join(__dir__, 'docs', 'dtr_smart_app_suite_description_v201.md'))
 
-    version VERSION
-
     links [
       {
         label: 'Report Issue',
@@ -67,7 +66,7 @@ module DaVinciDTRTestKit
     suite_endpoint :post, NEXT_PATH, MockPayer::NextQuestionEndpoint
 
     # EHR
-    route(:get, '/fhir/metadata', MockEHR.method(:metadata))
+    route(:get, METADATA_PATH, MockEHR.method(:metadata))
     suite_endpoint :post, QUESTIONNAIRE_RESPONSE_PATH, MockEHR::QuestionnaireResponseEndpoint
     suite_endpoint :get, FHIR_RESOURCE_PATH, MockEHR::FHIRGetEndpoint
     suite_endpoint :get, FHIR_SEARCH_PATH, MockEHR::FHIRGetEndpoint
@@ -90,8 +89,8 @@ module DaVinciDTRTestKit
         Tests in this group validate that the client can complete basic DTR workflows
       )
 
-      group from: :dtr_smart_app_static_dinner_questionnaire_workflow
-      group from: :dtr_smart_app_adaptive_dinner_questionnaire_workflow
+      group from: :dtr_smart_app_custom_static_workflow
+      group from: :dtr_smart_app_adaptive_dinner_workflow
     end
     group do
       id :dtr_smart_app_questionnaire_functionality
@@ -100,7 +99,8 @@ module DaVinciDTRTestKit
         Tests in this group validate that the client can complete additional DTR workflows
         covering additional must support features of questionnaires.
       )
-      group from: :dtr_smart_app_questionnaire_workflow
+      group from: :dtr_smart_app_resp_workflow
+      group from: :dtr_smart_app_static_dinner_workflow
     end
   end
 end

data/lib/davinci_dtr_test_kit/endpoints/mock_authorization.rb

@@ -62,8 +62,8 @@ module DaVinciDTRTestKit
       base_url = env_base_url(env, OPENID_CONFIG_PATH)
       response_body = {
         issuer: base_url + FHIR_BASE_PATH,
-        authorization_endpoint: base_url + EHR_AUTHORIZE_PATH,
-        token_endpoint: base_url + EHR_TOKEN_PATH,
+        authorization_endpoint: authorization_endpoint(base_url),
+        token_endpoint: token_endpoint(base_url),
         jwks_uri: base_url + JKWS_PATH,
         response_types_supported: ['id_token'],
         subject_types_supported: ['public'],
@@ -79,5 +79,13 @@ module DaVinciDTRTestKit
       path.gsub!(%r{#{endpoint_path}(/)?}, '')
       "#{protocol}://#{host + path}"
     end
+
+    def authorization_endpoint(base_url)
+      base_url + EHR_AUTHORIZE_PATH
+    end
+
+    def token_endpoint(base_url)
+      base_url + EHR_TOKEN_PATH
+    end
   end
 end

data/lib/davinci_dtr_test_kit/endpoints/mock_ehr.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../endpoints/mock_authorization'
+
 module DaVinciDTRTestKit
   module MockEHR
     RESOURCE_SERVER_BASE = ENV.fetch('FHIR_REFERENCE_SERVER')
@@ -13,9 +15,23 @@ module DaVinciDTRTestKit
       client
     end
 
-    def metadata(_env)
+    def metadata(env)
       cs = resource_server_client.capability_statement
       if cs.present?
+        # Overwrite the OAuth URIs returned by the reference server to point to the suite endpoints instead
+        oauth_uris_url = 'http://fhir-registry.smarthealthit.org/StructureDefinition/oauth-uris'
+        base_url = MockAuthorization.env_base_url(env, METADATA_PATH)
+        sec_ext = cs.rest.first&.security&.extension&.delete_if { |e| e.url == oauth_uris_url }
+        sec_ext&.push(
+          FHIR::Extension.new(
+            url: oauth_uris_url,
+            extension: [
+              FHIR::Extension.new(url: 'authorize', valueUri: MockAuthorization.authorization_endpoint(base_url)),
+              FHIR::Extension.new(url: 'token', valueUri: MockAuthorization.token_endpoint(base_url))
+            ]
+          )
+        )
+
         [200, { 'Content-Type' => 'application/fhir+json', 'Access-Control-Allow-Origin' => '*' }, [cs.to_json]]
       else
         [500, { 'Access-Control-Allow-Origin' => '*' }, ['Unexpected error occurred while fetching metadata']]

data/lib/davinci_dtr_test_kit/endpoints/mock_payer/light_ehr_supported_payer_endpoint.rb

@@ -0,0 +1,44 @@
+require_relative '../../tags'
+
+module DaVinciDTRTestKit
+  class LightEHRSupportedPayerEndpoint < Inferno::DSL::SuiteEndpoint
+    def name
+      'light_ehr_supported_payer_endpoint'
+    end
+
+    def test_run_identifier
+      request.params[:tester_url_id]
+    end
+
+    def tags
+      [SUPPORTED_PAYER_TAG]
+    end
+
+    def make_response
+      user_response = JSON.parse(result.input_json)&.find { |input| input['name'] == 'user_response' }&.dig('value')
+
+      response.body = if user_response.present?
+                        user_response
+                      else
+                        default_response
+                      end
+      response.status = 200
+      response.headers['Content-Type'] = 'application/json'
+    end
+
+    private
+
+    def default_response
+      {
+        payers: [
+          { id: 'payer1', name: 'Payer One' },
+          { id: 'payer2', name: 'Payer Two' }
+        ]
+      }.to_json
+    end
+
+    def update_result
+      results_repo.update_result(result.id, 'pass')
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/endpoints/mock_payer/questionnaire_package_endpoint.rb

@@ -19,7 +19,13 @@ module DaVinciDTRTestKit
         response.status = 200
         response.format = 'application/fhir+json'
         response.headers['Access-Control-Allow-Origin'] = '*'
-        response.body = build_questionnaire_package_response.to_json
+        response.body = custom_response.presence || build_questionnaire_package_response.to_json
+      end
+
+      def custom_response
+        @custom_response ||= JSON.parse(result.input_json)
+          .find { |input| input['name'].include?('custom_questionnaire_package_response') }
+          &.dig('value')
       end
 
       def update_result

data/lib/davinci_dtr_test_kit/fixtures.rb

@@ -8,7 +8,7 @@ module DaVinciDTRTestKit
     FIXTURE_CONFIG = [
       {
         group_ids: [
-          'dtr_smart_app_questionnaire_workflow',
+          'dtr_smart_app_resp_workflow',
           'dtr_full_ehr_questionnaire_workflow'
         ],
         questionnaire_package: File.join('respiratory_assist_device', 'questionnaire_package.json'),
@@ -16,23 +16,23 @@ module DaVinciDTRTestKit
       },
       {
         group_ids: [
-          'dtr_smart_app_static_dinner_questionnaire_workflow',
-          'dtr_full_ehr_static_dinner_questionnaire_workflow'
+          'dtr_smart_app_static_dinner_workflow',
+          'dtr_full_ehr_static_dinner_workflow'
         ],
         questionnaire_package: File.join('dinner_static', 'questionnaire_dinner_order_static.json'),
         questionnaire_response: File.join('dinner_static', 'questionnaire_response_dinner_order_static.json')
       },
       {
         group_ids: [
-          'dtr_full_ehr_adaptive_questionnaire_retrieval',
-          'dtr_smart_app_adaptive_questionnaire_retrieval'
+          'dtr_full_ehr_adaptive_retrieval',
+          'dtr_smart_app_adaptive_retrieval'
         ],
         questionnaire_package: File.join('dinner_adaptive', 'questionnaire_dinner_order_adaptive.json'),
         next_question: File.join('dinner_adaptive', 'dinner_order_adaptive_next_question_initial.json')
       },
       {
         group_ids: [
-          'dtr_adaptive_questionnaire_followup_questions'
+          'dtr_adaptive_followup_questions'
         ],
         next_question: {
           bean_burrito: File.join('dinner_adaptive', 'dinner_order_adaptive_next_question_burrito.json'),