davinci_dtr_test_kit 0.16.0 → 0.16.1

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire/dinner_order}/dtr_full_ehr_adaptive_dinner_workflow_group.rb

@@ -1,14 +1,15 @@
-require_relative '../../tags'
+require_relative '../../../tags'
 require_relative 'dtr_full_ehr_adaptive_initial_retrieval_group'
-require_relative '../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
+require_relative '../../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
+require_relative '../../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
 require_relative 'dtr_adaptive_followup_questions_group'
 require_relative 'dtr_adaptive_completion_group'
+require_relative '../../full_ehr/dtr_full_ehr_store_attestation_test'
 
 module DaVinciDTRTestKit
   class DTRFullEHRAdaptiveDinnerWorkflowGroup < Inferno::TestGroup
     id :dtr_full_ehr_adaptive_dinner_workflow
-    title 'Adaptive Questionnaire Workflow'
+    title 'Dinner Order Adaptive Questionnaire Workflow'
     description %(
       This test validates that a DTR Full EHR client can perform a full DTR Adaptive Questionnaire workflow
       using a mocked questionnaire requesting what a patient wants for dinner. The client system must
@@ -67,12 +68,21 @@ module DaVinciDTRTestKit
             }
           }
 
-    group from: :dtr_adaptive_completion,
-          config: {
-            options: {
-              accepts_multiple_requests: true,
-              next_tag: "completion_#{CLIENT_NEXT_TAG}"
-            }
-          }
+    group from: :dtr_adaptive_completion do
+      config(
+        options: {
+          accepts_multiple_requests: true,
+          next_tag: "completion_#{CLIENT_NEXT_TAG}"
+        }
+      )
+      group do
+        title 'Attestation: QuestionnaireResponse Completion and Storage'
+        description %(
+          The tester will attest to the completion of the questionnaire such that the results are stored for later use.
+        )
+
+        test from: :dtr_full_ehr_store_attest
+      end
+    end
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire/dinner_order}/dtr_full_ehr_adaptive_initial_retrieval_group.rb

@@ -1,9 +1,9 @@
-require_relative '../../tags'
-require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
-require_relative 'dtr_full_ehr_adaptive_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative 'dtr_adaptive_next_question_request_validation_test'
-require_relative 'dtr_adaptive_response_validation_test'
+require_relative '../../../tags'
+require_relative '../../full_ehr/dtr_full_ehr_launch_attestation_test'
+require_relative '../../full_ehr/dtr_full_ehr_adaptive_request_test'
+require_relative '../../shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../dtr_adaptive_next_question_request_validation_test'
+require_relative '../dtr_adaptive_response_validation_test'
 
 module DaVinciDTRTestKit
   class DTRFullEHRAdaptiveInitialRetrievalGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire/dinner_order}/dtr_smart_app_adaptive_dinner_workflow_group.rb

@@ -1,15 +1,15 @@
-require_relative '../../tags'
+require_relative '../../../tags'
 require_relative 'dtr_smart_app_adaptive_initial_retrieval_group'
-require_relative '../smart_app/dtr_smart_app_prepopulation_attestation_test'
-require_relative '../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
+require_relative '../../smart_app/dtr_smart_app_prepopulation_attestation_test'
+require_relative '../../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
 require_relative 'dtr_adaptive_followup_questions_group'
 require_relative 'dtr_adaptive_completion_group'
-require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
+require_relative '../../shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppAdaptiveDinnerWorkflowGroup < Inferno::TestGroup
     id :dtr_smart_app_adaptive_dinner_workflow
-    title 'Adaptive Questionnaire Workflow'
+    title 'Dinner Order Adaptive Questionnaire Workflow'
     description %(
       This test validates that a DTR SMART App client can perform a full DTR Adaptive Questionnaire workflow
       using a mocked questionnaire requesting what a patient wants for dinner. The client system must

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire/dinner_order}/dtr_smart_app_adaptive_initial_retrieval_group.rb

@@ -1,8 +1,8 @@
-require_relative '../../tags'
-require_relative 'dtr_smart_app_adaptive_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative 'dtr_adaptive_next_question_request_validation_test'
-require_relative 'dtr_adaptive_response_validation_test'
+require_relative '../../../tags'
+require_relative '../../smart_app/dtr_smart_app_adaptive_request_test'
+require_relative '../../shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../dtr_adaptive_next_question_request_validation_test'
+require_relative '../dtr_adaptive_response_validation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppAdaptiveInitialRetrievalGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire}/dtr_adaptive_next_question_request_test.rb

@@ -1,3 +1,4 @@
+require_relative '../../descriptions'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
@@ -14,19 +15,12 @@ module DaVinciDTRTestKit
     )
     verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@264'
 
-    input :access_token
-
-    def example_client_jwt_payload_part
-      Base64.strict_encode64({ inferno_client_id: access_token }.to_json).delete('=')
-    end
-
-    def request_identification
-      if config.options[:smart_app]
-        "eyJhbGciOiJub25lIn0.#{example_client_jwt_payload_part}"
-      else
-        access_token
-      end
-    end
+    input :client_id,
+          title: 'Client Id',
+          type: 'text',
+          optional: true,
+          locked: true,
+          description: INPUT_CLIENT_ID_LOCKED
 
     def cont_test_description
       <<~DESCRIPTION
@@ -34,7 +28,7 @@ module DaVinciDTRTestKit
 
         When the DTR application has finished loading the Questionnaire,
         including any clinical data requests to support pre-population,
-        [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
+        [Click here](#{resume_pass_url}?token=#{client_id}) to continue.
       DESCRIPTION
     end
 
@@ -67,7 +61,7 @@ module DaVinciDTRTestKit
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: <<~MESSAGE
           ### #{next_question_prompt_title}
 
@@ -77,15 +71,6 @@ module DaVinciDTRTestKit
 
           #{prompt_cont}
 
-          ### Request Identification
-
-          In order to identify requests for this session, Inferno will look for
-          an `Authorization` header with value:
-
-          ```
-          Bearer #{request_identification}
-          ```
-
           #{cont_test_description if config.options[:accepts_multiple_requests]}
         MESSAGE
       )

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → adaptive_questionnaire}/dtr_adaptive_next_question_request_validation_test.rb

@@ -24,6 +24,9 @@ module DaVinciDTRTestKit
       If it is a Parameters resource, it must contain one parameter named `questionnaire-response`
       with a `resource` attribute set to a FHIR QuestionnaireResponse instance, as specified above.
 
+      This test may process multiple resources, labeling messages with the corresponding tested resources
+      in the order that they were received.
+
       The QuestionnaireResponse resource's structure and conformance will be validated
       in the following test ('Adaptive QuestionnaireResponse is valid').
     )
@@ -39,25 +42,41 @@ module DaVinciDTRTestKit
       config.options[:next_tag]
     end
 
+    def perform_requests_validation
+      requests.each_with_index do |r, index|
+        if r.url != next_url
+          add_message('warning',
+                      "Request #{index} made to wrong URL: #{r.url}. Should instead be to #{next_url}")
+        end
+        assert_valid_json(r.request_body)
+        input_params = FHIR.from_contents(r.request_body)
+        assert input_params.present?, 'Request does not contain a recognized FHIR object'
+        assert_valid_resource_type(input_params)
+
+        if input_params.is_a?(FHIR::Parameters)
+          questionnaire_response_params = input_params.parameter.select do |param|
+            param.name == 'questionnaire-response'
+          end
+          qr_params_count = questionnaire_response_params.length
+          assert qr_params_count == 1,
+                 "Input parameter must contain one `parameter:questionnaire-response` slice. Found #{qr_params_count}"
+
+          questionnaire_response =  questionnaire_response_params.first.resource
+          assert_resource_type(:questionnaire_response, resource: questionnaire_response)
+        end
+      rescue Inferno::Exceptions::AssertionException => e
+        add_message('error', "Request #{index}: #{e.message}")
+        next
+      end
+    end
+
     run do
       load_tagged_requests next_request_tag
-      skip_if request.blank?, 'A $next-question request must be made prior to running this test'
-
-      assert request.url == next_url, "Request made to wrong URL: #{request.url}. Should instead be to #{next_url}"
-      assert_valid_json(request.request_body)
-      input_params = FHIR.from_contents(request.request_body)
-      assert input_params.present?, 'Request does not contain a recognized FHIR object'
-      assert_valid_resource_type(input_params)
-
-      if input_params.is_a?(FHIR::Parameters)
-        questionnaire_response_params = input_params.parameter.select { |param| param.name == 'questionnaire-response' }
-        qr_params_count = questionnaire_response_params.length
-        assert qr_params_count == 1,
-               "Input parameter must contain one `parameter:questionnaire-response` slice. Found #{qr_params_count}"
-
-        questionnaire_response =  questionnaire_response_params.first.resource
-        assert_resource_type(:questionnaire_response, resource: questionnaire_response)
-      end
+      skip_if requests.blank?, 'A $next-question request must be made prior to running this test'
+
+      perform_requests_validation
+
+      assert messages.none? { |m| m[:type] == 'error' }, 'next-quest request(s) not comformant'
     end
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/adaptive_questionnaire/dtr_adaptive_response_validation_test.rb

@@ -0,0 +1,130 @@
+require_relative '../../urls'
+require_relative '../../dtr_questionnaire_response_validation'
+
+module DaVinciDTRTestKit
+  class DTRAdaptiveResponseValidationTest < Inferno::Test
+    include URLs
+    include DTRQuestionnaireResponseValidation
+
+    id :dtr_adaptive_response_validation
+    title 'Adaptive QuestionnaireResponse is valid'
+    description %(
+      This test validates the conformance of the Adaptive QuestionnaireResponse to the
+      [SDCQuestionnaireResponseAdapt](http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt)
+      structure. It verifies the presence of mandatory elements and that elements
+      with required bindings contain appropriate values.
+
+      It also ensures that all required questions are answered, and that the `origin.source`
+      extension is correct for each answer:
+        - `PBD.1` (Last Name) and `LOC.1` (Location): `auto`
+        - `PBD.2` (First Name): `override`
+        - `3` (all nested dinner questions): `manual`
+
+      Note: For the initial next-question request, only the conformance to the profile is checked
+      since neither the QuestionnaireResponse nor the contained Questionnaire will have any items,
+      as no questions are yet known.
+    )
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@38', 'hl7.fhir.us.davinci-dtr_2.0.1@210',
+                          'hl7.fhir.us.davinci-dtr_2.0.1@264'
+
+    def profile_url
+      'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt'
+    end
+
+    def next_request_tag
+      config.options[:next_tag]
+    end
+
+    def perform_questionnaire_reponses_validation(custom_questionnaires) # rubocop:disable Metrics/CyclomaticComplexity
+      requests.each_with_index do |r, index|
+        if r.url != next_url
+          add_message('warning',
+                      "Request #{index} made to wrong URL: #{r.url}. Should instead be to #{next_url}")
+        end
+
+        assert_valid_json(r.request_body)
+        input_params = FHIR.from_contents(r.request_body)
+        assert input_params.present?, 'Request does not contain a recognized FHIR object'
+
+        qr = nil
+        if input_params.is_a?(FHIR::QuestionnaireResponse)
+          qr = input_params
+        elsif input_params.is_a?(FHIR::Parameters)
+          qr = input_params.parameter&.find do |param|
+            param.name == 'questionnaire-response'
+          end&.resource
+        end
+
+        assert qr.present?, 'QuestionnaireResponse resource not provided.'
+        verify_basic_conformance(qr.to_json, profile_url)
+
+        questionnaire = qr.contained.find { |res| res.resourceType == 'Questionnaire' }
+        assert questionnaire, 'QuestionnaireResponse does not contained a Questionnaire'
+
+        scratch[:contained_questionnaires] ||= []
+        scratch[:contained_questionnaires] << questionnaire
+
+        verify_contained_questionnaire(questionnaire, index, custom_questionnaires)
+        check_missing_origin_sources(qr, index) if index == requests.length - 1
+
+        expected_overrides = next_request_tag&.include?('custom') ? [] : ['PBD.2']
+        check_origin_sources(questionnaire.item, qr.item, expected_overrides:, index:)
+
+        required_link_ids = extract_required_link_ids(questionnaire.item)
+        check_answer_presence(qr.item, required_link_ids, index)
+      rescue Inferno::Exceptions::AssertionException => e
+        prefix = e.message.include?('Workflow not') ? '' : "Request #{index}: "
+        add_message('error', "#{prefix}#{e.message}")
+        next
+      end
+    end
+
+    def verify_contained_questionnaire(questionnaire, index, custom_questionnaires)
+      return unless next_request_tag&.include?('custom')
+      return unless index.positive? && custom_questionnaires.present?
+
+      expected_questionnaire = custom_questionnaires[index - 1]
+      return unless expected_questionnaire
+
+      actual_items = questionnaire.to_hash['item']
+      expected_items = expected_questionnaire['item']
+
+      assert actual_items == expected_items, %(
+        Invalid QuestionnaireResponse: the contained Questionnaire `item` does not match the expected content.
+        **Expected**: #{expected_items.inspect}
+        **Received**: #{actual_items.inspect}
+      )
+    end
+
+    def verify_workflow_completion(custom_questionnaires)
+      return unless next_request_tag&.include?('custom')
+
+      assert requests.length > custom_questionnaires.length, %(
+            Workflow not completed: expected #{custom_questionnaires.length + 1} next-question requests,
+            but received #{requests.length}.
+          )
+    end
+
+    run do
+      load_tagged_requests next_request_tag
+      skip_if requests.blank?, 'A $next-question request must be made prior to running this test'
+
+      custom_questionnaires = []
+      if next_request_tag&.include?('custom')
+        begin
+          custom_questionnaires = [JSON.parse(custom_next_question_questionnaires)].flatten
+        rescue JSON::ParserError
+          add_message(
+            'error',
+            'Workflow not completed: the provided questionnaires input for next-question requests is not valid JSON'
+          )
+        end
+      end
+
+      perform_questionnaire_reponses_validation(custom_questionnaires)
+      verify_workflow_completion(custom_questionnaires)
+
+      assert(messages.none? { |m| m[:type] == 'error' }, 'QuestionnaireResponse is not correct, see error message(s)')
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/auth/dtr_client_payer_auth_smart_group.rb

@@ -0,0 +1,29 @@
+require 'smart_app_launch_test_kit'
+require_relative '../../tags'
+
+module DaVinciDTRTestKit
+  class DTRClientPayerAuthSMARTGroup < Inferno::TestGroup
+    id :dtr_client_payer_auth_smart
+    title 'Review Authentication Interactions'
+    description %(
+        During these tests, Inferno will verify that the client interacted with Inferno's
+        simulated SMART authorization server in a conformant manner when requesting access tokens
+        and that the client under test was able to use provided access tokens to make DTR
+        requests.
+
+        Before running these tests, perform at least one DTR workflow group so that the client
+        will request an access token and use it on a DTR request.
+      )
+    run_as_group
+
+    # smart auth verification
+    test from: :smart_client_token_request_bsca_verification,
+         config: {
+           options: { endpoint_suite_id: :dtr_full_ehr }
+         }
+    test from: :smart_client_token_use_verification,
+         config: {
+           options: { access_request_tags: [QUESTIONNAIRE_PACKAGE_TAG, CLIENT_NEXT_TAG] }
+         }
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/auth/dtr_client_payer_auth_udap_group.rb

@@ -0,0 +1,29 @@
+require 'udap_security_test_kit'
+require_relative '../../tags'
+
+module DaVinciDTRTestKit
+  class DTRClientPayerAuthUDAPGroup < Inferno::TestGroup
+    id :dtr_client_payer_auth_udap
+    title 'Review Authentication Interactions'
+    description %(
+        During these tests, Inferno will verify that the client interacted with Inferno's
+        simulated UDAP authorization server in a conformant manner when requesting access tokens
+        and that the client under test was able to use provided access tokens to make DTR
+        requests.
+
+        Before running these tests, perform at least one DTR workflow group so that the client
+        will request an access token and use it on a DTR request.
+      )
+    run_as_group
+
+    # udap auth verification
+    test from: :udap_client_token_request_cc_verification,
+         config: {
+           options: { endpoint_suite_id: :dtr_full_ehr }
+         }
+    test from: :udap_client_token_use_verification,
+         config: {
+           options: { access_request_tags: [QUESTIONNAIRE_PACKAGE_TAG, CLIENT_NEXT_TAG] }
+         }
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_full_ehr_custom_static_workflow_group.rb

@@ -1,7 +1,7 @@
-require_relative 'dtr_custom_questionnaire_package_validation_test'
-require_relative 'dtr_custom_questionnaire_libraries_test'
-require_relative 'dtr_custom_questionnaire_extensions_test'
-require_relative 'dtr_custom_questionnaire_expressions_test'
+require_relative '../shared/dtr_custom_questionnaire_package_validation_test'
+require_relative '../shared/dtr_custom_questionnaire_libraries_test'
+require_relative '../shared/dtr_custom_questionnaire_extensions_test'
+require_relative '../shared/dtr_custom_questionnaire_expressions_test'
 require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
 require_relative '../full_ehr/dtr_full_ehr_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
@@ -29,6 +29,8 @@ module DaVinciDTRTestKit
     )
     verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@35', 'hl7.fhir.us.davinci-dtr_2.0.1@208'
 
+    input_order :custom_questionnaire_package_response, :static_custom_questionnaire_response
+
     group do
       id :dtr_full_ehr_custom_static_retrieval
       title 'Retrieving the Static Questionnaire'
@@ -46,7 +48,7 @@ module DaVinciDTRTestKit
       )
       run_as_group
 
-      input_order :access_token, :custom_questionnaire_package_response
+      input_order :custom_questionnaire_package_response
 
       # Test 0: attest to launch
       test from: :dtr_full_ehr_launch_attest,
@@ -55,7 +57,13 @@ module DaVinciDTRTestKit
            title: 'Launch DTR (Attestation)'
       # Test 1: wait for the $questionnaire-package request
       test from: :dtr_full_ehr_qp_request do
-        input :custom_questionnaire_package_response
+        input :custom_questionnaire_package_response,
+              title: 'Custom Questionnaire Package Response JSON',
+              description: %(
+                Provide a JSON FHIR Bundle containing a custom questionnaire for Inferno to use as a response to
+                the $questionnaire-package request.
+              ),
+              optional: false
       end
       # Test 2: validate the $questionnaire-package body
       test from: :dtr_qp_request_validation
@@ -89,17 +97,10 @@ module DaVinciDTRTestKit
     end
 
     group from: :dtr_full_ehr_saving_qr do
-      input :custom_questionnaire_package_response,
-            title: 'Custom Questionnaire Package Response JSON',
-            description: %(
-              A JSON PackageBundle may be provided here to replace Inferno's response to the
-              $questionnaire-package request.
-            ),
-            type: 'textarea'
-
       config(
         inputs: {
           questionnaire_response: {
+            name: 'static_custom_questionnaire_response',
             description: "The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire.
                 IMPORTANT: If you have not yet run the 'Filling Out the Static Questionnaire' group, leave this blank
                 until you have done so. Then, run just the 'Saving the QuestionnaireResponse' group and populate

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_smart_app_custom_static_workflow_group.rb

@@ -1,7 +1,7 @@
-require_relative 'dtr_custom_questionnaire_package_validation_test'
-require_relative 'dtr_custom_questionnaire_libraries_test'
-require_relative 'dtr_custom_questionnaire_extensions_test'
-require_relative 'dtr_custom_questionnaire_expressions_test'
+require_relative '../shared/dtr_custom_questionnaire_package_validation_test'
+require_relative '../shared/dtr_custom_questionnaire_libraries_test'
+require_relative '../shared/dtr_custom_questionnaire_extensions_test'
+require_relative '../shared/dtr_custom_questionnaire_expressions_test'
 require_relative '../smart_app/dtr_smart_app_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
 require_relative '../shared/dtr_prepopulation_attestation_test'
@@ -68,7 +68,7 @@ module DaVinciDTRTestKit
       title 'Filling Out the Static Questionnaire'
       description %(
         The tester will interact with the questionnaire within their client system
-        such that pre-population steps are taken, the qustionnaire is rendered, and
+        such that pre-population steps are taken, the questionnaire is rendered, and
         they are able to fill it out. The tester will attest that questionnaire pre-population
         and rendering directives were followed.
       )

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_static_dinner_workflow_group.rb

@@ -61,16 +61,20 @@ module DaVinciDTRTestKit
       test from: :dtr_static_dinner_enabled_questions_attest
     end
 
-    group from: :dtr_full_ehr_saving_qr,
-          config: {
-            inputs: {
-              questionnaire_response: {
-                description: "The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire.
-                IMPORTANT: If you have not yet run the 'Filling Out the Static Questionnaire' group, leave this blank
-                until you have done so. Then, run just the 'Saving the QuestionnaireResponse' group and populate
-                this input."
-              }
-            }
+    group from: :dtr_full_ehr_saving_qr do
+      config(
+        inputs: {
+          questionnaire_response: {
+            name: 'static_dinner_questionnaire_response',
+            description: "The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire.
+            IMPORTANT: If you have not yet run the 'Filling Out the Static Questionnaire' group, leave this blank
+            until you have done so. Then, run just the 'Saving the QuestionnaireResponse' group and populate
+            this input."
           }
+        }
+      )
+      # custom qp input not used - Inferno-defined questionnaire
+      children[2].inputs.delete(:custom_questionnaire_package_response)
+    end
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_static_dinner_workflow_group.rb

@@ -46,7 +46,7 @@ module DaVinciDTRTestKit
       title 'Filling Out the Static Questionnaire'
       description %(
         The tester will interact with the questionnaire within their client system
-        such that pre-population steps are taken, the qustionnaire is rendered, and
+        such that pre-population steps are taken, the questionnaire is rendered, and
         they are able to fill it out. Inferno will check that appropriate interactions
         with the server occur and the tester will attest that questionnaire pre-population
         and rendering directives were followed.

data/lib/davinci_dtr_test_kit/client_groups/{dinner_adaptive → full_ehr}/dtr_full_ehr_adaptive_request_test.rb

@@ -1,3 +1,4 @@
+require_relative '../../descriptions'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
@@ -20,17 +21,22 @@ module DaVinciDTRTestKit
                           'hl7.fhir.us.davinci-dtr_2.0.1@264'
 
     config options: { accepts_multiple_requests: true }
-    input :access_token
+    input :client_id,
+          title: 'Client Id',
+          type: 'text',
+          optional: true,
+          locked: true,
+          description: INPUT_CLIENT_ID_LOCKED
 
     run do
       wait(
-        identifier: access_token,
+        identifier: client_id,
         message: %(
           ### Adaptive Questionnaire Retrieval
 
           1. **Questionnaire Package Request**:
             - Invoke the `$questionnaire-package` operation by sending a POST request to the following
-            endpoint to retrieve the adaptive questionnaire package:
+              endpoint to retrieve the adaptive questionnaire package:
 
               `#{questionnaire_package_url}`.
 
@@ -38,7 +44,7 @@ module DaVinciDTRTestKit
 
           2. **Initial Next Question Request**:
             - After receiving the questionnaire package, invoke the `$next-question` operation by sending
-            a POST request to the following endpoint to retrieve the first set of questions:
+              a POST request to the following endpoint to retrieve the first set of questions:
 
               `#{next_url}`.
 
@@ -46,18 +52,9 @@ module DaVinciDTRTestKit
 
           Inferno will wait for both of these requests to be made.
 
-          ### Request Identification
-
-          In order to identify requests for this session, Inferno will look for
-          an `Authorization` header with value:
-
-          ```
-          Bearer #{access_token}
-          ```
-
           ### Continuing the Tests
 
-          When both requests have been made, [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
+          When both requests have been made, [Click here](#{resume_pass_url}?token=#{client_id}) to continue.
         )
       )
     end