From 682a565500c356b39ab06a1c0fcc74aa89daf65b Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Mon, 31 Mar 2025 17:59:52 +0100 Subject: [PATCH] Refactor merge_requests_helper_spec to use a fixed merge date for consistency in tests --- spec/helpers/merge_requests_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index f7290c7c2..c9a71fc8d 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -165,7 +165,7 @@ 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_date) { generate_different_date_within_collection_year(Time.zone.today, end_date_override: Time.zone.today + 14.days) } + let(:merge_date) { Time.zone.local(2025, 1, 1) } let(:merge_request) { create(:merge_request, absorbing_organisation: organisation, merge_date:) } before do