Browse Source

CLDC-3076: Make example dates consistent

pull/2107/head
Rachael Booth 1 year ago
parent
commit
627dd4fb63
  1. 3
      app/helpers/collection_time_helper.rb
  2. 14
      spec/helpers/collection_time_helper_spec.rb

3
app/helpers/collection_time_helper.rb

@ -13,7 +13,8 @@ module CollectionTimeHelper
end end
def date_mid_collection_year_formatted(date) def date_mid_collection_year_formatted(date)
example_date = date.nil? ? Time.zone.today : collection_start_date(date).to_date + 5.months relevant_year = date.nil? ? current_collection_start_year : collection_start_year_for_date(date)
example_date = Date.new(relevant_year, 9, 13)
example_date.to_formatted_s(:govuk_date_number_month) example_date.to_formatted_s(:govuk_date_number_month)
end end

14
spec/helpers/collection_time_helper_spec.rb

@ -85,9 +85,9 @@ RSpec.describe CollectionTimeHelper do
context "when called with nil" do context "when called with nil" do
let(:input) { nil } let(:input) { nil }
it "returns the current date" do it "returns the 13th of September in the current collection year" do
today = Time.zone.today year = current_collection_start_year
expect(result).to eq("#{today.day} #{today.month} #{today.year}") expect(result).to eq("13 9 #{year}")
end end
end end
@ -95,8 +95,8 @@ RSpec.describe CollectionTimeHelper do
calendar_year = 2030 calendar_year = 2030
let(:input) { Date.new(calendar_year, 7, 7) } let(:input) { Date.new(calendar_year, 7, 7) }
it "returns the first of September from that year" do it "returns the 13th of September from that year" do
expect(result).to eq("1 9 #{calendar_year}") expect(result).to eq("13 9 #{calendar_year}")
end end
end end
@ -104,8 +104,8 @@ RSpec.describe CollectionTimeHelper do
calendar_year = 2040 calendar_year = 2040
let(:input) { Date.new(calendar_year, 2, 7) } let(:input) { Date.new(calendar_year, 2, 7) }
it "returns the first of September from the previous year" do it "returns the 13th of September from the previous year" do
expect(result).to eq("1 9 #{calendar_year - 1}") expect(result).to eq("13 9 #{calendar_year - 1}")
end end
end end
end end

Loading…
Cancel
Save