From cc1d55fc07edfa3d31b3df90fab3db08432a66b4 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 25 Nov 2022 12:37:51 +0000 Subject: [PATCH] Update routes to get the tenancy start date page from form --- app/controllers/lettings_logs_controller.rb | 6 +++++- app/views/logs/update_logs.html.erb | 2 +- spec/requests/lettings_logs_controller_spec.rb | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 0878eb721..a9d963e1b 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -51,7 +51,11 @@ class LettingsLogsController < LogsController def edit @log = current_user.lettings_logs.find_by(id: params[:id]) if @log - @log.impacted_by_deactivation ? redirect_to(lettings_log_tenancy_start_date_path(@log)) : render("logs/edit", locals: { current_user: }) + if @log.impacted_by_deactivation + redirect_to(send("lettings_log_#{@log.form.get_question('startdate', @log).page.id}_path", @log)) + else + render("logs/edit", locals: { current_user: }) + end else render_not_found end diff --git a/app/views/logs/update_logs.html.erb b/app/views/logs/update_logs.html.erb index bd7f13c72..22b8b1823 100644 --- a/app/views/logs/update_logs.html.erb +++ b/app/views/logs/update_logs.html.erb @@ -26,7 +26,7 @@ scope: "row", class: "govuk-!-text-align-right", }) do %> - <%= govuk_link_to("Update now", lettings_log_tenancy_start_date_path(log)) %> + <%= govuk_link_to("Update now", send("lettings_log_#{log.form.get_question('startdate', log).page.id}_path", log)) %> <% end %> <% end %> <% end %> diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 0a2a31ca4..f5ed9f773 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -842,6 +842,8 @@ RSpec.describe LettingsLogsController, type: :request do it "routes to the tenancy date question" do get "/lettings-logs/#{affected_lettings_log.id}", headers:, params: {} expect(response).to redirect_to("/lettings-logs/#{affected_lettings_log.id}/tenancy-start-date") + follow_redirect! + expect(page).to have_content("What is the tenancy start date?") end end end