diff --git a/app/models/form.rb b/app/models/form.rb index fdcae1801..68ed95fd8 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -39,9 +39,9 @@ class Form @pages = subsections.flat_map(&:pages) @questions = pages.flat_map(&:questions) @start_date = Time.iso8601(form_definition["start_date"]) - @new_logs_end_date = Time.zone.local(@start_date.year + 1, 11, 1) + @new_logs_end_date = Time.zone.local(@start_date.year + 1, 12, 31) @submission_deadline = Time.zone.local(@start_date.year + 1, 6, 9) - @edit_end_date = Time.zone.local(@start_date.year + 1, 11, 1) + @edit_end_date = Time.zone.local(@start_date.year + 1, 12, 31) @unresolved_log_redirect_page_id = form_definition["unresolved_log_redirect_page_id"] end @name = "#{start_date.year}_#{new_logs_end_date.year}_#{type}" diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index c716f0ded..6844ad6b4 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1036,7 +1036,7 @@ RSpec.describe LettingsLogsController, type: :request do completed_lettings_log.reload get "/lettings-logs/#{completed_lettings_log.id}", headers:, params: {} - expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2022, 11, 1)) + expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2022, 12, 31)) expect(completed_lettings_log.status).to eq("completed") expect(page).to have_link("review and make changes to this log", href: "/lettings-logs/#{completed_lettings_log.id}/review") end @@ -1074,7 +1074,7 @@ RSpec.describe LettingsLogsController, type: :request do it "displays a closed collection window message for previous collection year logs" do get "/lettings-logs/#{completed_lettings_log.id}", headers:, params: {} - expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2022, 11, 1)) + expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2022, 12, 31)) expect(completed_lettings_log.status).to eq("completed") follow_redirect! expect(page).to have_content("This log is from the 2021/2022 collection window, which is now closed.")