From e4d682b9c9b292dd938ecd436e5bb684d265c28b Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 10 Jul 2023 10:54:14 +0100 Subject: [PATCH] Update duplicated page to work for sales logs --- app/controllers/duplicate_logs_controller.rb | 12 +------ .../duplicate_logs_controller_spec.rb | 33 ++++++++++++++++++- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/controllers/duplicate_logs_controller.rb b/app/controllers/duplicate_logs_controller.rb index 4d7307dd7..acea5a158 100644 --- a/app/controllers/duplicate_logs_controller.rb +++ b/app/controllers/duplicate_logs_controller.rb @@ -47,14 +47,4 @@ private %w[owning_organisation_id saledate purchid age1 sex1 ecstat1 postcode_full] end end - -private - - def find_resource_by_named_id - @log = if params[:sales_log_id].present? - current_user.sales_logs.visible.find_by(id: params[:sales_log_id]) - else - current_user.lettings_logs.visible.find_by(id: params[:lettings_log_id]) - end - end -end +end \ No newline at end of file diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb index fdcf28a2b..6e15eae6e 100644 --- a/spec/requests/duplicate_logs_controller_spec.rb +++ b/spec/requests/duplicate_logs_controller_spec.rb @@ -108,6 +108,7 @@ RSpec.describe DuplicateLogsController, type: :request do end it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Stock owner", count: 3) expect(page).to have_content("Q5 - Tenancy start date", count: 3) expect(page).to have_content("Q7 - Tenant code", count: 3) expect(page).to have_content("Q12 - Postcode", count: 3) @@ -115,10 +116,40 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3) expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) expect(page).to have_content("Household rent and charges", count: 3) + expect(page).to have_link("Change", count: 24) + end + + it "displays buttons to delete" do + expect(page).to have_link("Keep this log and delete duplicates", count: 3) + end + end + + context "with multiple duplicate sales logs" do + let(:duplicate_logs) { create_list(:sales_log, 2, :completed) } + + before do + allow(SalesLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs) + get "/sales-logs/#{sales_log.id}/duplicate-logs" + end + + it "displays links to all the duplicate logs" do + expect(page).to have_link("Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/sales-logs/#{duplicate_logs.first.id}") + expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/sales-logs/#{duplicate_logs.second.id}") + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Owning organisation", count: 3) + expect(page).to have_content("Q1 - Sale completion date", count: 3) + expect(page).to have_content("Q2 - Purchaser code", count: 3) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 3) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 3) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3) + expect(page).to have_content("Q15 - Postcode", count: 3) expect(page).to have_link("Change", count: 21) end - it "displays buttons to delete duplicates" do + it "displays buttons to delete" do expect(page).to have_link("Keep this log and delete duplicates", count: 3) end end