diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 5f8bed34a..f7290c7c2 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -165,7 +165,8 @@ RSpec.describe MergeRequestsHelper do let(:organisation) { create(:organisation, name: "Org 1") } let(:merging_organisation) { create(:organisation, name: "Org 2") } let(:merging_organisation_2) { create(:organisation, name: "Org 3") } - let(:merge_request) { create(:merge_request, absorbing_organisation: organisation, merge_date: Time.zone.today - 2.days) } + let(:merge_date) { generate_different_date_within_collection_year(Time.zone.today, end_date_override: Time.zone.today + 14.days) } + let(:merge_request) { create(:merge_request, absorbing_organisation: organisation, merge_date:) } before do create(:merge_request_organisation, merge_request:, merging_organisation:) @@ -200,10 +201,10 @@ RSpec.describe MergeRequestsHelper do context "when merging organisations have logs" do before do create(:lettings_log, owning_organisation: organisation) - create(:lettings_log, owning_organisation: merging_organisation, startdate: generate_different_date_within_collection_year(Time.zone.yesterday, start_date_override: Time.zone.today - 2.days)) + create(:lettings_log, owning_organisation: merging_organisation, startdate: generate_different_date_within_collection_year(merge_date, start_date_override: merge_date, end_date_override: Time.zone.now + 14.days)) create(:lettings_log, owning_organisation: merging_organisation, startdate: Time.zone.yesterday) create(:sales_log, owning_organisation: organisation) - create(:sales_log, owning_organisation: merging_organisation, saledate: generate_different_date_within_collection_year(Time.zone.yesterday, start_date_override: Time.zone.today - 2.days)) + create(:sales_log, owning_organisation: merging_organisation, saledate: generate_different_date_within_collection_year(merge_date, start_date_override: merge_date, end_date_override: Time.zone.now + 14.days)) create(:sales_log, owning_organisation: merging_organisation, saledate: Time.zone.yesterday) end @@ -237,8 +238,8 @@ RSpec.describe MergeRequestsHelper do before do create(:organisation_relationship, parent_organisation: merging_organisation_2, child_organisation: merging_organisation) create(:merge_request_organisation, merge_request:, merging_organisation: merging_organisation_2) - create(:lettings_log, assigned_to: merging_organisation_2.users.first, owning_organisation: merging_organisation_2, managing_organisation: merging_organisation, startdate: generate_different_date_within_collection_year(Time.zone.yesterday, start_date_override: Time.zone.today - 2.days)) - create(:sales_log, assigned_to: merging_organisation_2.users.first, owning_organisation: merging_organisation_2, managing_organisation: merging_organisation, saledate: generate_different_date_within_collection_year(Time.zone.yesterday, start_date_override: Time.zone.today - 2.days)) + create(:lettings_log, assigned_to: merging_organisation_2.users.first, owning_organisation: merging_organisation_2, managing_organisation: merging_organisation, startdate: generate_different_date_within_collection_year(merge_date, start_date_override: merge_date, end_date_override: Time.zone.now + 14.days)) + create(:sales_log, assigned_to: merging_organisation_2.users.first, owning_organisation: merging_organisation_2, managing_organisation: merging_organisation, saledate: generate_different_date_within_collection_year(merge_date, start_date_override: merge_date, end_date_override: Time.zone.now + 14.days)) end it "returns the correct merging_organisations_lettings_logs_outcomes_text text" do