Browse Source

Match form naming convention for spec and real

pull/176/head
baarkerlounger 4 years ago
parent
commit
2e6d14c068
  1. 5
      app/controllers/case_logs_controller.rb
  2. 2
      app/models/case_log.rb
  3. 2
      spec/factories/case_log.rb
  4. 0
      spec/fixtures/forms/2021_2022.json
  5. 4
      spec/helpers/check_answers_helper_spec.rb
  6. 5
      spec/helpers/conditional_questions_helper_spec.rb
  7. 4
      spec/helpers/question_attribute_helper_spec.rb
  8. 3
      spec/models/form/page_spec.rb
  9. 3
      spec/models/form/question_spec.rb
  10. 3
      spec/models/form/section_spec.rb
  11. 3
      spec/models/form/subsection_spec.rb
  12. 9
      spec/models/form_handler_spec.rb
  13. 3
      spec/models/form_spec.rb

5
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

2
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

2
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 }

0
spec/fixtures/forms/test_form.json → spec/fixtures/forms/2021_2022.json vendored

4
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) }

5
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] }

4
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

3
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) }

3
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) }

3
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) }

3
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) }

9
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

3
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) }

Loading…
Cancel
Save