From 9a10435f8dbd53eb91dd420e4438907dcc629bba Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 17 Mar 2023 12:35:37 +0000 Subject: [PATCH] feat: unfreeze all timecop freezes --- spec/components/log_summary_component_spec.rb | 106 +++++++++--------- spec/helpers/collection_time_helper_spec.rb | 1 + spec/models/form_handler_spec.rb | 1 + .../sales/financial_validations_spec.rb | 2 +- .../validations/tenancy_validations_spec.rb | 4 + .../requests/lettings_logs_controller_spec.rb | 2 +- spec/requests/sales_logs_controller_spec.rb | 2 +- .../lettings/year2022/row_parser_spec.rb | 1 + .../lettings/year2023/row_parser_spec.rb | 1 + 9 files changed, 64 insertions(+), 56 deletions(-) diff --git a/spec/components/log_summary_component_spec.rb b/spec/components/log_summary_component_spec.rb index e1938fc03..99015b6d6 100644 --- a/spec/components/log_summary_component_spec.rb +++ b/spec/components/log_summary_component_spec.rb @@ -1,53 +1,53 @@ -# require "rails_helper" -# -# RSpec.describe LogSummaryComponent, type: :component do -# let(:support_user) { FactoryBot.create(:user, :support) } -# let(:coordinator_user) { FactoryBot.create(:user) } -# let(:propcode) { "P3647" } -# let(:tenancycode) { "T62863" } -# let(:lettings_log) { FactoryBot.create(:lettings_log, needstype: 1, tenancycode:, propcode:, startdate: Time.zone.today) } -# let(:sales_log) { FactoryBot.create(:sales_log) } -# -# context "when rendering lettings log for a support user" do -# it "show the log summary with organisational relationships" do -# result = render_inline(described_class.new(current_user: support_user, log: lettings_log)) -# -# expect(result).to have_link(lettings_log.id.to_s) -# 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("by Danny Rojas") -# expect(result).to have_content("Owned by\n DLUHC") -# expect(result).to have_content("Managed by\n DLUHC") -# end -# end -# -# context "when rendering lettings log for a data coordinator user" do -# it "show the log summary" do -# result = render_inline(described_class.new(current_user: coordinator_user, log: lettings_log)) -# -# expect(result).not_to have_content("Owned by") -# expect(result).not_to have_content("Managed by") -# end -# end -# -# context "when rendering sales log for a support user" do -# it "show the log summary with organisational relationships" do -# result = render_inline(described_class.new(current_user: support_user, log: sales_log)) -# -# expect(result).to have_content("Owned by\n DLUHC") -# expect(result).not_to have_content("Managed by") -# end -# end -# -# context "when rendering sales log for a data coordinator user" do -# it "show the log summary" do -# result = render_inline(described_class.new(current_user: coordinator_user, log: sales_log)) -# -# expect(result).not_to have_content("Owned by") -# expect(result).not_to have_content("Managed by") -# end -# end -# end +require "rails_helper" + +RSpec.describe LogSummaryComponent, type: :component do + let(:support_user) { FactoryBot.create(:user, :support) } + let(:coordinator_user) { FactoryBot.create(:user) } + let(:propcode) { "P3647" } + let(:tenancycode) { "T62863" } + let(:lettings_log) { FactoryBot.create(:lettings_log, needstype: 1, tenancycode:, propcode:, startdate: Time.zone.today) } + let(:sales_log) { FactoryBot.create(:sales_log) } + + context "when rendering lettings log for a support user" do + it "show the log summary with organisational relationships" do + result = render_inline(described_class.new(current_user: support_user, log: lettings_log)) + + expect(result).to have_link(lettings_log.id.to_s) + 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("by Danny Rojas") + expect(result).to have_content("Owned by\n DLUHC") + expect(result).to have_content("Managed by\n DLUHC") + end + end + + context "when rendering lettings log for a data coordinator user" do + it "show the log summary" do + result = render_inline(described_class.new(current_user: coordinator_user, log: lettings_log)) + + expect(result).not_to have_content("Owned by") + expect(result).not_to have_content("Managed by") + end + end + + context "when rendering sales log for a support user" do + it "show the log summary with organisational relationships" do + result = render_inline(described_class.new(current_user: support_user, log: sales_log)) + + expect(result).to have_content("Owned by\n DLUHC") + expect(result).not_to have_content("Managed by") + end + end + + context "when rendering sales log for a data coordinator user" do + it "show the log summary" do + result = render_inline(described_class.new(current_user: coordinator_user, log: sales_log)) + + expect(result).not_to have_content("Owned by") + expect(result).not_to have_content("Managed by") + end + end +end diff --git a/spec/helpers/collection_time_helper_spec.rb b/spec/helpers/collection_time_helper_spec.rb index 0c187020e..43a14025e 100644 --- a/spec/helpers/collection_time_helper_spec.rb +++ b/spec/helpers/collection_time_helper_spec.rb @@ -9,6 +9,7 @@ RSpec.describe CollectionTimeHelper do Timecop.freeze(now) do example.run end + Timecop.return end context "when the date is after 1st of April" do diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index a6b5b181a..417da6639 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -9,6 +9,7 @@ RSpec.describe FormHandler do Singleton.__init__(described_class) example.run end + Timecop.return Singleton.__init__(described_class) end diff --git a/spec/models/validations/sales/financial_validations_spec.rb b/spec/models/validations/sales/financial_validations_spec.rb index 350cc66ef..093c491a4 100644 --- a/spec/models/validations/sales/financial_validations_spec.rb +++ b/spec/models/validations/sales/financial_validations_spec.rb @@ -274,7 +274,7 @@ RSpec.describe Validations::Sales::FinancialValidations do Timecop.freeze(now) do example.run end - Timecop.unfreeze + Timecop.return end context "with a log in the 22/23 collection year" do diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb index 8f7d79e29..9f3a2b873 100644 --- a/spec/models/validations/tenancy_validations_spec.rb +++ b/spec/models/validations/tenancy_validations_spec.rb @@ -7,6 +7,10 @@ RSpec.describe Validations::TenancyValidations do Timecop.freeze(Time.zone.local(2021, 5, 1)) end + after do + Timecop.unfreeze + end + let(:validator_class) { Class.new { include Validations::TenancyValidations } } let(:record) { FactoryBot.create(:lettings_log, startdate: Time.zone.local(2021, 5, 1), needstype: 1, rent_type: 1) } diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index c5ee2a6ab..066cd1f35 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -337,7 +337,7 @@ RSpec.describe LettingsLogsController, type: :request do Timecop.freeze(2022, 3, 1) do example.run end - Timecop.unfreeze + Timecop.return end let!(:lettings_log_2021) do diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index 1d68b045b..0a7ca0790 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -235,7 +235,7 @@ RSpec.describe SalesLogsController, type: :request do Timecop.freeze(2022, 12, 1) do example.run end - Timecop.unfreeze + Timecop.return end let!(:sales_log_2022) do diff --git a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb index 312a63a3b..f03ea894b 100644 --- a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb @@ -610,6 +610,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do Timecop.freeze(Date.new(2022, 4, 2)) do example.run end + Timecop.return end let(:attributes) { { bulk_upload:, field_96: "1", field_97: "1", field_98: "22" } } diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb index f658f7b04..80df8f54f 100644 --- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb @@ -562,6 +562,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do Timecop.freeze(Date.new(2022, 4, 2)) do example.run end + Timecop.return end let(:attributes) { { bulk_upload:, field_7: "1", field_8: "1", field_9: "22" } }