Add SMART 0.4.6 changes, update short_ids, add US Core 0.9.0 changes

onc-healthit · Nov 7, 2024 · 5aee538 · 5aee538
1 parent 9759779
commit 5aee538
Show file tree

Hide file tree

Showing 9 changed files with 309 additions and 158 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 group :development, :test do
+  gem 'debug'
   gem 'rubocop', '~> 1.9'
   gem 'rubocop-rspec', require: false
   gem 'rubyXL'
-  gem 'debug'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,14 +4,14 @@ PATH
     onc_certification_g10_test_kit (6.0.3)
       bloomer (~> 1.0.0)
       colorize (~> 0.8.1)
-      inferno_core (~> 0.4.34)
+      inferno_core (~> 0.5.0)
       json-jwt (~> 1.15.3)
       mime-types (~> 3.4.0)
       ndjson (~> 1.0.0)
       rubyzip (~> 2.3.2)
-      smart_app_launch_test_kit (= 0.4.5)
-      tls_test_kit (= 0.2.3)
-      us_core_test_kit (= 0.8.2)
+      smart_app_launch_test_kit (= 0.4.6)
+      tls_test_kit (= 0.2.2)
+      us_core_test_kit (= 0.9.0)
 
 GEM
   remote: https://rubygems.org/
@@ -149,7 +149,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    inferno_core (0.4.44)
+    inferno_core (0.5.0)
       activesupport (~> 6.1.7.5)
       base62-rb (= 0.3.1)
       blueprinter (= 0.25.2)
@@ -293,7 +293,7 @@ GEM
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.19.0)
-    smart_app_launch_test_kit (0.4.5)
+    smart_app_launch_test_kit (0.4.6)
       inferno_core (>= 0.4.2)
       json-jwt (~> 1.15.3)
       jwt (~> 2.6)
@@ -325,9 +325,9 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
-    us_core_test_kit (0.8.2)
+    us_core_test_kit (0.9.0)
       inferno_core (>= 0.4.37)
-      smart_app_launch_test_kit (>= 0.4.0)
+      smart_app_launch_test_kit (>= 0.4.6)
       tls_test_kit (~> 0.2.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)

diff --git a/lib/onc_certification_g10_test_kit/short_id_map.yml b/lib/onc_certification_g10_test_kit/short_id_map.yml
diff --git a/lib/onc_certification_g10_test_kit/single_patient_us_core_7_api_group.rb b/lib/onc_certification_g10_test_kit/single_patient_us_core_7_api_group.rb
@@ -171,7 +171,7 @@ class SinglePatientUSCore7APIGroup < Inferno::TestGroup
       end
     end
 
-    USCoreTestKit::USCoreV700::USCoreTestSuite.groups[1].groups.each do |group|
+    USCoreTestKit::USCoreV700::USCoreTestSuite.groups.find { |g| g.title == 'US Core FHIR API' }.groups.each do |group|
       test_group = group.ancestors[1]
 
       next if test_group.optional?

diff --git a/lib/onc_certification_g10_test_kit/smart_asymmetric_launch_group.rb b/lib/onc_certification_g10_test_kit/smart_asymmetric_launch_group.rb
@@ -144,8 +144,7 @@ class SMARTAsymmetricLaunchGroup < Inferno::TestGroup
 
     group from: :smart_discovery_stu2,
           required_suite_options: G10Options::SMART_2_REQUIREMENT
-    group from: :smart_discovery_stu2,
-          id: :smart_discovery_stu2_2, # rubocop:disable Naming/VariableNumber
+    group from: :smart_discovery_stu2_2, # rubocop:disable Naming/VariableNumber
           required_suite_options: G10Options::SMART_2_2_REQUIREMENT
 
     group from: :smart_standalone_launch_stu2 do

diff --git a/lib/onc_certification_g10_test_kit/smart_ehr_practitioner_app_group.rb b/lib/onc_certification_g10_test_kit/smart_ehr_practitioner_app_group.rb
@@ -129,9 +129,8 @@ class SmartEHRPractitionerAppGroup < Inferno::TestGroup
            }
     end
 
-    group from: :smart_discovery_stu2 do
+    group from: :smart_discovery_stu2_2 do # rubocop:disable Naming/VariableNumber
       required_suite_options(G10Options::SMART_2_2_REQUIREMENT)
-      id :smart_discovery_stu2_2 # rubocop:disable Naming/VariableNumber
 
       test from: 'g10_smart_well_known_capabilities',
            config: {
@@ -638,6 +637,30 @@ class SmartEHRPractitionerAppGroup < Inferno::TestGroup
     end
 
     group from: :smart_openid_connect,
+          required_suite_options: G10Options::SMART_1_REQUIREMENT,
+          config: {
+            inputs: {
+              id_token: { name: :ehr_id_token },
+              client_id: { name: :ehr_client_id },
+              requested_scopes: { name: :ehr_requested_scopes },
+              smart_credentials: { name: :ehr_smart_credentials }
+            }
+          }
+
+    group from: :smart_openid_connect,
+          required_suite_options: G10Options::SMART_2_REQUIREMENT,
+          id: :smart_openid_connect_stu2,
+          config: {
+            inputs: {
+              id_token: { name: :ehr_id_token },
+              client_id: { name: :ehr_client_id },
+              requested_scopes: { name: :ehr_requested_scopes },
+              smart_credentials: { name: :ehr_smart_credentials }
+            }
+          }
+
+    group from: :smart_openid_connect_stu2_2, # rubocop:disable Naming/VariableNumber
+          required_suite_options: G10Options::SMART_2_2_REQUIREMENT,
           config: {
             inputs: {
               id_token: { name: :ehr_id_token },

diff --git a/lib/onc_certification_g10_test_kit/smart_granular_scope_selection_group.rb b/lib/onc_certification_g10_test_kit/smart_granular_scope_selection_group.rb
@@ -86,8 +86,7 @@ class SmartGranularScopeSelectionGroup < Inferno::TestGroup
 
     group from: :smart_discovery_stu2,
           required_suite_options: G10Options::SMART_2_REQUIREMENT
-    group from: :smart_discovery_stu2,
-          id: :smart_discovery_stu2_2, # rubocop:disable Naming/VariableNumber
+    group from: :smart_discovery_stu2_2, # rubocop:disable Naming/VariableNumber
           required_suite_options: G10Options::SMART_2_2_REQUIREMENT
 
     group from: :smart_standalone_launch_stu2 do

diff --git a/lib/onc_certification_g10_test_kit/smart_standalone_patient_app_group.rb b/lib/onc_certification_g10_test_kit/smart_standalone_patient_app_group.rb
@@ -115,9 +115,8 @@ class SmartStandalonePatientAppGroup < Inferno::TestGroup
            }
     end
 
-    group from: :smart_discovery_stu2 do
+    group from: :smart_discovery_stu2_2 do # rubocop:disable Naming/VariableNumber
       required_suite_options(G10Options::SMART_2_2_REQUIREMENT)
-      id :smart_discovery_stu2_2 # rubocop:disable Naming/VariableNumber
 
       test from: 'g10_smart_well_known_capabilities',
            config: {
@@ -462,6 +461,30 @@ class SmartStandalonePatientAppGroup < Inferno::TestGroup
     end
 
     group from: :smart_openid_connect,
+          required_suite_options: G10Options::SMART_1_REQUIREMENT,
+          config: {
+            inputs: {
+              id_token: { name: :standalone_id_token },
+              client_id: { name: :standalone_client_id },
+              requested_scopes: { name: :standalone_requested_scopes },
+              smart_credentials: { name: :standalone_smart_credentials }
+            }
+          }
+
+    group from: :smart_openid_connect,
+          required_suite_options: G10Options::SMART_2_REQUIREMENT,
+          id: :smart_openid_connect_stu2,
+          config: {
+            inputs: {
+              id_token: { name: :standalone_id_token },
+              client_id: { name: :standalone_client_id },
+              requested_scopes: { name: :standalone_requested_scopes },
+              smart_credentials: { name: :standalone_smart_credentials }
+            }
+          }
+
+    group from: :smart_openid_connect_stu2_2, # rubocop:disable Naming/VariableNumber
+          required_suite_options: G10Options::SMART_2_2_REQUIREMENT,
           config: {
             inputs: {
               id_token: { name: :standalone_id_token },

diff --git a/lib/onc_certification_g10_test_kit/smart_v1_scopes_group.rb b/lib/onc_certification_g10_test_kit/smart_v1_scopes_group.rb
@@ -116,9 +116,9 @@ class SmartV1ScopesGroup < Inferno::TestGroup
              }
            }
     end
-    group from: :smart_discovery_stu2 do
+    group from: :smart_discovery_stu2_2 do # rubocop:disable Naming/VariableNumber
       required_suite_options(G10Options::SMART_2_2_REQUIREMENT)
-      id :smart_discovery_stu2_2 # rubocop:disable Naming/VariableNumber
+
       test from: 'g10_smart_well_known_capabilities',
            config: {
              options: {