Browse Source
* Change quarterly deadlines * Update tests * Lint * New helper method changes * lint * lint * update test * lint * Remove formatted helper * Remove formatted helper test * Ignore rubocop error * Lint * Fix * Lint * Typo fix * Change how text displayed after last CY deadline * Update condition * Update open lettings form * Update deadlnes section * Update deadlnes section * Lintpull/2900/merge
Manny Dinssa
4 days ago
committed by
GitHub
6 changed files with 241 additions and 58 deletions
@ -0,0 +1,81 @@
|
||||
module CollectionDeadlineHelper |
||||
include CollectionTimeHelper |
||||
|
||||
QUARTERLY_DEADLINES = { |
||||
2024 => { |
||||
first_quarter_deadline: Time.zone.local(2024, 7, 12), |
||||
second_quarter_deadline: Time.zone.local(2024, 10, 11), |
||||
third_quarter_deadline: Time.zone.local(2025, 1, 10), |
||||
fourth_quarter_deadline: Time.zone.local(2025, 6, 6), # Same as submission deadline |
||||
}, |
||||
2025 => { |
||||
first_quarter_deadline: Time.zone.local(2025, 7, 11), |
||||
second_quarter_deadline: Time.zone.local(2025, 10, 10), |
||||
third_quarter_deadline: Time.zone.local(2026, 1, 16), |
||||
fourth_quarter_deadline: Time.zone.local(2026, 6, 5), # Same as submission deadline |
||||
}, |
||||
}.freeze |
||||
|
||||
def quarterly_cutoff_date(quarter, year) |
||||
send("#{quarter}_quarter", year)[:cutoff_date].strftime("%A %-d %B %Y") |
||||
end |
||||
|
||||
def quarter_deadlines_for_year(year) |
||||
QUARTERLY_DEADLINES[year] |
||||
end |
||||
|
||||
def first_quarter(year) |
||||
{ |
||||
cutoff_date: quarter_deadlines_for_year(year)[:first_quarter_deadline], |
||||
start_date: Time.zone.local(year, 4, 1), |
||||
end_date: Time.zone.local(year, 6, 30), |
||||
} |
||||
end |
||||
|
||||
def second_quarter(year) |
||||
{ |
||||
cutoff_date: quarter_deadlines_for_year(year)[:second_quarter_deadline], |
||||
start_date: Time.zone.local(year, 7, 1), |
||||
end_date: Time.zone.local(year, 9, 30), |
||||
} |
||||
end |
||||
|
||||
def third_quarter(year) |
||||
{ |
||||
cutoff_date: quarter_deadlines_for_year(year)[:third_quarter_deadline], |
||||
start_date: Time.zone.local(year, 10, 1), |
||||
end_date: Time.zone.local(year, 12, 31), |
||||
} |
||||
end |
||||
|
||||
def fourth_quarter(year) |
||||
{ |
||||
cutoff_date: quarter_deadlines_for_year(year)[:fourth_quarter_deadline], |
||||
start_date: Time.zone.local(year + 1, 1, 1), |
||||
end_date: Time.zone.local(year + 1, 3, 31), |
||||
} |
||||
end |
||||
|
||||
def quarter_dates(year) |
||||
[ |
||||
first_quarter(year).merge(quarter: "Q1"), |
||||
second_quarter(year).merge(quarter: "Q2"), |
||||
third_quarter(year).merge(quarter: "Q3"), |
||||
] |
||||
end |
||||
|
||||
def quarter_for_date(date: Time.zone.now) |
||||
quarters = quarter_dates(current_collection_start_year) |
||||
|
||||
quarter = quarters.find { |q| date.between?(q[:start_date], q[:cutoff_date] + 1.day) } |
||||
|
||||
return unless quarter |
||||
|
||||
OpenStruct.new( |
||||
quarter: quarter[:quarter], |
||||
cutoff_date: quarter[:cutoff_date], |
||||
quarter_start_date: quarter[:start_date], |
||||
quarter_end_date: quarter[:end_date], |
||||
) |
||||
end |
||||
end |
||||
@ -0,0 +1,111 @@
|
||||
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) } |
||||
|
||||
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 |
||||
|
||||
describe "_upcoming_deadlines" do |
||||
let(:current_collection_year) { 2024 } |
||||
let(:next_collection_year) { 2025 } |
||||
|
||||
context "when visiting during the current collection year" do |
||||
before do |
||||
allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(false) |
||||
# rubocop:disable RSpec/AnyInstance |
||||
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) |
||||
# rubocop:enable RSpec/AnyInstance |
||||
end |
||||
|
||||
scenario "displays correct text for quarters" do |
||||
Timecop.freeze(Time.zone.local(current_collection_year, 4, 1)) do |
||||
visit root_path |
||||
find("span.govuk-details__summary-text", text: "Quarterly cut-off dates for 2024 to 2025").click |
||||
expect(page).to have_content("Q1 - Friday 12 July 2024") |
||||
expect(page).to have_content("Q2 - Friday 11 October 2024") |
||||
expect(page).to have_content("Q3 - Friday 10 January 2025") |
||||
expect(page).to have_content("End of year deadline - Friday 6 June 2025") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q1" do |
||||
Timecop.freeze(Time.zone.local(current_collection_year, 4, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q1 - Friday 12 July 2024") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q2" do |
||||
Timecop.freeze(Time.zone.local(current_collection_year, 8, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q2 - Friday 11 October 2024") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q3" do |
||||
Timecop.freeze(Time.zone.local(current_collection_year, 11, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q3 - Friday 10 January 2025") |
||||
end |
||||
Timecop.return |
||||
end |
||||
end |
||||
|
||||
context "when visiting during the next collection year" do |
||||
before do |
||||
allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(false) |
||||
# rubocop:disable RSpec/AnyInstance |
||||
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) |
||||
# rubocop:enable RSpec/AnyInstance |
||||
end |
||||
|
||||
scenario "displays correct text for quarters" do |
||||
Timecop.freeze(Time.zone.local(next_collection_year, 4, 1)) do |
||||
visit root_path |
||||
find("span.govuk-details__summary-text", text: "Quarterly cut-off dates for 2025 to 2026").click |
||||
expect(page).to have_content("Q1 - Friday 11 July 2025") |
||||
expect(page).to have_content("Q2 - Friday 10 October 2025") |
||||
expect(page).to have_content("Q3 - Friday 16 January 2026") |
||||
expect(page).to have_content("End of year deadline - Friday 5 June 2026") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q1" do |
||||
Timecop.freeze(Time.zone.local(next_collection_year, 4, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q1 - Friday 11 July 2025") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q2" do |
||||
Timecop.freeze(Time.zone.local(next_collection_year, 8, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q2 - Friday 10 October 2025") |
||||
end |
||||
Timecop.return |
||||
end |
||||
|
||||
scenario "displays correct current quarter as Q3" do |
||||
Timecop.freeze(Time.zone.local(next_collection_year, 11, 1)) do |
||||
visit root_path |
||||
expect(page).to have_content("Q3 - Friday 16 January 2026") |
||||
end |
||||
Timecop.return |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,29 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe CollectionDeadlineHelper do |
||||
let(:current_user) { create(:user, :data_coordinator) } |
||||
let(:user) { create(:user, :data_coordinator) } |
||||
|
||||
describe "#quarter_for_date" do |
||||
it "returns correct cutoff date for the first quarter of 2024/25" do |
||||
quarter = quarter_for_date(date: Time.zone.local(2024, 4, 1)) |
||||
expect(quarter.cutoff_date).to eq(Time.zone.local(2024, 7, 12)) |
||||
expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 4, 1)) |
||||
expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 6, 30)) |
||||
end |
||||
|
||||
it "returns correct cutoff date for the second quarter of 2024/25" do |
||||
quarter = quarter_for_date(date: Time.zone.local(2024, 9, 30)) |
||||
expect(quarter.cutoff_date).to eq(Time.zone.local(2024, 10, 11)) |
||||
expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 7, 1)) |
||||
expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 9, 30)) |
||||
end |
||||
|
||||
it "returns correct cutoff date for the third quarter of 2024/25" do |
||||
quarter = quarter_for_date(date: Time.zone.local(2024, 10, 25)) |
||||
expect(quarter.cutoff_date).to eq(Time.zone.local(2025, 1, 10)) |
||||
expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 10, 1)) |
||||
expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 12, 31)) |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue