From 06c640c16829a7b9fcc4653421bc3c13effbf5cb Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 18 Oct 2023 10:23:06 +0100 Subject: [PATCH] Flaky tests --- spec/features/sales_log_spec.rb | 4 ++-- spec/lib/tasks/send_missing_addresses_csv_spec.rb | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index e33c88ee0..9c3fb721e 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -249,7 +249,7 @@ RSpec.describe "Sales Log Features" do expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") click_link("Change", href: "/sales-logs/#{duplicate_log.id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") fill_in("sales-log-purchid-field", with: "something else") - click_button("Save and continue") + click_button("Save changes") expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") @@ -260,7 +260,7 @@ RSpec.describe "Sales Log Features" do it "allows deduplicating logs by changing the answers on the original log" do click_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") fill_in("sales-log-purchid-field", with: "something else") - click_button("Save and continue") + click_button("Save changes") expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") diff --git a/spec/lib/tasks/send_missing_addresses_csv_spec.rb b/spec/lib/tasks/send_missing_addresses_csv_spec.rb index dab36f1ad..78b3c25e6 100644 --- a/spec/lib/tasks/send_missing_addresses_csv_spec.rb +++ b/spec/lib/tasks/send_missing_addresses_csv_spec.rb @@ -6,6 +6,8 @@ RSpec.describe "correct_addresses" do subject(:task) { Rake::Task["correct_addresses:send_missing_addresses_lettings_csv"] } before do + Timecop.travel(Time.zone.local(2023, 10, 10)) + Singleton.__init__(FormHandler) organisation.users.destroy_all Rake.application.rake_require("tasks/send_missing_addresses_csv") Rake::Task.define_task(:environment) @@ -42,6 +44,10 @@ RSpec.describe "correct_addresses" do .to_return(status: 200, body: body_2, headers: {}) end + after do + Timecop.return + end + context "when the rake task is run" do let(:organisation) { create(:organisation, name: "test organisation") }