From ae369183052c8105a5900ceb1137bc54dcf96963 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Wed, 15 Mar 2023 16:22:20 +0000
Subject: [PATCH] feat: fix subsection_spec.rb

---
 spec/models/form/subsection_spec.rb            |  9 +++++++++
 spec/requests/lettings_logs_controller_spec.rb | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/spec/models/form/subsection_spec.rb b/spec/models/form/subsection_spec.rb
index 46880a33a..3e224dd38 100644
--- a/spec/models/form/subsection_spec.rb
+++ b/spec/models/form/subsection_spec.rb
@@ -4,6 +4,15 @@ require_relative "../../request_helper"
 RSpec.describe Form::Subsection, type: :model do
   subject(:subsection) { described_class.new(subsection_id, subsection_definition, section) }
 
+  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(:lettings_log) { FactoryBot.build(:lettings_log) }
   let(:form) { lettings_log.form }
   let(:section_id) { "household" }
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index 91dc56484..74b6eac96 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -324,9 +324,11 @@ RSpec.describe LettingsLogsController, type: :request do
             before do
               Timecop.freeze(2022, 3, 1)
             end
+
             after do
               Timecop.unfreeze
             end
+
             let!(:lettings_log_2021) do
               FactoryBot.create(:lettings_log, :in_progress,
                                 created_by: user,
@@ -829,6 +831,13 @@ RSpec.describe LettingsLogsController, type: :request do
               get "/lettings-logs/#{lettings_log.id}", headers:, params: {}
             end
 
+            before do
+              Timecop.freeze(2021, 4, 1)
+              completed_lettings_log.update!(startdate: Time.zone.local(2021, 4, 1), voiddate: Time.zone.local(2021, 4, 1), mrcdate: Time.zone.local(2021, 4, 1))
+              completed_lettings_log.reload
+              Timecop.unfreeze
+            end
+
             it "shows the tasklist for lettings logs you have access to" do
               expect(response.body).to match("Log")
               expect(response.body).to match(lettings_log.id.to_s)
@@ -851,13 +860,6 @@ RSpec.describe LettingsLogsController, type: :request do
               expect(page).to have_link("review and make changes to this log", href: "/lettings-logs/#{completed_lettings_log.id}/review")
             end
 
-            before do
-              Timecop.freeze(2021, 4, 1)
-              completed_lettings_log.update!(startdate: Time.zone.local(2021, 4, 1), voiddate: Time.zone.local(2021, 4, 1), mrcdate: Time.zone.local(2021, 4, 1))
-              completed_lettings_log.reload
-              Timecop.unfreeze
-            end
-
             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.end_date).to eq(Time.zone.local(2022, 7, 1))
@@ -1153,6 +1155,7 @@ RSpec.describe LettingsLogsController, type: :request do
         Timecop.return
         Singleton.__init__(FormHandler)
       end
+
       let(:params) { { age1: 200 } }
 
       it "returns 422" do