onc_certification_g10_test_kit 7.0.3 → 7.2.0

data/lib/inferno/ext/bloomer.rb

@@ -18,7 +18,7 @@ class Bloomer
     def self.initial_size(length)
       size = 2**Math.log2(length).ceil
 
-      size < 256 ? 256 : size
+      [size, 256].max
     end
   end
 end

data/lib/inferno/terminology/tasks/process_umls.rb

@@ -37,7 +37,7 @@ module Inferno
                 case code_system
                 when 'SNOMEDCT_US'
                   code_system = 'SNOMED'
-                  include_code = (row[4] == 'PF' && ['FN', 'OAF'].include?(row[12]))
+                  include_code = row[4] == 'PF' && ['FN', 'OAF'].include?(row[12])
                 when 'LNC'
                   code_system = 'LOINC'
                   include_code = true

data/lib/onc_certification_g10_test_kit/bulk_data_authorization.rb

@@ -7,43 +7,33 @@ module ONCCertificationG10TestKit
 
     id :bulk_data_authorization
 
-    input :bulk_token_endpoint,
-          title: 'Backend Services Token Endpoint',
-          description: <<~DESCRIPTION
-            The OAuth 2.0 Token Endpoint used by the Backend Services specification to provide bearer tokens.
-          DESCRIPTION
-    input :bulk_client_id,
-          title: 'Bulk Data Client ID',
-          description: 'Client ID provided at registration to the Inferno application.'
-    input :bulk_scope,
-          title: 'Bulk Data Scopes',
-          description: 'Bulk Data Scopes provided at registration to the Inferno application.',
-          default: 'system/*.read'
-    input :bulk_encryption_method,
-          title: 'Encryption Method',
-          description: <<~DESCRIPTION,
-            The server is required to suport either ES384 or RS384 encryption methods for JWT signature verification.
-            Select which method to use.
-          DESCRIPTION
-          type: 'radio',
-          default: 'ES384',
+    input :bulk_smart_auth_info,
+          type: :auth_info,
+          title: 'Multi-Patient API Credentials',
           options: {
-            list_options: [
+            mode: :auth,
+            components: [
               {
-                label: 'ES384',
-                value: 'ES384'
+                name: :auth_type,
+                default: 'backend_services',
+                locked: true
               },
               {
-                label: 'RS384',
-                value: 'RS384'
+                name: :use_discovery,
+                default: false,
+                locked: true
+              },
+              {
+                name: :token_url,
+                optional: false
+              },
+              {
+                name: :jwks,
+                locked: true
               }
             ]
           }
-    output :bearer_token
-
-    http_client :token_endpoint do
-      url :bulk_token_endpoint
-    end
+    output :bulk_smart_auth_info
 
     test from: :tls_version_test do
       title 'Authorization service token endpoint secured by transport layer security'
@@ -56,8 +46,13 @@ module ONCCertificationG10TestKit
       DESCRIPTION
       id :g10_bulk_token_tls_version
 
+      input :bulk_smart_auth_info, type: :auth_info
+
+      def url
+        bulk_smart_auth_info.token_url
+      end
+
       config(
-        inputs: { url: { name: :bulk_token_endpoint } },
         options: {  minimum_allowed_version: OpenSSL::SSL::TLS1_2_VERSION }
       )
     end
@@ -80,14 +75,17 @@ module ONCCertificationG10TestKit
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/authorization/index.html#protocol-details'
 
       run do
-        post_request_content = AuthorizationRequestBuilder.build(encryption_method: bulk_encryption_method,
-                                                                 scope: bulk_scope,
-                                                                 iss: bulk_client_id,
-                                                                 sub: bulk_client_id,
-                                                                 aud: bulk_token_endpoint,
-                                                                 grant_type: 'not_a_grant_type')
-
-        post(**{ client: :token_endpoint }.merge(post_request_content))
+        post_request_content =
+          AuthorizationRequestBuilder.build(
+            encryption_method: bulk_smart_auth_info.encryption_algorithm,
+            scope: bulk_smart_auth_info.requested_scopes,
+            iss: bulk_smart_auth_info.client_id,
+            sub: bulk_smart_auth_info.client_id,
+            aud: bulk_smart_auth_info.token_url,
+            grant_type: 'not_a_grant_type'
+          )
+
+        post(bulk_smart_auth_info.token_url, **post_request_content)
 
         assert_response_status(400)
       end
@@ -111,14 +109,17 @@ module ONCCertificationG10TestKit
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/authorization/index.html#protocol-details'
 
       run do
-        post_request_content = AuthorizationRequestBuilder.build(encryption_method: bulk_encryption_method,
-                                                                 scope: bulk_scope,
-                                                                 iss: bulk_client_id,
-                                                                 sub: bulk_client_id,
-                                                                 aud: bulk_token_endpoint,
-                                                                 client_assertion_type: 'not_an_assertion_type')
-
-        post(**{ client: :token_endpoint }.merge(post_request_content))
+        post_request_content =
+          AuthorizationRequestBuilder.build(
+            encryption_method: bulk_smart_auth_info.encryption_algorithm,
+            scope: bulk_smart_auth_info.requested_scopes,
+            iss: bulk_smart_auth_info.client_id,
+            sub: bulk_smart_auth_info.client_id,
+            aud: bulk_smart_auth_info.token_url,
+            client_assertion_type: 'not_an_assertion_type'
+          )
+
+        post(bulk_smart_auth_info.token_url, **post_request_content)
 
         assert_response_status(400)
       end
@@ -151,13 +152,16 @@ module ONCCertificationG10TestKit
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/authorization/index.html#protocol-details'
 
       run do
-        post_request_content = AuthorizationRequestBuilder.build(encryption_method: bulk_encryption_method,
-                                                                 scope: bulk_scope,
-                                                                 iss: 'not_a_valid_iss',
-                                                                 sub: bulk_client_id,
-                                                                 aud: bulk_token_endpoint)
+        post_request_content =
+          AuthorizationRequestBuilder.build(
+            encryption_method: bulk_smart_auth_info.encryption_algorithm,
+            scope: bulk_smart_auth_info.requested_scopes,
+            iss: 'not_a_valid_iss',
+            sub: bulk_smart_auth_info.client_id,
+            aud: bulk_smart_auth_info.token_url
+          )
 
-        post(**{ client: :token_endpoint }.merge(post_request_content))
+        post(bulk_smart_auth_info.token_url, **post_request_content)
 
         assert_response_status([400, 401])
       end
@@ -170,20 +174,21 @@ module ONCCertificationG10TestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/authorization/index.html#issuing-access-tokens'
 
-      output :authentication_response
+      makes_request :bulk_authentication
 
       run do
-        post_request_content = AuthorizationRequestBuilder.build(encryption_method: bulk_encryption_method,
-                                                                 scope: bulk_scope,
-                                                                 iss: bulk_client_id,
-                                                                 sub: bulk_client_id,
-                                                                 aud: bulk_token_endpoint)
+        post_request_content =
+          AuthorizationRequestBuilder.build(
+            encryption_method: bulk_smart_auth_info.encryption_algorithm,
+            scope: bulk_smart_auth_info.requested_scopes,
+            iss: bulk_smart_auth_info.client_id,
+            sub: bulk_smart_auth_info.client_id,
+            aud: bulk_smart_auth_info.token_url
+          )
 
-        authentication_response = post(**{ client: :token_endpoint }.merge(post_request_content))
+        post(bulk_smart_auth_info.token_url, **post_request_content, name: :bulk_authentication)
 
         assert_response_status([200, 201])
-
-        output authentication_response: authentication_response.response_body
       end
     end
 
@@ -201,17 +206,18 @@ module ONCCertificationG10TestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/authorization/index.html#issuing-access-tokens'
 
-      input :authentication_response
-      output :bearer_token
+      uses_request :bulk_authentication
+      output :bulk_smart_auth_info
 
       run do
-        assert_valid_json(authentication_response)
-        response_body = JSON.parse(authentication_response)
+        assert_valid_json(request.response_body)
+        response_body = JSON.parse(request.response_body)
 
         access_token = response_body['access_token']
         assert access_token.present?, 'Token response did not contain access_token as required'
 
-        output bearer_token: access_token
+        bulk_smart_auth_info.update_from_response_body(request)
+        output bulk_smart_auth_info: bulk_smart_auth_info
 
         required_keys = ['token_type', 'expires_in', 'scope']
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_cancel_stu1.rb

@@ -10,8 +10,7 @@ module ONCCertificationG10TestKit
       correct behavior.
     )
 
-    input :bearer_token,
-          optional: true
+    input :bulk_smart_auth_info, type: :auth_info
     input :bulk_server_url,
           title: 'Bulk Data FHIR URL',
           description: 'The URL of the Bulk FHIR server.'

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_cancel_stu2.rb

@@ -21,7 +21,13 @@ module ONCCertificationG10TestKit
       run do
         skip 'No polling url available' unless cancelled_polling_url.present?
 
-        get(cancelled_polling_url, headers: { authorization: "Bearer #{bearer_token}", accept: 'application/json' })
+        get(
+          cancelled_polling_url,
+          headers: {
+            authorization: "Bearer #{bulk_smart_auth_info.access_token}",
+            accept: 'application/json'
+          }
+        )
 
         assert_response_status(404)
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_parameters.rb

@@ -8,7 +8,7 @@ module ONCCertificationG10TestKit
       Verify that the Bulk Data server supports required query parameters.
     )
 
-    input :bearer_token
+    input :bulk_smart_auth_info, type: :auth_info
     input :bulk_server_url,
           title: 'Bulk Data FHIR URL',
           description: 'The URL of the Bulk FHIR server.'

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -9,7 +9,7 @@ module ONCCertificationG10TestKit
     DESCRIPTION
     id :bulk_data_group_export
 
-    input :bearer_token
+    input :bulk_smart_auth_info, type: :auth_info
     input :bulk_server_url,
           title: 'Bulk Data FHIR URL',
           description: 'The URL of the Bulk FHIR server.'
@@ -137,6 +137,8 @@ module ONCCertificationG10TestKit
       include ExportKickOffPerformer
 
       run do
+        skip_if bulk_smart_auth_info.access_token.blank?, 'No access token was received'
+
         perform_export_kick_off_request(use_token: false)
         assert_response_status([400, 401])
       end
@@ -199,7 +201,13 @@ module ONCCertificationG10TestKit
         used_time = 0
 
         loop do
-          get(polling_url, headers: { authorization: "Bearer #{bearer_token}", accept: 'application/json' })
+          get(
+            polling_url,
+            headers: {
+              authorization: "Bearer #{bulk_smart_auth_info.access_token}",
+              accept: 'application/json'
+            }
+          )
 
           retry_after_val = request.response_header('retry-after')&.value.to_i
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_validation.rb

@@ -10,7 +10,8 @@ module ONCCertificationG10TestKit
 
     id :g10_bulk_data_group_export_validation
 
-    input :status_output, :requires_access_token, :bearer_token, :bulk_download_url
+    input :status_output, :requires_access_token, :bulk_download_url
+    input :bulk_smart_auth_info, type: :auth_info
     input :lines_to_validate,
           title: 'Limit validation to a maximum resource count',
           description: 'To validate all, leave blank.',
@@ -62,12 +63,15 @@ module ONCCertificationG10TestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#file-request'
 
-      input :bulk_download_url, :requires_access_token, :requires_access_token, :bearer_token
+      input :bulk_download_url, :requires_access_token
+      input :bulk_smart_auth_info, type: :auth_info
 
       run do
         omit_if requires_access_token == 'false',
                 'Could not verify this functionality when requiresAccessToken is false'
 
+        skip_if bulk_smart_auth_info.access_token.blank?, 'No access token was received'
+
         get(bulk_download_url, headers: { accept: 'application/fhir+ndjson' })
         assert_response_status([400, 401])
       end

data/lib/onc_certification_g10_test_kit/bulk_export_validation_tester.rb

@@ -36,6 +36,10 @@ module ONCCertificationG10TestKit
       scratch[:patient_ids_seen] ||= []
     end
 
+    def bearer_token
+      bulk_smart_auth_info.access_token
+    end
+
     def build_headers(use_token)
       headers = { accept: 'application/fhir+ndjson' }
       headers.merge!({ authorization: "Bearer #{bearer_token}" }) if use_token == 'true'
@@ -43,13 +47,13 @@ module ONCCertificationG10TestKit
     end
 
     def stream_ndjson(endpoint, headers, process_chunk_line, process_response) # rubocop:disable Metrics/CyclomaticComplexity
-      hanging_chunk = String.new
+      hanging_chunk = ''
 
       process_body = proc { |chunk|
         hanging_chunk << chunk
         chunk_by_lines = hanging_chunk.lines
 
-        hanging_chunk = chunk_by_lines.pop || String.new
+        hanging_chunk = chunk_by_lines.pop || ''
 
         chunk_by_lines.each do |elem|
           process_chunk_line.call(elem)
@@ -89,7 +93,7 @@ module ONCCertificationG10TestKit
         coding.code if coding.system.nil? || coding.system == 'http://snomed.info/sct'
       end
 
-      (expected & actual).any?
+      expected.intersect?(actual)
     end
 
     def determine_profile(resource)

data/lib/onc_certification_g10_test_kit/configuration_checker.rb

@@ -2,9 +2,7 @@ require_relative '../inferno/terminology/tasks/check_built_terminology'
 
 module ONCCertificationG10TestKit
   class ConfigurationChecker
-    EXPECTED_VALIDATOR_VERSION = '2.3.2'.freeze
-    INFERNO_VALIDATOR_VERSION_KEY = 'inferno-framework/fhir-validator-wrapper'.freeze
-    EXPECTED_HL7_VALIDATOR_VERSION = '1.0.60'.freeze
+    EXPECTED_HL7_VALIDATOR_VERSION = '1.0.65'.freeze
     HL7_VALIDATOR_VERSION_KEY = 'validatorWrapperVersion'.freeze
 
     def configuration_messages
@@ -24,15 +22,9 @@ module ONCCertificationG10TestKit
     end
 
     def validator_version_message
-      if Feature.use_hl7_resource_validator?
-        expected_validator_version = EXPECTED_HL7_VALIDATOR_VERSION
-        validator_version_key = HL7_VALIDATOR_VERSION_KEY
-        validator_version_url = "#{validator_url}/validator/version"
-      else
-        expected_validator_version = EXPECTED_VALIDATOR_VERSION
-        validator_version_key = INFERNO_VALIDATOR_VERSION_KEY
-        validator_version_url = "#{validator_url}/version"
-      end
+      expected_validator_version = EXPECTED_HL7_VALIDATOR_VERSION
+      validator_version_key = HL7_VALIDATOR_VERSION_KEY
+      validator_version_url = "#{validator_url}/validator/version"
 
       response = Faraday.get validator_version_url
       if response.body.starts_with? '{'
@@ -71,7 +63,7 @@ module ONCCertificationG10TestKit
 
       cs_metadata = YAML.load_file(path)
       message = "Terminology was generated based on the following code system versions:\n"
-      cs_metadata.each do |_url, metadata|
+      cs_metadata.each_value do |metadata|
         message += "* #{metadata[:name]}: version #{metadata[:versions].join(', ')}\n"
       end
 

data/lib/onc_certification_g10_test_kit/encounter_context_test.rb

@@ -7,15 +7,15 @@ module ONCCertificationG10TestKit
     )
     id :g10_encounter_context
     input :encounter_id, :url
-    input :smart_credentials, type: :oauth_credentials
+    input :smart_auth_info, type: :auth_info
 
     fhir_client :authenticated do
       url :url
-      oauth_credentials :smart_credentials
+      auth_info :smart_auth_info
     end
 
     run do
-      skip_if smart_credentials.access_token.blank?, 'No access token was received during the SMART launch'
+      skip_if smart_auth_info.access_token.blank?, 'No access token was received during the SMART launch'
 
       skip_if encounter_id.blank?, 'Token response did not contain `encounter` field'
 

data/lib/onc_certification_g10_test_kit/export_kick_off_performer.rb

@@ -1,10 +1,14 @@
 module ONCCertificationG10TestKit
   module ExportKickOffPerformer
+    def access_token
+      bulk_smart_auth_info.access_token
+    end
+
     def perform_export_kick_off_request(use_token: true, params: {})
-      skip_if use_token && bearer_token.blank?, 'Could not verify this functionality when bearer token is not set'
+      skip_if use_token && access_token.blank?, 'Could not verify this functionality when bearer token is not set'
 
       headers = { accept: 'application/fhir+json', prefer: 'respond-async' }
-      headers.merge!({ authorization: "Bearer #{bearer_token}" }) if use_token
+      headers.merge!({ authorization: "Bearer #{access_token}" }) if use_token
 
       url = "Group/#{group_id}/$export"
       param_str = params.map { |k, v| URI.encode_www_form(k => v) }.join('&')
@@ -16,7 +20,7 @@ module ONCCertificationG10TestKit
       polling_url = request&.response_header('content-location')&.value
       assert polling_url.present?, 'Export response header did not include "Content-Location"'
 
-      headers = { accept: 'application/json', authorization: "Bearer #{bearer_token}" }
+      headers = { accept: 'application/json', authorization: "Bearer #{access_token}" }
 
       delete(polling_url, headers:)
       assert_response_status(202)

data/lib/onc_certification_g10_test_kit/feature.rb

@@ -1,9 +1,10 @@
 module ONCCertificationG10TestKit
   module Feature
-    class << self
-      def use_hl7_resource_validator?
-        ENV.fetch('USE_HL7_RESOURCE_VALIDATOR', 'false')&.casecmp?('true')
-      end
+    class << self # rubocop:disable Lint/EmptyClass
+      # This is how you can define feature flags to be used in the g10 test kit
+      # def us_core_v4?
+      #   ENV.fetch('US_CORE_4_ENABLED', 'false')&.casecmp?('true')
+      # end
     end
   end
 end

data/lib/onc_certification_g10_test_kit/metadata.rb

@@ -0,0 +1,103 @@
+require_relative 'version'
+
+module ONCCertificationG10TestKit
+  class Metadata < Inferno::TestKit
+    id :onc_certification_g10_test_kit
+    title 'ONC Certification (g)(10) Standardized API Test Kit'
+    description <<~DESCRIPTION
+      The ONC Certification (g)(10) Standardized API Test Kit is a testing tool for
+      Health IT systems seeking to meet the requirements of the Standardized API for
+      Patient and Population Services criterion § 170.315(g)(10) in the ONC
+      Certification Program. It is an approved test method for the [§ 170.315(g)(10)
+      test
+      procedure](https://www.healthit.gov/test-method/standardized-api-patient-and-population-services#test_procedure).
+      <!-- break -->
+
+      Systems may adopt later versions of standards than those named in the rule as
+      approved by the ONC Standards Version Advancement Process (SVAP).  Please note
+      that US Core Implementation Guide v.7.0.0 should only be used with SMART
+      App Launch Guide v2.0.0 or above due to granular scope support
+      requirements within this version of US Core.
+
+      Please select which approved version of each standard to use, and click 'Create
+      Test Session' to begin testing.
+
+      This test kit includes a [simulated conformant FHIR
+      API](https://inferno.healthit.gov/reference-server/) that can be used to
+      demonstrate success for all tests. This simulated API is open source and is
+      available on
+      [GitHub](https://github.com/inferno-framework/inferno-reference-server). Visit
+      the
+      [walkthrough](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/Walkthrough)
+      for a demonstration of using these tests against the provided simulated FHIR
+      API.
+
+      ## Status
+
+      The ONC Certification (g)(10) Standardized API is actively developed and updates
+      are released monthly.
+
+      The test kit currently tests all requirements for the [Standardized API for
+      Patient and Population Services criterion §
+      170.315(g)(10)](https://www.healthit.gov/test-method/standardized-api-patient-and-population-services),
+      including updates from the [HTI-1 Final
+      Rule](https://www.healthit.gov/topic/laws-regulation-and-policy/health-data-technology-and-interoperability-certification-program).
+      This includes:
+      - SMART App Standalone Launch with full system access
+      - SMART App Standalone Launch with limited system access
+      - SMART App Standalone Launch with OpenID Connect
+      - SMART App EHR Launch with user scopes
+      - SMART App EHR Launch with patient scopes
+      - SMART App Launch Invalid AUD Parameter
+      - SMART App Launch Invalid Access Token Request
+      - SMART App Launch Token Introspection
+      - SMART App Launch v1 and v2 scopes
+      - SMART App Launch finer-grained scope access
+      - Support for Capability Statement
+      - Support for all US Core Profiles
+      - Searches required for each resource
+      - Support for Must Support Elements
+      - Profile Validation
+      - Reference Validation
+      - Export of multiple patients using the FHIR Bulk Data Access IG
+
+      See the test descriptions within the test kit for detail on the specific
+      validations performed as part of testing these requirements.
+
+      ## Repository and Resources
+
+      The ONC Certification (g)(10) Standardized API Test Kit can be [downloaded from
+      its GitHub
+      repository](https://github.com/onc-healthit/onc-certification-g10-test-kit),
+      where additional resources and documentation are also available to help users
+      get started with the testing process. The repository
+      [Wiki](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/FAQ)
+      provides a
+      [FAQ](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/FAQ)
+      for testers, and the
+      [Releases](https://github.com/onc-healthit/onc-certification-g10-test-kit/releases)
+      page provides information about each new release.
+
+      ## Providing Feedback and Reporting Issues
+
+      We welcome feedback on the tests, including but not limited to the following areas:
+
+      - Validation logic, such as potential bugs, lax checks, and unexpected failures.
+      - Requirements coverage, such as requirements that have been missed, tests that
+        necessitate features that the IG does not require, or other issues with the
+        interpretation of the IG's requirements.
+      - User experience, such as confusing or missing information in the test UI.
+
+      Please report any issues with this set of tests in the [issues
+      section](https://github.com/onc-healthit/onc-certification-g10-test-kit/issues)
+      of the repository.
+    DESCRIPTION
+    suite_ids [:g10_certification]
+    tags ['SMART App Launch', 'US Core', 'Bulk Data']
+    last_updated LAST_UPDATED
+    version VERSION
+    maturity 'High'
+    authors ['Stephen MacVicar']
+    repo 'https://github.com/onc-healthit/onc-certification-g10-test-kit'
+  end
+end

data/lib/onc_certification_g10_test_kit/multi_patient_api_stu1.rb

@@ -45,10 +45,6 @@ module ONCCertificationG10TestKit
     run_as_group
 
     input_order :bulk_server_url,
-                :bulk_token_endpoint,
-                :bulk_client_id,
-                :bulk_scope,
-                :bulk_encryption_method,
                 :group_id,
                 :bulk_patient_ids_in_group,
                 :bulk_device_types_in_group,

data/lib/onc_certification_g10_test_kit/multi_patient_api_stu2.rb

@@ -45,16 +45,20 @@ module ONCCertificationG10TestKit
     run_as_group
 
     input_order :bulk_server_url,
-                :bulk_token_endpoint,
-                :bulk_client_id,
-                :bulk_scope,
-                :bulk_encryption_method,
                 :group_id,
                 :bulk_patient_ids_in_group,
                 :bulk_device_types_in_group,
                 :lines_to_validate,
                 :bulk_timeout
 
+    config(
+      inputs: {
+        url: {
+          name: :bulk_server_url
+        }
+      }
+    )
+
     group from: :bulk_data_authorization,
           description: <<~DESCRIPTION
             Bulk Data servers are required to authorize clients using the [Backend Service

data/lib/onc_certification_g10_test_kit/patient_context_test.rb

@@ -8,15 +8,15 @@ module ONCCertificationG10TestKit
     )
     id :g10_patient_context
     input :patient_id, :url
-    input :smart_credentials, type: :oauth_credentials
+    input :smart_auth_info, type: 'auth_info'
 
     fhir_client :authenticated do
       url :url
-      oauth_credentials :smart_credentials
+      auth_info :smart_auth_info
     end
 
     run do
-      skip_if smart_credentials.access_token.blank?, 'No access token was received during the SMART launch'
+      skip_if smart_auth_info.access_token.blank?, 'No access token was received during the SMART launch'
 
       skip_if patient_id.blank?, 'Token response did not contain `patient` field'
 

data/lib/onc_certification_g10_test_kit/patient_scope_test.rb

@@ -22,7 +22,7 @@ module ONCCertificationG10TestKit
 
     run do
       expected_scopes =
-        if scope_version == :v2 || scope_version == :v22
+        if [:v2, :v22].include?(scope_version)
           [
             Regexp.new(scope_regex_string('patient/Patient.rs').gsub('.rs', '.r?s')),
             Regexp.new(scope_regex_string('patient/Patient.rs').gsub('.rs', '.rs?'))