subscriptions_test_kit 0.9.2 → 0.9.4

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/notification_input_payload_verification_test.rb

@@ -13,8 +13,11 @@ module SubscriptionsTestKit
 
       id :subscriptions_r4_client_notification_input_payload_verification
       title '[USER INPUT VERIFICATION] Notification Bundle Input Conformance Verification for Payload Content'
-      description 'This test verifies that the notification bundle from the test input meets the requirements '\
-                  'of the payload indicated in the subscription created by the client under test.'
+      description %(
+        This test verifies that the notification bundle sent by Inferno meets the requirements
+        of the payload indicated in the subscription created by the client under test.
+        The content of the notification will be based on the Bundle provided by the tester.
+      )
       input :notification_bundle
 
       run do
@@ -30,21 +33,25 @@ module SubscriptionsTestKit
         payload_content_code = payload_ext['valueCode'] if payload_ext
         skip_if(payload_content_code.nil?, 'Subscription does not have a payload content code')
 
-        criteria_resource_type = subscription_criteria(subscription.source_hash)
+        load_tagged_requests(REST_HOOK_EVENT_NOTIFICATION_TAG)
+        skip_if(requests.none?, 'Inferno did not send an event notification')
 
         case payload_content_code
         when 'empty'
-          empty_event_notification_verification(notification_bundle)
+          empty_event_notification_verification(request.request_body)
         when 'id-only'
-          id_only_event_notification_verification(notification_bundle, criteria_resource_type)
+          id_only_event_notification_verification(request.request_body, nil)
         when 'full-resource'
-          full_resource_event_notification_verification(notification_bundle, criteria_resource_type)
+          full_resource_event_notification_verification(request.request_body, nil)
         else
           skip "Unrecognized payload content code: #{payload_content_code}"
         end
 
-        no_error_verification('Notification bundle input payload content was not conformant, see error messages')
+        no_error_verification(%(
+          Notification bundle payload content was not conformant to requirements of the #{payload_content_code}
+          content type. See error messages for details.
+        ))
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/notification_input_verification_test.rb

@@ -10,16 +10,19 @@ module SubscriptionsTestKit
       id :subscriptions_r4_client_notification_input_verification
       title '[USER INPUT VERIFICATION] Notification Bundle Input Conformance Verification'
       description %(
-        This test verifies that the notification bundle provided by the tester is conformant
+        This test verifies that the notification bundle sent is conformant
         to the [R4 Topic-Based Subscription Notification Bundle
         profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html).
-      )
+        The content of the notification will be based on the Bundle provided by the tester.
+        )
       input :notification_bundle
 
       run do
-        notification_verification(notification_bundle, 'event-notification')
-        no_error_verification('Notification bundle input was not conformant, see error messages')
+        load_tagged_requests(REST_HOOK_EVENT_NOTIFICATION_TAG)
+        skip_if(requests.none?, 'Inferno did not send an event notification')
+        notification_verification(request.request_body, 'event-notification')
+        no_error_verification('Notification bundle was not conformant, see error messages')
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/processing_attestation_test.rb

@@ -35,4 +35,4 @@ module SubscriptionsTestKit
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/subscription_verification_test.rb

@@ -10,7 +10,7 @@ module SubscriptionsTestKit
       title 'Client Subscription Conformance Verification'
       description %(
         This test verifies that the Subscription created by the client under test
-        is conformant to the [R4/B Topic-Based Subscription 
+        is conformant to the [R4/B Topic-Based Subscription
         profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription.html)
         and meets other requirements placed on it by the IG.
       )
@@ -22,7 +22,8 @@ module SubscriptionsTestKit
         load_tagged_requests(SUBSCRIPTION_CREATE_TAG)
         skip_if(requests.none?, 'Inferno did not receive a Subscription creation request')
         subscription_verification(request.request_body)
+        no_error_verification('Subscription resource is not conformant.')
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification_group.rb

@@ -17,4 +17,4 @@ module SubscriptionsTestKit
       test from: :subscriptions_r4_client_processing_attestation
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_test.rb

@@ -3,6 +3,7 @@
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Client
     class InteractionTest < Inferno::Test
+      include URLs
       id :subscriptions_r4_client_interaction
       description %(
         During this test, the client under test will interact with Inferno following the Subscription
@@ -17,19 +18,20 @@ module SubscriptionsTestKit
         Afterwards, Inferno will no longer respond to requests.
 
         To create the handshake and event notifications, Inferno uses the contents of the *Event
-        Notification Bundle* input. The provided notification will be modified as appropriate for 
+        Notification Bundle* input. The provided notification will be modified as appropriate for
         the request Inferno is making:
         - General changes for all notification types
           - update the `subscription` parameter entry reference.
           - update the `status` parameter entry based on the previous interactions.
-          - update the `type` parameter entry based on the notification type (e.g., `event-notification` or `handshake`).
+          - update the `type` parameter entry based on the notification type (e.g., `event-notification` or
+            `handshake`).
           - update the number of notifications sent in the `events-since-subscription-start` parameter entry.
         - `handshake`-specific changes:
           - clear the `events` parameter entry.
           - clear the `errors` parameter entry.
 
-        While the provided Notification must be conformant to the 
-        [R4 Topic-Based Subscription Notification Bundle 
+        While the provided Notification must be conformant to the
+        [R4 Topic-Based Subscription Notification Bundle
         profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html)
         for the tests to pass, the tests can run as long as the notification meets the
         following minimal requirements:
@@ -49,10 +51,10 @@ module SubscriptionsTestKit
             optional: true,
             title: 'Client Notification Access Token',
             description: %(
-              The bearer token that Inferno will send on requests to the client under test's rest-hook notification endpoint. Not
-              needed if the client under test will create a Subscription with an appropriate header value in the
-              `channel.header` element. If a value for the `authorization` header is provided in `channel.header`, this
-              value will override it.
+              The bearer token that Inferno will send on requests to the client under test's rest-hook notification
+              endpoint. Not needed if the client under test will create a Subscription with an appropriate header value
+              in the `channel.header` element. If a value for the `authorization` header is provided in
+              `channel.header`, this value will override it.
             )
       input :notification_bundle,
             title: 'Event Notification Bundle',
@@ -67,7 +69,9 @@ module SubscriptionsTestKit
 
       run do
         minimally_validate_notification(notification_bundle)
-        assert(messages.none? { |m| m[:type] == 'error' }, 'Notification Bundle input is invalid for use by Inferno, see error message(s)')
+        assert(messages.none? do |m|
+                 m[:type] == 'error'
+               end, 'Notification Bundle input is invalid for use by Inferno, see error message(s)')
 
         wait(
           identifier: access_token,
@@ -118,11 +122,11 @@ module SubscriptionsTestKit
         # Require the subscription param, just because we need something to later identify the subscription status
         # bundle entry. Note we could just as easily use a different required param, like status or type.
         subscription_param = subscription_status.parameter&.find { |p| p.name == 'subscription' }
-        assert(subscription_param.present?, 'Subscription status entry in notification bundle input must contain a'\
+        assert(subscription_param.present?, 'Subscription status entry in notification bundle input must contain a' \
                                             'subscription parameter')
       rescue Inferno::Exceptions::AssertionException => e
         add_message('error', e.message)
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_verification/event_notification_verification_test.rb

@@ -23,18 +23,19 @@ module SubscriptionsTestKit
         # The SendSubscriptionNotifications job saves a nil status if the request fails entirely
         assert(request.status.present?, "Handshake notification request failed with error: #{request.response_body}")
 
-        assert(request.status.between?(200, 299), "Event notification was not successful, status code #{request.status}")
+        assert(request.status.between?(200, 299),
+               "Event notification was not successful, status code #{request.status}")
 
         subscription = find_subscription(test_session_id)
         if subscription.present?
           mime_type = subscription&.channel&.payload
           unless ALLOWED_MIME_TYPES.include?(mime_type)
-            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but Inferno
-                                    only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
-                                    Event notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
+            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but
+                                     Inferno only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
+                                     Event notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
           end
         end
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_verification/handshake_notification_verification_test.rb

@@ -23,18 +23,18 @@ module SubscriptionsTestKit
         assert(request.status.present?, "Handshake notification request failed with error: #{request.response_body}")
 
         assert(request.status.between?(200, 299),
-              "Handshake notification was not successful, status code #{request.status}")
+               "Handshake notification was not successful, status code #{request.status}")
 
         subscription = find_subscription(test_session_id)
         if subscription.present?
           mime_type = subscription&.channel&.payload
           unless ALLOWED_MIME_TYPES.include?(mime_type)
-            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but Inferno
-                                    only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
-                                    Handshake notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
+            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but
+                                     Inferno only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
+                                     Handshake notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
           end
         end
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_verification_group.rb

@@ -13,4 +13,4 @@ module SubscriptionsTestKit
       test from: :subscriptions_r4_client_event_notification_verification
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client_suite.rb

@@ -13,7 +13,8 @@ module SubscriptionsTestKit
       title 'Subscriptions R5 Backport IG v1.1.0 FHIR R4 Client Test Suite'
       short_title 'Subscriptions R4 Client'
       version VERSION
-      description File.read(File.join(__dir__, '..', 'docs', 'subscriptions_r5_backport_r4_client_suite_description.md'))
+      description File.read(File.join(__dir__, '..', 'docs',
+                                      'subscriptions_r5_backport_r4_client_suite_description.md'))
 
       links [
         {
@@ -43,7 +44,8 @@ module SubscriptionsTestKit
         end
       end
 
-      capability_statement = File.read(File.join(__dir__, 'subscriptions_r5_backport_r4_client', 'fixtures', 'capability_statement.json'))
+      capability_statement = File.read(File.join(__dir__, 'subscriptions_r5_backport_r4_client', 'fixtures',
+                                                 'capability_statement.json'))
       route(:get, '/fhir/metadata', proc { [200, { 'Content-Type' => 'application/json' }, [capability_statement]] })
 
       suite_endpoint :post, FHIR_SUBSCRIPTION_PATH, SubscriptionCreateEndpoint
@@ -63,4 +65,4 @@ module SubscriptionsTestKit
       group from: :subscriptions_r4_client_workflow
     end
   end
-end
+end

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

@@ -33,7 +33,7 @@ module SubscriptionsTestKit
         assert(rest_subscription.present?, 'Capability Statement missing `Subscription` resource in `rest` field')
 
         assert(rest_subscription.supportedProfile.present?,
-              'Capability Statement missing the `supportedProfile` field in `Subscription` resource')
+               'Capability Statement missing the `supportedProfile` field in `Subscription` resource')
 
         subscription_profile_present = rest_subscription.supportedProfile.any? do |profile|
           profile == subscription_profile_url

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

@@ -59,7 +59,7 @@ module SubscriptionsTestKit
         assert(rest_subscription.present?, 'Capability Statement missing `Subscription` resource in `rest` field')
 
         assert(rest_subscription.extension.present?,
-              'Capability Statement missing the `extension` field on the Subscription resource')
+               'Capability Statement missing the `extension` field on the Subscription resource')
         subscription_topic_extension = rest_subscription.extension.select do |elem|
           elem.url == capability_statement_subscriptiontopic_extension
         end
@@ -97,8 +97,8 @@ module SubscriptionsTestKit
           )
         else
           add_message('warning', %(
-            No Subscription requests have been made in previous tests. Run the Subscription workflow tests first in order
-            to verify topics found in the SubscriptionTopic Canonical extension))
+            No Subscription requests have been made in previous tests. Run the Subscription workflow tests first in
+            order to verify topics found in the SubscriptionTopic Canonical extension))
         end
       end
     end

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

@@ -7,9 +7,9 @@ module SubscriptionsTestKit
       id :subscriptions_r4_server_capability_statement
       title 'Capability Statement Verification'
       description %(
-        Verify the Backport Subscriptions Server has a conformant Capability Statement and that it declares support for the
-        Backport Subscription Profile on the Subscription resource in the rest field. Then the group will verify if the
-        server supports topic discovert via the Capability Statement, which is an optional requirement.
+        Verify the Backport Subscriptions Server has a conformant Capability Statement and that it declares support for
+        the Backport Subscription Profile on the Subscription resource in the rest field. Then the group will verify if
+        the server supports topic discovert via the Capability Statement, which is an optional requirement.
       )
 
       run_as_group

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

@@ -43,7 +43,7 @@ module SubscriptionsTestKit
           assert_resource_type('Subscription', resource: subscription)
 
           assert(subscription.channel.type == 'rest-hook' && subscription.status == 'requested',
-                "The Subscription resource should have it's status set to 'requested', was '#{subscription.status}'")
+                 "The Subscription resource should have it's status set to 'requested', was '#{subscription.status}'")
         end
       end
     end

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

@@ -11,26 +11,28 @@ module SubscriptionsTestKit
         The Subscription resource is used to request notifications for a specific client about a specific topic
         Conceptually, a subscription is a concrete request for a single client to receive notifications per a single
         topic. In order to support topic-based subscriptions in R4, this guide defines several extensions for use on the
-        [R4 Subscription resource](http://hl7.org/fhir/R4/subscription.html). A list of extensions defined by this guide can
-        be found on the [Subscriptions R5 Backport IG's Artifacts page](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/artifacts.html#5).
+        [R4 Subscription resource](http://hl7.org/fhir/R4/subscription.html). A list of extensions defined by this guide
+        can be found on the
+        [Subscriptions R5 Backport IG's Artifacts page](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/artifacts.html#5).
 
-        This test accepts a Subscription resource as an input and verifies that it is conformant to the 
+        This test accepts a Subscription resource as an input and verifies that it is conformant to the
         [R4/B Topic-Based Subscription profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription.html).
 
         The Subscription channel should have it's fields populated with the following information:
           - The `endpoint` field must be set to
-          `#{Inferno::Application['base_url']}/custom/subscriptions_r5_backport_r4_server/subscription/channel/notification_listener`.
+          `#{Inferno::Application['base_url']}/custom/subscriptions_r5_backport_r4_server#{SUBSCRIPTION_CHANNEL_PATH}`.
           The test will add the correct url to this field if it is not properly set.
           - The `type` field must be set to `rest-hook`, as the Inferno subscription workflow tests use a `rest-hook`
           subscription channel to receive incoming notifications. The test will add the correct type to this field if it
           is not properly set.
-          - The `payload` field must be set to `application/json`, as Inferno will only accept resources in requests with
-          this content type.
+          - The `payload` field must be set to `application/json`, as Inferno will only accept resources in requests
+          with this content type.
           - The `header` field must include the `Authorization` header with a Bearer token set to the inputted Inferno
           access token.
       )
 
       verifies_requirements 'hl7.fhir.uv.subscriptions_1.1.0@72',
+                            'hl7.fhir.uv.subscriptions_1.1.0@73',
                             'hl7.fhir.uv.subscriptions_1.1.0@86'
 
       input :subscription_resource,
@@ -41,8 +43,8 @@ module SubscriptionsTestKit
               so that it can demonstrate its ability to perform the Subscription creation and Notification
               response workflow. The instance must be conformant to the R4/B Topic-Based Subscription profile.
               Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification endpoint.
-              This input is also used by the unsupported Subscription test as the base on which to add unsupported element
-              values to test for server rejection.
+              This input is also used by the unsupported Subscription test as the base on which to add unsupported
+              element values to test for server rejection.
             )
       input :access_token,
             title: 'Notification Access Token',
@@ -53,17 +55,12 @@ module SubscriptionsTestKit
               sent to Inferno.
             )
 
-      output :updated_subscription, :subscription_topic
+      output :updated_subscription
 
       run do
         omit_if subscription_resource.blank?, 'Did not input a Subscription resource of this type.'
         subscription = subscription_verification(subscription_resource)
         no_error_verification('Subscription resource is not conformant.')
-
-        assert(subscription['criteria'].present?,
-              'The `criteria` field SHALL be populated and contain the canonical URL for the Subscription Topic.')
-        output subscription_topic: subscription['criteria']
-
         subscription = server_check_channel(subscription, access_token)
         output updated_subscription: subscription.to_json
       end

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

@@ -9,9 +9,9 @@ module SubscriptionsTestKit
       title 'Subscription Workflow Interaction'
       description %(
         Verify that the Subscription instance the tester provided is conformant, and then demonstrate the ability of the
-        server under test to accept a request for the creation of a FHIR Subscription instance and deliver a notification
-        for that Subscription. Inferno will act as a client, creating the Subscription and waiting for a notification
-        based on it.
+        server under test to accept a request for the creation of a FHIR Subscription instance and deliver a
+        notification for that Subscription. Inferno will act as a client, creating the Subscription and waiting for a
+        notification based on it.
       )
 
       run_as_group

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

@@ -16,6 +16,12 @@ module SubscriptionsTestKit
         field_path.reduce(subscription) { |obj, path| obj[path] }
       end
 
+      def normalize_value(value)
+        return value.deep_transform_keys(&:to_sym) if value.is_a?(Hash)
+
+        value
+      end
+
       def send_unsupported_subscription(subscription, unsupported_type, field_paths, subscription_field_old_values)
         fhir_operation('/Subscription', body: subscription)
 
@@ -27,7 +33,10 @@ module SubscriptionsTestKit
         altered_field = false
         field_paths.each_with_index do |field_path, index|
           subscription_field_new_value = get_new_subscription_value(new_subscription, field_path)
-          if subscription_field_new_value != subscription_field_old_values[index]
+          new_value = normalize_value(subscription_field_new_value)
+          old_value = normalize_value(subscription_field_old_values[index])
+
+          if new_value != old_value
             altered_field = true
             break
           end

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

@@ -17,7 +17,8 @@ module SubscriptionsTestKit
         assert_resource_type('Bundle')
 
         unless resource.type == 'searchset'
-          add_message('error', "Bundle returned from $status operation should be type 'searchset', was #{resource.type}")
+          add_message('error',
+                      "Bundle returned from $status operation should be type 'searchset', was #{resource.type}")
         end
 
         assert_valid_resource
@@ -39,7 +40,7 @@ module SubscriptionsTestKit
           entry.resource.resourceType == 'Parameters' && subscription_ref_found?(entry, subscription_id)
         end
         assert(subscription_status_entry,
-              "No Subscription status with id #{subscription_id} returned from $status operation")
+               "No Subscription status with id #{subscription_id} returned from $status operation")
 
         subscription_status_resource = subscription_status_entry.resource
         assert_valid_resource(resource: subscription_status_resource,

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

@@ -31,9 +31,10 @@ module SubscriptionsTestKit
               type: 'textarea',
               description: %(
                 A Subscription resource in JSON format that Inferno will send to the server under test
-                so that it can demonstrate its ability to send an empty Notification. 
+                so that it can demonstrate its ability to send an empty Notification.
                 The instance must be conformant to the R4/B Topic-Based Subscription profile.
-                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification endpoint.
+                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification
+                endpoint.
             ),
               optional: true
             },

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/full_resource_content/full_resource_conformance_test.rb

@@ -12,8 +12,8 @@ module SubscriptionsTestKit
         [R4 Topic-Based Subscription Notification Bundle](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html)
         profle.
 
-        With the content type of full-resource, the resources involved in triggering the notification are included in the
-        notification bundle.
+        With the content type of full-resource, the resources involved in triggering the notification are included in
+        the notification bundle.
 
         When the content type is full-resource, notification bundles SHALL include references to the
         appropriate focus resources in the SubscriptionStatus.notificationEvent.focus element.
@@ -54,11 +54,10 @@ module SubscriptionsTestKit
           requests = load_tagged_requests('event-notification', subscription['id'])
           skip_if requests.empty?, 'No event-notification requests were made in a previous test as expected.'
 
-          criteria_resource_type = subscription_criteria(subscription)
           requests = requests.uniq(&:request_body)
 
           requests.each do |request|
-            full_resource_event_notification_verification(request.request_body, criteria_resource_type)
+            full_resource_event_notification_verification(request.request_body, nil)
           end
         end
         no_error_verification('Received notification-events are not conformant.')

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

@@ -31,9 +31,10 @@ module SubscriptionsTestKit
               type: 'textarea',
               description: %(
                 A Subscription resource in JSON format that Inferno will send to the server under test
-                so that it can demonstrate its ability to send a full-resource Notification. 
+                so that it can demonstrate its ability to send a full-resource Notification.
                 The instance must be conformant to the R4/B Topic-Based Subscription profile.
-                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification endpoint.
+                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification
+                endpoint.
             ),
               optional: true
             },

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/id_only_content/id_only_conformance_test.rb

@@ -15,8 +15,8 @@ module SubscriptionsTestKit
         With the content type of id-only, the resources involved in triggering the notification are only available
         through other channels, but notifications include URLs which can be used to access those resources.
 
-        When the content type is id-only, notification bundles SHALL include references to the appropriate focus resources
-        in the SubscriptionStatus.notificationEvent.focus element.
+        When the content type is id-only, notification bundles SHALL include references to the appropriate focus
+        resources in the SubscriptionStatus.notificationEvent.focus element.
 
         Additionally, notification bundles MAY contain, in addition to the SubscriptionStatus used to convey status
         information, at least one Bundle.entry for each resource relevant to the notification.
@@ -52,11 +52,10 @@ module SubscriptionsTestKit
           requests = load_tagged_requests('event-notification', subscription['id'])
           skip_if requests.empty?, 'No event-notification requests were made in a previous test as expected.'
 
-          criteria_resource_type = subscription_criteria(subscription)
           requests = requests.uniq(&:request_body)
 
           requests.each do |request|
-            id_only_event_notification_verification(request.request_body, criteria_resource_type)
+            id_only_event_notification_verification(request.request_body, nil)
           end
         end
         no_error_verification('Received notification-events are not conformant.')

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

@@ -31,9 +31,10 @@ module SubscriptionsTestKit
               type: 'textarea',
               description: %(
                 A Subscription resource in JSON format that Inferno will send to the server under test
-                so that it can demonstrate its ability to send an id-only Notification. 
+                so that it can demonstrate its ability to send an id-only Notification.
                 The instance must be conformant to the R4/B Topic-Based Subscription profile.
-                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification endpoint.
+                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification
+                endpoint.
             ),
               optional: true
             },

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

@@ -10,8 +10,8 @@ module SubscriptionsTestKit
       description %(
         Verify that the received Notifications are conformant to the
         [R4 Topic-Based Subscription Notification Bundle](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html)
-        profile, including additional requirements around the content type. This group contains tests for the three options
-        available when specifying the contents of a Notification: empty, id-only, and full-resource.
+        profile, including additional requirements around the content type. This group contains tests for the three
+        options available when specifying the contents of a Notification: empty, id-only, and full-resource.
       )
 
       input_order :url, :credentials, :access_token, :empty_subscription_resource,

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/handshake_heartbeat/handshake_conformance_test.rb

@@ -9,9 +9,9 @@ module SubscriptionsTestKit
       title 'Subscription Handshake Verification'
       description %(
         When a Subscription is created for a REST Hook channel type, the server SHALL set initial status to requested,
-        pending verification of the nominated endpoint URL. The Server will then send a handshake bundle to the endpoint.
-        After a successful handshake notification has been sent and accepted, the server SHALL update the status to
-        active. This test verifies that the incoming handshake request is a conformant
+        pending verification of the nominated endpoint URL. The Server will then send a handshake bundle to the
+        endpoint. After a successful handshake notification has been sent and accepted, the server SHALL update the
+        status to active. This test verifies that the incoming handshake request is a conformant
         [R4 Topic-Based Subscription Notification Bundle](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html).
       )
 
@@ -41,9 +41,10 @@ module SubscriptionsTestKit
 
         requests = load_tagged_requests('handshake')
         if requests.empty?
-          omit_if subscription_request_ids.empty?, 'No handshake requests were required or received in a previous tests.'
+          omit_if subscription_request_ids.empty?,
+                  'No handshake requests were required or received in a previous tests.'
           assert(subscription_request_ids.empty?,
-                'Handshake requests are required if a Subscription channel type is `rest-hook`')
+                 'Handshake requests are required if a Subscription channel type is `rest-hook`')
         end
 
         requests = requests.uniq(&:request_body)
@@ -60,7 +61,7 @@ module SubscriptionsTestKit
 
         no_error_verification('Received handshakes are not conformant.')
         assert(subscription_request_ids.empty?,
-              'Did not receive a handshake notification for some `rest-hook` subscriptions')
+               'Did not receive a handshake notification for some `rest-hook` subscriptions')
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/handshake_heartbeat/heartbeat_conformance_test.rb

@@ -26,7 +26,9 @@ module SubscriptionsTestKit
       def heartbeat_period?(subscription_extensions)
         return false if subscription_extensions.blank?
 
-        heartbeat = subscription_extensions.find { |extension| extension['url'].ends_with?('/backport-heartbeat-period') }
+        heartbeat = subscription_extensions.find do |extension|
+          extension['url'].ends_with?('/backport-heartbeat-period')
+        end
 
         return false if heartbeat.blank?
 
@@ -63,7 +65,7 @@ module SubscriptionsTestKit
           subscription_id = tags.first
 
           assert(subscription_request_ids.include?(subscription_id),
-                'If `heartbeatPeriod` field is not present in the Subscription, heartbeat should not be sent.')
+                 'If `heartbeatPeriod` field is not present in the Subscription, heartbeat should not be sent.')
 
           notification_verification(request.request_body, 'heartbeat', subscription_id:)
           no_error_verification('Received heartbeats are not conformant.')

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/status_operation/status_invocation_test.rb

@@ -14,8 +14,8 @@ module SubscriptionsTestKit
         resources, one per Subscription being queried. The Bundle type is "searchset". The status of the Subscription
         should be set to 'active' after a successful handshake with the rest-hook endpoint.
 
-        This test ensures the server supports the $status operation by performing the operation and ensuring it receives a
-        valid response.
+        This test ensures the server supports the $status operation by performing the operation and ensuring it receives
+        a valid response.
       )
 
       verifies_requirements 'hl7.fhir.uv.subscriptions_1.1.0@20',