diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index 97e6549d0..d576e7601 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -352,16 +352,6 @@ RSpec.describe "Sales Log Features" do end context "when a log becomes a duplicate" do - before do - Timecop.freeze(Time.zone.local(2024, 3, 3)) - Singleton.__init__(FormHandler) - end - - after do - Timecop.return - Singleton.__init__(FormHandler) - end - context "and updating duplicate log" do let(:user) { create(:user, :data_coordinator) } let(:sales_log) { create(:sales_log, :duplicate, assigned_to: user) } diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb index b254dcb15..69140f1e9 100644 --- a/spec/requests/duplicate_logs_controller_spec.rb +++ b/spec/requests/duplicate_logs_controller_spec.rb @@ -170,7 +170,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 3) expect(page).to have_content("- Buyer 1’s working situation", count: 3) expect(page).to have_content("- Postcode", count: 3) - expect(page).to have_link("Change", count: 21) + expect(page).to have_content("- Address line 1", count: 3) + expect(page).to have_link("Change", count: 24) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") @@ -216,7 +217,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 1) expect(page).to have_content("- Buyer 1’s working situation", count: 1) expect(page).to have_content("- Postcode", count: 1) - expect(page).to have_link("Change", count: 7) + expect(page).to have_content("- Address line 1", count: 1) + expect(page).to have_link("Change", count: 8) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") end @@ -242,7 +244,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 1) expect(page).to have_content("- Buyer 1’s working situation", count: 1) expect(page).to have_content("- Postcode", count: 1) - expect(page).to have_link("Change", count: 7) + expect(page).to have_content("- Address line 1", count: 1) + expect(page).to have_link("Change", count: 8) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") end @@ -377,7 +380,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 3) expect(page).to have_content("- Buyer 1’s working situation", count: 3) expect(page).to have_content("- Postcode", count: 3) - expect(page).to have_link("Change", count: 18) + expect(page).to have_content("- Address line 1", count: 3) + expect(page).to have_link("Change", count: 21) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") @@ -405,7 +409,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 1) expect(page).to have_content("- Buyer 1’s working situation", count: 1) expect(page).to have_content("- Postcode", count: 1) - expect(page).to have_link("Change", count: 6) + expect(page).to have_content("- Address line 1", count: 1) + expect(page).to have_link("Change", count: 7) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") end @@ -431,7 +436,8 @@ RSpec.describe DuplicateLogsController, type: :request do expect(page).to have_content("- Buyer 1’s gender identity", count: 1) expect(page).to have_content("- Buyer 1’s working situation", count: 1) expect(page).to have_content("- Postcode", count: 1) - expect(page).to have_link("Change", count: 6) + expect(page).to have_content("- Address line 1", count: 1) + expect(page).to have_link("Change", count: 7) expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") end diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index 263bb92f8..9d4458a95 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -225,7 +225,7 @@ RSpec.describe BulkUpload::Sales::Validator do end it "creates errors" do - expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file."), :count).by(20) + expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file."), :count).by(24) end end end