Merge remote-tracking branch 'origin/release/15.2' into dev

opf · Jan 6, 2025 · 018460b · 018460b
2 parents 7c57864 + f08c37a
commit 018460b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
@@ -64,6 +64,10 @@
   let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) }
   let(:meetings_page) { Pages::Meetings::Index.new(project:) }
 
+  before do
+    travel_to(Date.new(2024, 12, 1))
+  end
+
   context "with a user with permissions" do
     it "can create a recurring meeting" do
       login_as current_user

diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb
@@ -39,6 +39,14 @@
                with_flag: { recurring_meetings: true } do
   include Components::Autocompleter::NgSelectAutocompleteHelpers
 
+  before_all do
+    travel_to(Date.new(2024, 12, 1))
+  end
+
+  after(:all) do # rubocop:disable RSpec/BeforeAfterAll
+    travel_back
+  end
+
   shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) }
   shared_let(:user) do
     create :user,
@@ -71,6 +79,7 @@
   let(:meetings_page) { Pages::Meetings::Index.new(project:) }
 
   before do
+    travel_to(Date.new(2024, 12, 1))
     login_as current_user
 
     # Assuming the first init job has run