End of year deadline - <%= formatted_deadline %>: Deadline to submit logs for tenancies starting between <%= open_lettings_form.start_date.to_formatted_s(:govuk_date) %> to <%= collection_end_date(open_lettings_form.start_date).to_formatted_s(:govuk_date) %>
<% end %> @@ -11,7 +10,7 @@<%= "#{current_quarter.quarter} - #{current_quarter.cutoff_date.strftime('%A')} #{current_quarter.cutoff_date.to_formatted_s(:govuk_date)}" %>: Quarterly cut off date for tenancies and sales starting between <%= current_quarter.quarter_start_date.to_formatted_s(:govuk_date) %> and <%= current_quarter.quarter_end_date.to_formatted_s(:govuk_date) %>.
<% end %> -<% if !FormHandler.instance.in_crossover_period? %> +<% unless FormHandler.instance.in_crossover_period? %>Try to complete your logs for each quarter by the cut-off date.
You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: <%= formatted_deadline %>.
<% end %> @@ -21,13 +20,13 @@Prioritise completing logs for the closing collection year. You must complete all <%= previous_lettings_form.start_date.year %> to <%= previous_lettings_form.submission_deadline.year %> logs must by the end-of-year deadline. You can still create <%= open_lettings_form.start_date.year %> to <%= open_lettings_form.submission_deadline.year %> logs for this quarter after the quarterly cut-off date.
<% end %> -<%= govuk_details(summary_text: "Quarterly cut-off dates for 2024 to 2025") do %> -The 2024 to 2025 quarterly cut-off dates are:
+<%= govuk_details(summary_text: "Quarterly cut-off dates for #{current_collection_start_year} to #{current_collection_end_year}") do %> +The <%= current_collection_start_year %> to <%= current_collection_end_year %> quarterly cut-off dates are:
It is important that you meet these cut-off dates because we submit data to the Office for National Statistics quarterly, helping them create essential inflation statistics.
Meeting these cut-off dates also gives you more accurate data for your own analysis, and reduces the burden at the end of the year.
diff --git a/spec/features/home_page_spec.rb b/spec/features/home_page_spec.rb new file mode 100644 index 000000000..60bab113e --- /dev/null +++ b/spec/features/home_page_spec.rb @@ -0,0 +1,96 @@ +require "rails_helper" + +RSpec.describe "Home Page Features" do + include CollectionTimeHelper + + let!(:user) { FactoryBot.create(:user) } + let(:storage_service) { instance_double(Storage::S3Service, get_file_metadata: nil) } + let(:current_collection_year) { 2024 } + let(:next_collection_year) { 2025 } + + before do + sign_in user + allow(Storage::S3Service).to receive(:new).and_return(storage_service) + allow(storage_service).to receive(:configuration).and_return(OpenStruct.new(bucket_name: "core-test-collection-resources")) + end + + context "when visiting during the current collection year" do + before do + allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(false) + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(current_collection_year) + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_end_year).and_return(current_collection_year + 1) + visit root_path + find("span.govuk-details__summary-text", text: "Quarterly cut-off dates for 2024 to 2025").click + end + + after { travel_back } + + scenario "displays correct text for Q1" do + travel_to Time.zone.local(current_collection_year, 4, 1) do + expect(page).to have_content("Q1 - Friday 12 July 2024") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 6 June 2025.") + end + end + + scenario "displays correct text for Q2" do + travel_to Time.zone.local(current_collection_year, 7, 1) do + expect(page).to have_content("Q2 - Friday 11 October 2024") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 6 June 2025.") + end + end + + scenario "displays correct text for Q3" do + travel_to Time.zone.local(current_collection_year, 10, 1) do + expect(page).to have_content("Q3 - Friday 10 January 2025") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 6 June 2025.") + end + end + + scenario "displays correct text for Q4" do + travel_to Time.zone.local(current_collection_year + 1, 3, 1) do + expect(page).to have_content("End of year deadline - Friday 6 June 2025") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 6 June 2025.") + end + end + end + + context "when visiting during the next collection year" do + before do + allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(false) + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(next_collection_year) + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_end_year).and_return(next_collection_year + 1) + visit root_path + find("span.govuk-details__summary-text", text: "Quarterly cut-off dates for 2025 to 2026").click + end + + after { travel_back } + + scenario "displays correct text for Q1" do + travel_to Time.zone.local(next_collection_year, 4, 1) do + expect(page).to have_content("Q1 - Friday 11 July 2025") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 5 June 2026.") + end + end + + scenario "displays correct text for Q2" do + travel_to Time.zone.local(next_collection_year, 7, 1) do + expect(page).to have_content("Q2 - Friday 10 October 2025") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 5 June 2026.") + end + end + + scenario "displays correct text for Q3" do + travel_to Time.zone.local(next_collection_year, 10, 1) do + expect(page).to have_content("Q3 - Friday 16 January 2026") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 5 June 2026.") + end + end + + scenario "displays correct text for Q4" do + travel_to Time.zone.local(next_collection_year + 1, 3, 1) do + expect(page).to have_content("End of year deadline - Friday 5 June 2026") + expect(page).to have_content("You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: Friday 5 June 2026.") + end + end + end +end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index c663087d5..10ae7fced 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -50,6 +50,9 @@ rescue ActiveRecord::PendingMigrationError => e exit 1 end RSpec.configure do |config| + + config.include ActiveSupport::Testing::TimeHelpers + # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]