From 2e6d14c06814196b16ad674e97def971a549a421 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Tue, 21 Dec 2021 13:03:53 +0000 Subject: [PATCH] Match form naming convention for spec and real --- app/controllers/case_logs_controller.rb | 5 ----- app/models/case_log.rb | 2 -- spec/factories/case_log.rb | 2 +- spec/fixtures/forms/{test_form.json => 2021_2022.json} | 0 spec/helpers/check_answers_helper_spec.rb | 4 ++-- spec/helpers/conditional_questions_helper_spec.rb | 5 ++--- spec/helpers/question_attribute_helper_spec.rb | 4 ++-- spec/models/form/page_spec.rb | 3 ++- spec/models/form/question_spec.rb | 3 ++- spec/models/form/section_spec.rb | 3 ++- spec/models/form/subsection_spec.rb | 3 ++- spec/models/form_handler_spec.rb | 9 +++++---- spec/models/form_spec.rb | 3 +-- 13 files changed, 21 insertions(+), 25 deletions(-) rename spec/fixtures/forms/{test_form.json => 2021_2022.json} (100%) diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb index 839fa78ac..e6a3a3ecd 100644 --- a/app/controllers/case_logs_controller.rb +++ b/app/controllers/case_logs_controller.rb @@ -106,9 +106,4 @@ private def find_resource @case_log = CaseLog.find_by(id: params[:id]) end - - def find_form - year = @case_log.year || 2021 - @form = FormHandler.instance.get_form("#{year}_#{year + 1}") - end end diff --git a/app/models/case_log.rb b/app/models/case_log.rb index e91efa1f7..b65b7ef44 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -141,8 +141,6 @@ class CaseLog < ApplicationRecord end def form_name - return "test_form" if Rails.env.test? - start_year = year || 2021 "#{start_year}_#{start_year + 1}" end diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb index b459e38fc..6bb24ab91 100644 --- a/spec/factories/case_log.rb +++ b/spec/factories/case_log.rb @@ -136,7 +136,7 @@ FactoryBot.define do startdate { Time.zone.now } day { Time.zone.now.day } month { Time.zone.now.month } - year { Time.zone.now.year } + year { 2021 } armedforces { 1 } builtype { 1 } unitletas { 2 } diff --git a/spec/fixtures/forms/test_form.json b/spec/fixtures/forms/2021_2022.json similarity index 100% rename from spec/fixtures/forms/test_form.json rename to spec/fixtures/forms/2021_2022.json diff --git a/spec/helpers/check_answers_helper_spec.rb b/spec/helpers/check_answers_helper_spec.rb index 4a90a53ea..ee6612a49 100644 --- a/spec/helpers/check_answers_helper_spec.rb +++ b/spec/helpers/check_answers_helper_spec.rb @@ -1,8 +1,8 @@ require "rails_helper" RSpec.describe CheckAnswersHelper do - form_handler = FormHandler.instance - let(:form) { form_handler.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:subsection) { form.get_subsection("household_characteristics") } let(:case_log) { FactoryBot.build(:case_log, :in_progress) } diff --git a/spec/helpers/conditional_questions_helper_spec.rb b/spec/helpers/conditional_questions_helper_spec.rb index 2b86cd7f2..84f078411 100644 --- a/spec/helpers/conditional_questions_helper_spec.rb +++ b/spec/helpers/conditional_questions_helper_spec.rb @@ -1,9 +1,8 @@ require "rails_helper" RSpec.describe ConditionalQuestionsHelper do - form_handler = FormHandler.instance - let(:form) { form_handler.get_form("test_form") } - let(:page) { form.get_page("armed_forces") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:page) { case_log.form.get_page("armed_forces") } describe "conditional questions for page" do let(:conditional_pages) { %w[leftreg reservist] } diff --git a/spec/helpers/question_attribute_helper_spec.rb b/spec/helpers/question_attribute_helper_spec.rb index a3b784bc0..88c30d3e9 100644 --- a/spec/helpers/question_attribute_helper_spec.rb +++ b/spec/helpers/question_attribute_helper_spec.rb @@ -1,8 +1,8 @@ require "rails_helper" RSpec.describe QuestionAttributeHelper do - form_handler = FormHandler.instance - let(:form) { form_handler.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:questions) { form.get_page("rent").questions } describe "html attributes" do diff --git a/spec/models/form/page_spec.rb b/spec/models/form/page_spec.rb index 0da9d7b19..a0eac90e9 100644 --- a/spec/models/form/page_spec.rb +++ b/spec/models/form/page_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" RSpec.describe Form::Page, type: :model do - let(:form) { FormHandler.instance.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:section_id) { "rent_and_charges" } let(:section_definition) { form.form_definition["sections"][section_id] } let(:section) { Form::Section.new(section_id, section_definition, form) } diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb index aff54e543..619cd7276 100644 --- a/spec/models/form/question_spec.rb +++ b/spec/models/form/question_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" RSpec.describe Form::Question, type: :model do - let(:form) { FormHandler.instance.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:section_id) { "rent_and_charges" } let(:section_definition) { form.form_definition["sections"][section_id] } let(:section) { Form::Section.new(section_id, section_definition, form) } diff --git a/spec/models/form/section_spec.rb b/spec/models/form/section_spec.rb index cecf2c3a7..da63c68e2 100644 --- a/spec/models/form/section_spec.rb +++ b/spec/models/form/section_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" RSpec.describe Form::Section, type: :model do - let(:form) { FormHandler.instance.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:section_id) { "household" } let(:section_definition) { form.form_definition["sections"][section_id] } subject { Form::Section.new(section_id, section_definition, form) } diff --git a/spec/models/form/subsection_spec.rb b/spec/models/form/subsection_spec.rb index 0bce0961c..f64adc73e 100644 --- a/spec/models/form/subsection_spec.rb +++ b/spec/models/form/subsection_spec.rb @@ -1,7 +1,8 @@ require "rails_helper" RSpec.describe Form::Subsection, type: :model do - let(:form) { FormHandler.instance.get_form("test_form") } + let(:case_log) { FactoryBot.build(:case_log) } + let(:form) { case_log.form } let(:section_id) { "household" } let(:section_definition) { form.form_definition["sections"][section_id] } let(:section) { Form::Section.new(section_id, section_definition, form) } diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 2d23afd25..188ca33d1 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -1,19 +1,20 @@ require "rails_helper" RSpec.describe FormHandler do + let(:test_form_name) { "2021_2022" } describe "Get all forms" do it "should be able to load all the forms" do form_handler = FormHandler.instance all_forms = form_handler.forms expect(all_forms.count).to be >= 1 - expect(all_forms["test_form"]).to be_a(Form) + expect(all_forms[test_form_name]).to be_a(Form) end end describe "Get specific form" do it "should be able to load a specific form" do form_handler = FormHandler.instance - form = form_handler.get_form("test_form") + form = form_handler.get_form(test_form_name) expect(form).to be_a(Form) expect(form.pages.count).to eq(27) end @@ -21,7 +22,7 @@ RSpec.describe FormHandler do it "should only load the form once at boot time" do form_handler = FormHandler.instance - expect(Form).not_to receive(:new).with(:any, "test_form") - expect(form_handler.get_form("test_form")).to be_a(Form) + expect(Form).not_to receive(:new).with(:any, test_form_name) + expect(form_handler.get_form(test_form_name)).to be_a(Form) end end diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index fa14e8797..1816946d4 100644 --- a/spec/models/form_spec.rb +++ b/spec/models/form_spec.rb @@ -1,9 +1,8 @@ require "rails_helper" RSpec.describe Form, type: :model do - form_handler = FormHandler.instance - let(:form) { form_handler.get_form("test_form") } let(:case_log) { FactoryBot.build(:case_log, :in_progress) } + let(:form) { case_log.form } let(:completed_case_log) { FactoryBot.build(:case_log, :completed) } let(:conditional_section_complete_case_log) { FactoryBot.build(:case_log, :conditional_section_complete) }