Skip to content

Commit

Permalink
Rename test helper methods and mocking extensions
Browse files Browse the repository at this point in the history
to make it more accurate as we are no longer calling Zendesk directly.
  • Loading branch information
AgaDufrat committed Aug 15, 2024
1 parent 7a26409 commit 235d0d5
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion spec/features/analytics_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Request for analytics",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form analytics],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/campaign_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Campaign",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form campaign],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/change_existing_user_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "changing user permissions" do
ticket_request = expect_zendesk_to_receive_ticket(
ticket_request = expect_support_api_to_receive_raise_ticket(
"subject" => "Change an existing user's account",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form change_user],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/changes_to_publishing_apps_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Abc",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form new_feature_request],
Expand Down
4 changes: 2 additions & 2 deletions spec/features/content_advice_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Needed by 12 Jan: Which format - Advice on content",
"tags" => %w[govt_form dept_content_advice],
"description" =>
Expand Down Expand Up @@ -46,7 +46,7 @@
end

scenario "successful request with other reaason" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Tricky query - Advice on content",
"tags" => %w[govt_form dept_content_advice],
"description" =>
Expand Down
2 changes: 1 addition & 1 deletion spec/features/content_change_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

scenario "successful mainstream content change request " do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Update X",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form content_amend],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/content_data_feedback_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Content Data feedback",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form content_data_feedback],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/create_new_user_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
])

ticket_request = expect_zendesk_to_receive_ticket(
ticket_request = expect_support_api_to_receive_raise_ticket(
"subject" => "Create a new user account",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form create_new_user],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/general_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Downtime - Govt Agency General Issue",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form govt_agency_general],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/live_campaign_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Live Campaign",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form live_campaign],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/remove_user_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Remove user",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form remove_user],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Report an issue with GOV.UK search results",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@email.co.uk"),
"tags" => %w[govt_form site_search],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/taxonomy_change_topic_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Taxonomy change topic request - \"Abc\"",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form taxonomy_change_topic_request],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/taxonomy_new_topic_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful request" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Taxonomy new topic request - \"Abc\"",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form taxonomy_new_topic_request],
Expand Down
2 changes: 1 addition & 1 deletion spec/features/technical_fault_reports_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "successful report" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Technical fault with GOV.UK: content",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form technical_fault fault_with_gov_uk_content],
Expand Down
4 changes: 2 additions & 2 deletions spec/features/unpublish_content_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

scenario "request to unpublish in case of publishing error" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Published in error - Unpublish content request",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form unpublish_content published_in_error],
Expand All @@ -37,7 +37,7 @@
end

scenario "request to unpublish when page is a dupe" do
request = expect_zendesk_to_receive_ticket(
request = expect_support_api_to_receive_raise_ticket(
"subject" => "Duplicate of another page - Unpublish content request",
"requester" => hash_including("name" => "John Smith", "email" => "john.smith@agency.gov.uk"),
"tags" => %w[govt_form unpublish_content duplicate_publication],
Expand Down
6 changes: 3 additions & 3 deletions spec/support/gds_zendesk_helpers.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "gds_zendesk/test_helpers"

module ZendeskRequestMockingExtensions
def expect_zendesk_to_receive_ticket(opts)
module SupportApiMockingExtensions
def expect_support_api_to_receive_raise_ticket(opts)
stub_support_api_valid_raise_support_ticket(hash_including(opts))
end

Expand All @@ -22,7 +22,7 @@ def stub_custom_fields_data(opts = [])

RSpec.configure do |c|
c.include GDSZendesk::TestHelpers
c.include ZendeskRequestMockingExtensions
c.include SupportApiMockingExtensions

c.before(:context) do
self.valid_zendesk_credentials = ZENDESK_CREDENTIALS
Expand Down

0 comments on commit 235d0d5

Please sign in to comment.