Remove cross cycle code from 2024 to 2025

app/components/find/courses/training_locations/view.rb

@@ -54,22 +54,7 @@ def bottom_heading
         end
 
         def show_school_placements_link?
-          # This is necessary for some component previews to load.
-          # I don't have time to debug component previews right now.
-          # This code will be removed after the beginning of the 2025 cycle
-          # anyway
-          return false if course.provider.recruitment_cycle.blank?
-
-          recruitment_cycle_before_2025? || recruitment_cycle_2025_or_greater_and_selectable_schools?
-        end
-
-        def recruitment_cycle_before_2025?
-          course.provider.recruitment_cycle_year.to_i < 2025
-        end
-
-        def recruitment_cycle_2025_or_greater_and_selectable_schools?
-          course.provider.recruitment_cycle_year.to_i >= 2025 &&
-            course.provider.selectable_school?
+          course.provider.selectable_school?
         end
       end
     end

spec/components/find/courses/training_locations/view_preview.rb

@@ -79,7 +79,7 @@ def show_training_locations_school_placements_link_disabled
                               sites: [Site.new, Site.new],
                               funding: 'salary',
                               study_sites: [Site.new, Site.new],
-                              provider: Provider.new(provider_code: 'DFE', selectable_school: false, recruitment_cycle: FactoryBot.build(:recruitment_cycle, year: 2025))).decorate
+                              provider: Provider.new(provider_code: 'DFE', selectable_school: false, recruitment_cycle: FactoryBot.build(:recruitment_cycle))).decorate
           render Find::Courses::TrainingLocations::View.new(course:)
         end
 
@@ -88,7 +88,7 @@ def show_training_locations_school_placements_link_enabled
                               sites: [Site.new, Site.new],
                               funding: 'salary',
                               study_sites: [Site.new, Site.new],
-                              provider: Provider.new(provider_code: 'DFE', selectable_school: true, recruitment_cycle: FactoryBot.build(:recruitment_cycle, year: 2025))).decorate
+                              provider: Provider.new(provider_code: 'DFE', selectable_school: true, recruitment_cycle: FactoryBot.build(:recruitment_cycle))).decorate
           render Find::Courses::TrainingLocations::View.new(course:)
         end
       end

spec/components/find/courses/training_locations/view_spec.rb

@@ -54,17 +54,15 @@
   end
 
   describe '#placements_url' do
-    let(:provider) { create(:provider, recruitment_cycle: find_or_create(:recruitment_cycle, year:), selectable_school:) }
+    let(:provider) { create(:provider, selectable_school:) }
     let(:course) { create(:course, provider:) }
-    let(:year) { 2025 }
     let(:selectable_school) { false }
 
-    context 'when preview = true, before 2025 find opens and provider != selectable_school' do
+    context 'when preview is true and provider is not selectable_school' do
       let(:preview) { true }
-      let(:year) { 2025 }
       let(:selectable_school) { false }
 
-      it 'renders link to the publish path for 2025 provider' do
+      it 'renders link to the publish path for provider' do
         expect(subject).to have_no_link(
           'View list of school placements',
           href: url_helpers.placements_publish_provider_recruitment_cycle_course_path(
@@ -76,8 +74,7 @@
       end
     end
 
-    context 'when preview is false after find opens in 2025 and provider has selectable_school enabled' do
-      let(:year) { 2025 }
+    context 'when preview is false and provider has selectable_school enabled' do
       let(:selectable_school) { true }
 
       it 'renders a link to the find path' do

spec/features/find/search/viewing_a_course_spec.rb

@@ -69,21 +69,19 @@
     end
   end
 
-  scenario 'user sees no school placements in 2025' do
+  scenario 'user sees no school placements' do
     create(:recruitment_cycle, :next)
-    Timecop.travel(1.month.since(Find::CycleTimetable.find_opens(2025))) do
-      allow(Settings).to receive(:current_recruitment_cycle_year).and_return(2025)
+    Timecop.travel(Find::CycleTimetable.find_opens) do
       given_there_is_a_findable_course
       and_the_provider_does_not_have_selectable_schools
       when_i_visit_the_course_page
       then_i_see_no_school_placements_link
     end
   end
 
-  scenario 'user views selectable school placements' do
+  scenario 'user sees selectable school placements' do
     create(:recruitment_cycle, :next)
-    Timecop.travel(1.month.since(Find::CycleTimetable.find_opens(2025))) do
-      allow(Settings).to receive(:current_recruitment_cycle_year).and_return(2025)
+    Timecop.travel(Find::CycleTimetable.find_opens) do
       given_there_is_a_findable_course
       and_the_provider_has_selectable_schools
       when_i_visit_the_course_page

spec/features/publish/viewing_a_course_preview_spec.rb

@@ -134,20 +134,18 @@
     end
   end
 
-  scenario 'user sees no school placements in 2025' do
+  scenario 'user sees no school placements' do
     create(:recruitment_cycle, :next)
-    Timecop.travel(1.month.since(Find::CycleTimetable.find_opens(2025))) do
-      allow(Settings).to receive(:current_recruitment_cycle_year).and_return(2025)
+    Timecop.travel(Find::CycleTimetable.find_opens) do
       given_i_am_authenticated(user: user_with_fee_based_course)
       provider.update(selectable_school: false)
       when_i_visit_the_publish_course_preview_page
       then_i_see_no_school_placements_link
     end
   end
 
-  scenario 'user views school placements' do
-    Timecop.travel(1.month.since(Find::CycleTimetable.find_opens(2025))) do
-      allow(Settings).to receive(:current_recruitment_cycle_year).and_return(2025)
+  scenario 'user sees school placements' do
+    Timecop.travel(Find::CycleTimetable.find_opens) do
       given_i_am_authenticated(user: user_with_fee_based_course)
       when_i_visit_the_publish_course_preview_page
       and_i_click_link_or_button('View list of school placements')