From 446e14fd920ecdfbdea0f432e4499414c95f52a7 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 13 Mar 2023 15:14:21 +0000 Subject: [PATCH] feat: fix more tests --- app/models/validations/setup_validations.rb | 2 +- spec/components/log_summary_component_spec.rb | 4 ++-- spec/features/form/progressive_total_field_spec.rb | 9 +++++++++ spec/models/form_spec.rb | 9 +++++++++ spec/views/form/page_view_spec.rb | 9 +++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 7bf22dbe1..5123fa29c 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -5,7 +5,7 @@ module Validations::SetupValidations def validate_startdate_setup(record) return unless record.startdate && date_valid?("startdate", record) - unless record.startdate.between?(active_collection_start_date, current_collection_end_date) || !FeatureToggle.startdate_collection_window_validation_enabled? + unless record.startdate.between?(active_collection_start_date, current_collection_end_date) || !FeatureToggle.startdate_collection_window_validation_enabled? record.errors.add :startdate, validation_error_message end end diff --git a/spec/components/log_summary_component_spec.rb b/spec/components/log_summary_component_spec.rb index 2d4459946..5210f4286 100644 --- a/spec/components/log_summary_component_spec.rb +++ b/spec/components/log_summary_component_spec.rb @@ -16,8 +16,8 @@ RSpec.describe LogSummaryComponent, type: :component do expect(result).to have_text(lettings_log.tenancycode) expect(result).to have_text(lettings_log.propcode) expect(result).to have_text("General needs") - expect(result).to have_text("Tenancy starts #{Time.zone.today.strftime("%e %B %Y")}") - expect(result).to have_text("Created #{Time.zone.today.strftime("%e %B %Y")}") + expect(result).to have_text("Tenancy starts #{Time.zone.today.strftime('%e %B %Y')}") + expect(result).to have_text("Created #{Time.zone.today.strftime('%e %B %Y')}") expect(result).to have_text("by Danny Rojas") expect(result).to have_content("Owned by\n DLUHC") expect(result).to have_content("Managed by\n DLUHC") diff --git a/spec/features/form/progressive_total_field_spec.rb b/spec/features/form/progressive_total_field_spec.rb index 787174c20..cbf50f206 100644 --- a/spec/features/form/progressive_total_field_spec.rb +++ b/spec/features/form/progressive_total_field_spec.rb @@ -12,6 +12,15 @@ RSpec.describe "Accessible Autocomplete" do ) end + around do |example| + Timecop.freeze(Time.zone.local(2022, 1, 1)) do + Singleton.__init__(FormHandler) + example.run + end + Timecop.return + Singleton.__init__(FormHandler) + end + before do allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day) sign_in user diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index cd58587dc..cac779e33 100644 --- a/spec/models/form_spec.rb +++ b/spec/models/form_spec.rb @@ -1,6 +1,15 @@ require "rails_helper" RSpec.describe Form, type: :model do + around do |example| + Timecop.freeze(Time.zone.local(2022, 1, 1)) do + Singleton.__init__(FormHandler) + example.run + end + Timecop.return + Singleton.__init__(FormHandler) + end + let(:user) { FactoryBot.build(:user) } let(:lettings_log) { FactoryBot.build(:lettings_log, :in_progress) } let(:form) { lettings_log.form } diff --git a/spec/views/form/page_view_spec.rb b/spec/views/form/page_view_spec.rb index a7039a9a9..074a7fd6a 100644 --- a/spec/views/form/page_view_spec.rb +++ b/spec/views/form/page_view_spec.rb @@ -17,6 +17,15 @@ RSpec.describe "form/page" do end end + around do |example| + Timecop.freeze(Time.zone.local(2022, 1, 1)) do + Singleton.__init__(FormHandler) + example.run + end + Timecop.return + Singleton.__init__(FormHandler) + end + before do assign(:log, lettings_log) assign(:page, page)