From a0215d45efe4012429a1b436ac85df6cf43bd7c9 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:20:19 +0100 Subject: [PATCH] CLDC-3089 Make absolute skip/back links relative (#2348) * Empty-Commit * feat: make skip links relative * feat: make scheme back links relative * feat: update tests --- app/models/form/lettings/pages/uprn.rb | 4 ++-- app/models/form/lettings/pages/uprn_selection.rb | 2 +- app/models/form/sales/pages/uprn.rb | 4 ++-- app/models/form/sales/pages/uprn_selection.rb | 2 +- app/views/schemes/confirm_secondary.html.erb | 2 +- app/views/schemes/secondary_client_group.html.erb | 2 +- app/views/schemes/support.html.erb | 2 +- spec/models/form/lettings/pages/uprn_selection_spec.rb | 2 +- spec/models/form/lettings/pages/uprn_spec.rb | 4 ++-- spec/models/form/sales/pages/uprn_selection_spec.rb | 2 +- spec/models/form/sales/pages/uprn_spec.rb | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/models/form/lettings/pages/uprn.rb b/app/models/form/lettings/pages/uprn.rb index 83ea11507..d3c744b8f 100644 --- a/app/models/form/lettings/pages/uprn.rb +++ b/app/models/form/lettings/pages/uprn.rb @@ -24,9 +24,9 @@ class Form::Lettings::Pages::Uprn < ::Form::Page return unless log if form.start_year_after_2024? - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address-matcher" + "address-matcher" else - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address" + "address" end end end diff --git a/app/models/form/lettings/pages/uprn_selection.rb b/app/models/form/lettings/pages/uprn_selection.rb index 8d3640740..162c608f3 100644 --- a/app/models/form/lettings/pages/uprn_selection.rb +++ b/app/models/form/lettings/pages/uprn_selection.rb @@ -27,6 +27,6 @@ class Form::Lettings::Pages::UprnSelection < ::Form::Page def skip_href(log = nil) return unless log - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address-matcher" + "address-matcher" end end diff --git a/app/models/form/sales/pages/uprn.rb b/app/models/form/sales/pages/uprn.rb index 05727878e..d4c7e4d77 100644 --- a/app/models/form/sales/pages/uprn.rb +++ b/app/models/form/sales/pages/uprn.rb @@ -23,9 +23,9 @@ class Form::Sales::Pages::Uprn < ::Form::Page return unless log if form.start_year_after_2024? - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address-matcher" + "address-matcher" else - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address" + "address" end end end diff --git a/app/models/form/sales/pages/uprn_selection.rb b/app/models/form/sales/pages/uprn_selection.rb index 1c7f251ac..94f35540f 100644 --- a/app/models/form/sales/pages/uprn_selection.rb +++ b/app/models/form/sales/pages/uprn_selection.rb @@ -27,6 +27,6 @@ class Form::Sales::Pages::UprnSelection < ::Form::Page def skip_href(log = nil) return unless log - "/#{log.model_name.param_key.dasherize}s/#{log.id}/address-matcher" + "address-matcher" end end diff --git a/app/views/schemes/confirm_secondary.html.erb b/app/views/schemes/confirm_secondary.html.erb index de5d9c82e..7e7cfeebf 100644 --- a/app/views/schemes/confirm_secondary.html.erb +++ b/app/views/schemes/confirm_secondary.html.erb @@ -2,7 +2,7 @@ <% content_for :before_content do %> <%= govuk_back_link( - href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/primary-client-group", + href: request.query_parameters["check_answers"] ? "check-answers" : "primary-client-group", ) %> <% end %> diff --git a/app/views/schemes/secondary_client_group.html.erb b/app/views/schemes/secondary_client_group.html.erb index 45c68547a..1e70fd92b 100644 --- a/app/views/schemes/secondary_client_group.html.erb +++ b/app/views/schemes/secondary_client_group.html.erb @@ -2,7 +2,7 @@ <% content_for :before_content do %> <%= govuk_back_link( - href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/confirm-secondary-client-group", + href: request.query_parameters["check_answers"] ? "check-answers" : "confirm-secondary-client-group", ) %> <% end %> diff --git a/app/views/schemes/support.html.erb b/app/views/schemes/support.html.erb index b953ce548..a004a3da9 100644 --- a/app/views/schemes/support.html.erb +++ b/app/views/schemes/support.html.erb @@ -2,7 +2,7 @@ <% content_for :before_content do %> <%= govuk_back_link( - href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/secondary-client-group", + href: request.query_parameters["check_answers"] ? "check-answers" : "secondary-client-group", ) %> <% end %> diff --git a/spec/models/form/lettings/pages/uprn_selection_spec.rb b/spec/models/form/lettings/pages/uprn_selection_spec.rb index 89e2424d2..5cbb08e93 100644 --- a/spec/models/form/lettings/pages/uprn_selection_spec.rb +++ b/spec/models/form/lettings/pages/uprn_selection_spec.rb @@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::UprnSelection, type: :model do it "has the correct skip_href" do expect(page.skip_href(log)).to eq( - "/lettings-logs/#{log.id}/address-matcher", + "address-matcher", ) end diff --git a/spec/models/form/lettings/pages/uprn_spec.rb b/spec/models/form/lettings/pages/uprn_spec.rb index 7d5921444..089daf4bc 100644 --- a/spec/models/form/lettings/pages/uprn_spec.rb +++ b/spec/models/form/lettings/pages/uprn_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Form::Lettings::Pages::Uprn, type: :model do context "with 2023/24 form" do it "points to address page" do expect(page.skip_href(log)).to eq( - "/lettings-logs/#{log.id}/address", + "address", ) end @@ -66,7 +66,7 @@ RSpec.describe Form::Lettings::Pages::Uprn, type: :model do it "points to address search page" do expect(page.skip_href(log)).to eq( - "/lettings-logs/#{log.id}/address-matcher", + "address-matcher", ) end diff --git a/spec/models/form/sales/pages/uprn_selection_spec.rb b/spec/models/form/sales/pages/uprn_selection_spec.rb index 75fc6ae24..6013774d3 100644 --- a/spec/models/form/sales/pages/uprn_selection_spec.rb +++ b/spec/models/form/sales/pages/uprn_selection_spec.rb @@ -34,7 +34,7 @@ RSpec.describe Form::Sales::Pages::UprnSelection, type: :model do it "has the correct skip_href" do expect(page.skip_href(log)).to eq( - "/sales-logs/#{log.id}/address-matcher", + "address-matcher", ) end diff --git a/spec/models/form/sales/pages/uprn_spec.rb b/spec/models/form/sales/pages/uprn_spec.rb index 092f2dfef..ef1c9848f 100644 --- a/spec/models/form/sales/pages/uprn_spec.rb +++ b/spec/models/form/sales/pages/uprn_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Form::Sales::Pages::Uprn, type: :model do context "with 2023/24 form" do it "points to address page" do expect(page.skip_href(log)).to eq( - "/sales-logs/#{log.id}/address", + "address", ) end @@ -66,7 +66,7 @@ RSpec.describe Form::Sales::Pages::Uprn, type: :model do it "points to address search page" do expect(page.skip_href(log)).to eq( - "/sales-logs/#{log.id}/address-matcher", + "address-matcher", ) end