subscriptions_test_kit 0.10.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0d106312b06065683c721f242cdf245652dd5b14278a933c68ebbd85d10cca
-  data.tar.gz: 20d796f12f6c84e6f332a0b9bc990d8674077a17b927cab550d4913d1e79963d
+  metadata.gz: c9611a683997bd3e7a27a77ea04fccf554db03754c3946cac7b309890cb288fb
+  data.tar.gz: '09a2627b220c04aa0352ee45d8ee703841d5f3bde433c2adb4bc8f3b70605315'
 SHA512:
-  metadata.gz: 29543919ba760e5227ac5a72b27467e9b3d3f23b475d39d7c99d4e96a13467edbacefa1f5f1754f12251c25758e4109996e3cca4d703f921d7f0aed36537abc2
-  data.tar.gz: 9b2dbbb0563af958aca05c08c3e1894c61343b3ed9a5b0dd6f86cf087f36a44a4bc3385f75d41a8577acaf0ba59db377f09ab5cdffd70d1d5775bb36132e3c95
+  metadata.gz: 71d120fa262f7180abd5d13542d7daed8ea5b2c49559a603775e19eb233363524d7415911053fbe4b8491a0ab3ec2dc32b6d08ec94bc07c95eb4173ba9132a72
+  data.tar.gz: 06d457b7e543514a0e76fe061149bbc2e94dff646f0083081a7351ff029f46403c60e662e3fd10154fb2d61868d5c422cdb782786f0575d413bd291559435c1f

data/config/presets/subscription_server_preset_empty.json.erb

@@ -8,8 +8,12 @@
       "value": "<%= Inferno::Application['base_url'] %>/custom/subscriptions_r5_backport_r4_client/fhir"
     },
     {
-      "name": "credentials",
-      "value": "{\"access_token\":\"SAMPLE_TOKEN\"}"
+      "name": "smart_auth_info",
+      "type": "auth_info",
+      "value": {
+        "auth_type": "public",
+        "access_token": "SAMPLE_TOKEN"
+      }
     },
     {
       "name": "subscription_resource",
@@ -20,4 +24,4 @@
       "value": "SAMPLE_TOKEN"
     }
   ]
-}
+}

data/config/presets/subscription_server_preset_full_resource.json.erb

@@ -8,8 +8,12 @@
       "value": "<%= Inferno::Application['base_url'] %>/custom/subscriptions_r5_backport_r4_client/fhir"
     },
     {
-      "name": "credentials",
-      "value": "{\"access_token\":\"SAMPLE_TOKEN\"}"
+      "name": "smart_auth_info",
+      "type": "auth_info",
+      "value": {
+        "auth_type": "public",
+        "access_token": "SAMPLE_TOKEN"
+      }
     },
     {
       "name": "subscription_resource",
@@ -20,4 +24,4 @@
       "value": "SAMPLE_TOKEN"
     }
   ]
-}
+}

data/config/presets/subscription_server_preset_id_only.json.erb

@@ -8,8 +8,12 @@
       "value": "<%= Inferno::Application['base_url'] %>/custom/subscriptions_r5_backport_r4_client/fhir"
     },
     {
-      "name": "credentials",
-      "value": "{\"access_token\":\"SAMPLE_TOKEN\"}"
+      "name": "smart_auth_info",
+      "type": "auth_info",
+      "value": {
+        "auth_type": "public",
+        "access_token": "SAMPLE_TOKEN"
+      }
     },
     {
       "name": "subscription_resource",
@@ -20,4 +24,4 @@
       "value": "SAMPLE_TOKEN"
     }
   ]
-}
+}

data/lib/subscriptions_test_kit/common/subscription_conformance_verification.rb

@@ -66,7 +66,6 @@ module SubscriptionsTestKit
                             profile_url: 'http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/backport-subscription')
 
       cross_version_extension_check(subscription)
-      subscription
     end
 
     def server_check_channel(subscription, access_token)

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow_group.rb

@@ -13,7 +13,7 @@ module SubscriptionsTestKit
       title 'Demonstrate the Rest-Hook Subscription Workflow'
       description %(
         This test allows the tester to demonstrate the ability of the client
-        to request the= creation of a FHIR Subscription instance and receive
+        to request the creation of a FHIR Subscription instance and receive
         notifications for that Subscription.
 
         The tester must provide the body of an event notification

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/capability_statement/cs_conformance_test.rb

@@ -21,9 +21,8 @@ module SubscriptionsTestKit
         fhir_get_capability_statement
         assert_response_status(200)
         assert_resource_type(:capability_statement)
-        assert_valid_resource
-
         scratch[:capability_statement] ||= resource
+        assert_valid_resource
 
         assert(resource.rest.present?, 'Capability Statement missing the `rest` field')
         rest_server = resource.rest.find { |elem| elem.mode == 'server' }

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/common/interaction/subscription_conformance_test.rb

@@ -57,10 +57,16 @@ module SubscriptionsTestKit
 
       run do
         omit_if subscription_resource.blank?, 'Did not input a Subscription resource of this type.'
-        subscription = subscription_verification(subscription_resource)
+        assert_valid_json(subscription_resource)
+        assert_resource_type('Subscription', resource: FHIR.from_contents(subscription_resource))
+        subscription = JSON.parse(subscription_resource)
+        server_check_channel(subscription, access_token)
+
+        updated_subscription = subscription.to_json
+        output(updated_subscription:)
+
+        subscription_verification(updated_subscription)
         no_error_verification('Subscription resource is not conformant.')
-        subscription = server_check_channel(subscription, access_token)
-        output updated_subscription: subscription.to_json
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/common/subscription_creation.rb

@@ -50,12 +50,13 @@ module SubscriptionsTestKit
       end
 
       def subscription_payload_type(subscription)
-        return unless subscription['channel']['_payload']
+        payload_extensions = subscription.dig('channel', '_payload', 'extension')
+        return unless payload_extensions
 
-        payload_extension = subscription['channel']['_payload']['extension'].find do |ext|
+        payload_type = payload_extensions.find do |ext|
           ext['url'].ends_with?('/backport-payload-content')
         end
-        payload_extension['valueCode']
+        payload_type&.dig('valueCode')
       end
 
       def send_subscription(subscription)

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/empty_content_group.rb

@@ -16,7 +16,7 @@ module SubscriptionsTestKit
       run_as_group
       optional
 
-      input_order :url, :credentials, :access_token, :empty_subscription_resource
+      input_order :url, :smart_auth_info, :access_token, :empty_subscription_resource
 
       group from: :subscriptions_r4_server_interaction do
         id :subscriptions_r4_server_empty_content_interaction

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/full_resource_content_group.rb

@@ -16,7 +16,7 @@ module SubscriptionsTestKit
       run_as_group
       optional
 
-      input_order :url, :credentials, :access_token, :full_resource_subscription_resource
+      input_order :url, :smart_auth_info, :access_token, :full_resource_subscription_resource
 
       group from: :subscriptions_r4_server_interaction do
         id :subscriptions_r4_server_full_resource_content_interaction

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/id_only_content_group.rb

@@ -16,7 +16,7 @@ module SubscriptionsTestKit
       run_as_group
       optional
 
-      input_order :url, :credentials, :access_token, :id_only_subscription_resource
+      input_order :url, :smart_auth_info, :access_token, :id_only_subscription_resource
 
       group from: :subscriptions_r4_server_interaction do
         id :subscriptions_r4_server_id_only_content_interaction

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification_group.rb

@@ -15,7 +15,7 @@ module SubscriptionsTestKit
         `empty`, `id-only`, and `full-resource`.
       )
 
-      input_order :url, :credentials, :access_token, :empty_subscription_resource,
+      input_order :url, :smart_auth_info, :access_token, :empty_subscription_resource,
                   :id_only_subscription_resource, :full_resource_subscription_resource
 
       group from: :subscriptions_r4_server_empty_content

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/subscription_rejection_group.rb

@@ -16,7 +16,7 @@ module SubscriptionsTestKit
         Subscription creation requests.
       )
 
-      input_order :url, :credentials, :subscription_resource, :unsupported_subscription_topic,
+      input_order :url, :smart_auth_info, :subscription_resource, :unsupported_subscription_topic,
                   :unsupported_subscription_filter, :unsupported_subscription_channel_type,
                   :unsupported_subscription_channel_endpoint, :unsupported_subscription_payload_type,
                   :unsupported_subscription_channel_payload_combo

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/workflow_group.rb

@@ -18,7 +18,7 @@ module SubscriptionsTestKit
 
       run_as_group
 
-      input_order :url, :credentials, :access_token, :subscription_resource
+      input_order :url, :smart_auth_info, :access_token, :subscription_resource
 
       group from: :subscriptions_r4_server_interaction
       group from: :subscriptions_r4_server_interaction_verification

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server_suite.rb

@@ -44,16 +44,19 @@ module SubscriptionsTestKit
                             these tests.
                           )
 
-      input :credentials,
+      input :smart_auth_info,
             title: 'OAuth Credentials',
             description: 'Credentials for Inferno to include when making requests against the server under test.',
-            type: :oauth_credentials,
-            optional: true
+            type: :auth_info,
+            optional: true,
+            options: {
+              mode: 'access'
+            }
 
       # All FHIR requests in this suite will use this FHIR client
       fhir_client do
         url :url
-        oauth_credentials :credentials
+        auth_info :smart_auth_info
       end
 
       # All FHIR validation requests will use this FHIR validator

data/lib/subscriptions_test_kit/version.rb

@@ -1,4 +1,4 @@
 module SubscriptionsTestKit
-  VERSION = '0.10.1'.freeze
-  LAST_UPDATED = '2025-02-25'.freeze
+  VERSION = '0.11.1'.freeze
+  LAST_UPDATED = '2025-04-03'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subscriptions_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - Karl Naden, Emily Semple, Tom Strassner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core