From ab6ddba3ababf4d7d79230d699ecc63a068cdb76 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Fri, 5 Jul 2024 12:42:24 +0100 Subject: [PATCH] CLDC-3526: Update back_path --- app/models/forms/bulk_upload_lettings/guidance.rb | 2 ++ app/models/forms/bulk_upload_sales/guidance.rb | 2 ++ app/views/layouts/_collection_resources.html.erb | 2 +- spec/models/forms/bulk_upload_lettings/guidance_spec.rb | 8 ++++++++ spec/models/forms/bulk_upload_sales/guidance_spec.rb | 8 ++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb index da6fede26..b6cf5bf74 100644 --- a/app/models/forms/bulk_upload_lettings/guidance.rb +++ b/app/models/forms/bulk_upload_lettings/guidance.rb @@ -16,6 +16,8 @@ module Forms case referrer when "prepare-your-file" bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: }) + when "home" + root_path else guidance_path end diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb index 01d1ff7a6..28ca6c3b5 100644 --- a/app/models/forms/bulk_upload_sales/guidance.rb +++ b/app/models/forms/bulk_upload_sales/guidance.rb @@ -16,6 +16,8 @@ module Forms case referrer when "prepare-your-file" bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: }) + when "home" + root_path else guidance_path end diff --git a/app/views/layouts/_collection_resources.html.erb b/app/views/layouts/_collection_resources.html.erb index bf89f2ca0..acdc5cb88 100644 --- a/app/views/layouts/_collection_resources.html.erb +++ b/app/views/layouts/_collection_resources.html.erb @@ -1,7 +1,7 @@ <% if current_user %>

Collection resources

<%= govuk_link_to "Guidance for submitting social housing lettings and sales data (CORE)", guidance_path %>

-

<%= govuk_link_to "How to upload logs in bulk", bulk_upload_lettings_log_path(id: "guidance", form: { year: current_collection_start_year }) %>

+

<%= govuk_link_to "How to upload logs in bulk", bulk_upload_lettings_log_path(id: "guidance", form: { year: current_collection_start_year }, referrer: "home") %>

<% else %>

Collection resources

<% end %> diff --git a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb index da0dbda1a..271ff8b27 100644 --- a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb @@ -16,6 +16,14 @@ RSpec.describe Forms::BulkUploadLettings::Guidance do end end + context "when referrer is home" do + let(:referrer) { "home" } + + it "returns the root path" do + expect(bu_guidance.back_path).to eq root_path + end + end + context "when referrer is guidance" do let(:referrer) { "guidance" } diff --git a/spec/models/forms/bulk_upload_sales/guidance_spec.rb b/spec/models/forms/bulk_upload_sales/guidance_spec.rb index 66a36b74c..6eacf6d0c 100644 --- a/spec/models/forms/bulk_upload_sales/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_sales/guidance_spec.rb @@ -16,6 +16,14 @@ RSpec.describe Forms::BulkUploadSales::Guidance do end end + context "when referrer is home" do + let(:referrer) { "home" } + + it "returns the root path" do + expect(bu_guidance.back_path).to eq root_path + end + end + context "when referrer is guidance" do let(:referrer) { "guidance" }