diff --git a/app/views/logs/delete_duplicates.html.erb b/app/views/logs/delete_duplicates.html.erb index f9cfddb63..8f6c6015e 100644 --- a/app/views/logs/delete_duplicates.html.erb +++ b/app/views/logs/delete_duplicates.html.erb @@ -1,5 +1,5 @@ <% content_for :before_content do %> - <% content_for :title, "Are you sure you want to delete this duplicate log?" %> + <% content_for :title, "Are you sure you want to delete #{@duplicate_logs.count == 1 ? "this duplicate log" : "these duplicate logs"}?" %> <%= govuk_back_link href: @log.lettings? ? lettings_logs_path(@log) : sales_logs_path(@log) %> <% end %> @@ -12,7 +12,7 @@ <%= govuk_warning_text(text: "You will not be able to undo this action.") %>

- This log will be deleted: + <%= @duplicate_logs.count == 1 ? "This log" : "These logs" %> will be deleted:

<% @duplicate_logs.each do |duplicate_log| %> @@ -21,7 +21,7 @@
<%= govuk_button_to( - "Delete this log" + @duplicate_logs.count == 1 ? "Delete this log" : "Delete these logs" ) %> <%= govuk_button_link_to( "Cancel", diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index fa152d593..c1c7ebbcf 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1695,11 +1695,42 @@ RSpec.describe LettingsLogsController, type: :request do expect(response).to have_http_status(:ok) expect(page).to have_content("Are you sure you want to delete this duplicate log?") + expect(page).to have_content("This log will be deleted:") expect(page).to have_button(text: "Delete this log") expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) expect(page).not_to have_link(text: "Log #{id}", href: lettings_log_path(id)) expect(page).to have_link(text: "Cancel", href: lettings_log_path(id)) # update with correct path when known end end + + context "when there are multiple duplicate logs being deleted" do + let!(:duplicate_log_2) do + duplicate = lettings_log.dup + duplicate.id = nil + duplicate.save! + duplicate + end + + it "renders page" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete these duplicate logs?") + expect(page).to have_content("These logs will be deleted:") + expect(page).to have_button(text: "Delete these logs") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) + expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: lettings_log_path(duplicate_log_2.id)) + expect(page).to have_link(text: "Cancel", href: lettings_log_path(id)) # update with correct path when known + end + end + + context "when log does not exist" do + let(:id) { -1 } + + it "returns 404" do + request + expect(response).to have_http_status(:not_found) + end + end end end