Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fi 3007 - subscription validation #5

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fi 3007 - subscription validation #5

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3475377
Added function to check if the URL in Criteria is a valid URL
nhcady Oct 25, 2024
1066e35
Finished and Tested method to determine if a URL in the criteria fiel…
nhcady Oct 28, 2024
dd57185
Fixed layout errors
nhcady Oct 28, 2024
c5169da
fixing whitespace
nhcady Oct 28, 2024
0bb97c8
moved valid_url? method into subscription conformance verrification
nhcady Dec 18, 2024
54b2e1b
Moved URL check and rewrote relevent spec tests
nhcady Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...s/subscriptions_r5_backport_r4_server/common/interaction/subscription_conformance_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,19 @@ class SubscriptionConformanceTest < Inferno::Test

output :updated_subscription, :subscription_topic

def valid_url?(url)
uri = URI.parse(url)
uri.is_a?(URI::HTTP) && !uri.host.nil?
rescue URI::InvalidURIError
false
end

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?,
assert(subscription['criteria'].present? && valid_url?(subscription['criteria']),
'The `criteria` field SHALL be populated and contain the canonical URL for the Subscription Topic.')
output subscription_topic: subscription['criteria']
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we no longer use output subscription_criteria anywhere, which means that:

  1. we can remove it
  2. we can move this URL check inside the subscription_verification method so that it gets run whenever subscriptions are verified. This also means you can add a test case or two to the spec test.


Expand Down
Loading