Browse Source
* Add nationality and other nationality questions * Add nationality page * Add national columns * Add hidden_in_check_answers * Update conditional question controller to work with both log types * update tests * lint * Remove console.log * tests and migration * typo * tests * tests * feat: update schema and tests * Add nationality and other nationality questions * Add nationality page * Add national columns * Add hidden_in_check_answers * Update conditional question controller to work with both log types * update tests * lint * Remove console.log * tests and migration * typo * tests * feat: update schema and tests * tests: update tests * feat: update schema.rb Co-authored-by: natdeanlewissoftwire <nat.dean-lewis@softwire.com>pull/931/head
kosiakkatrina
2 years ago
committed by
GitHub
16 changed files with 240 additions and 18 deletions
@ -0,0 +1,16 @@
|
||||
class Form::Sales::Pages::Nationality1 < ::Form::Page |
||||
def initialize(id, hsh, subsection) |
||||
super |
||||
@id = "buyer_1_nationality" |
||||
@header = "" |
||||
@description = "" |
||||
@subsection = subsection |
||||
end |
||||
|
||||
def questions |
||||
@questions ||= [ |
||||
Form::Sales::Questions::Nationality1.new(nil, nil, self), |
||||
Form::Sales::Questions::OtherNationality1.new(nil, nil, self), |
||||
] |
||||
end |
||||
end |
||||
@ -0,0 +1,30 @@
|
||||
class Form::Sales::Questions::Nationality1 < ::Form::Question |
||||
def initialize(id, hsh, page) |
||||
super |
||||
@id = "national" |
||||
@check_answer_label = "Buyer 1’s nationality" |
||||
@header = "What is buyer 1’s nationality?" |
||||
@type = "radio" |
||||
@hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." |
||||
@page = page |
||||
@answer_options = ANSWER_OPTIONS |
||||
@conditional_for = { |
||||
"othernational" => [12], |
||||
} |
||||
@hidden_in_check_answers = { |
||||
"depends_on" => [ |
||||
{ |
||||
"national" => 12, |
||||
}, |
||||
], |
||||
} |
||||
end |
||||
|
||||
ANSWER_OPTIONS = { |
||||
"18" => { "value" => "United Kingdom" }, |
||||
"17" => { "value" => "Republic of Ireland" }, |
||||
"19" => { "value" => "European Economic Area (EEA), excluding ROI" }, |
||||
"12" => { "value" => "Other" }, |
||||
"13" => { "value" => "Buyer prefers not to say" }, |
||||
}.freeze |
||||
end |
||||
@ -0,0 +1,10 @@
|
||||
class Form::Sales::Questions::OtherNationality1 < ::Form::Question |
||||
def initialize(id, hsh, page) |
||||
super |
||||
@id = "othernational" |
||||
@check_answer_label = "Buyer 1’s nationality" |
||||
@header = "Nationality" |
||||
@type = "text" |
||||
@page = page |
||||
end |
||||
end |
||||
@ -0,0 +1,8 @@
|
||||
class AddNationalColumn < ActiveRecord::Migration[7.0] |
||||
def change |
||||
change_table :sales_logs, bulk: true do |t| |
||||
t.column :national, :integer |
||||
t.column :othernational, :string |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,33 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Sales::Pages::Nationality1, type: :model do |
||||
subject(:page) { described_class.new(page_id, page_definition, subsection) } |
||||
|
||||
let(:page_id) { nil } |
||||
let(:page_definition) { nil } |
||||
let(:subsection) { instance_double(Form::Subsection) } |
||||
|
||||
it "has correct subsection" do |
||||
expect(page.subsection).to eq(subsection) |
||||
end |
||||
|
||||
it "has correct questions" do |
||||
expect(page.questions.map(&:id)).to eq(%w[national othernational]) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(page.id).to eq("buyer_1_nationality") |
||||
end |
||||
|
||||
it "has the correct header" do |
||||
expect(page.header).to eq("") |
||||
end |
||||
|
||||
it "has the correct description" do |
||||
expect(page.description).to eq("") |
||||
end |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to be_nil |
||||
end |
||||
end |
||||
@ -0,0 +1,63 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Sales::Questions::Nationality1, type: :model do |
||||
subject(:question) { described_class.new(question_id, question_definition, page) } |
||||
|
||||
let(:question_id) { nil } |
||||
let(:question_definition) { nil } |
||||
let(:page) { instance_double(Form::Page) } |
||||
|
||||
it "has correct page" do |
||||
expect(question.page).to eq(page) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(question.id).to eq("national") |
||||
end |
||||
|
||||
it "has the correct header" do |
||||
expect(question.header).to eq("What is buyer 1’s nationality?") |
||||
end |
||||
|
||||
it "has the correct check_answer_label" do |
||||
expect(question.check_answer_label).to eq("Buyer 1’s nationality") |
||||
end |
||||
|
||||
it "has the correct type" do |
||||
expect(question.type).to eq("radio") |
||||
end |
||||
|
||||
it "is not marked as derived" do |
||||
expect(question.derived?).to be false |
||||
end |
||||
|
||||
it "has the correct hint" do |
||||
expect(question.hint_text).to eq("Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest.") |
||||
end |
||||
|
||||
it "has the correct answer_options" do |
||||
expect(question.answer_options).to eq({ |
||||
"18" => { "value" => "United Kingdom" }, |
||||
"17" => { "value" => "Republic of Ireland" }, |
||||
"19" => { "value" => "European Economic Area (EEA), excluding ROI" }, |
||||
"12" => { "value" => "Other" }, |
||||
"13" => { "value" => "Buyer prefers not to say" }, |
||||
}) |
||||
end |
||||
|
||||
it "has correct conditional for" do |
||||
expect(question.conditional_for).to eq({ |
||||
"othernational" => [12], |
||||
}) |
||||
end |
||||
|
||||
it "has correct hidden in check answers" do |
||||
expect(question.hidden_in_check_answers).to eq({ |
||||
"depends_on" => [ |
||||
{ |
||||
"national" => 12, |
||||
}, |
||||
], |
||||
}) |
||||
end |
||||
end |
||||
@ -0,0 +1,37 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Sales::Questions::OtherNationality1, type: :model do |
||||
subject(:question) { described_class.new(question_id, question_definition, page) } |
||||
|
||||
let(:question_id) { nil } |
||||
let(:question_definition) { nil } |
||||
let(:page) { instance_double(Form::Page) } |
||||
|
||||
it "has correct page" do |
||||
expect(question.page).to eq(page) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(question.id).to eq("othernational") |
||||
end |
||||
|
||||
it "has the correct header" do |
||||
expect(question.header).to eq("Nationality") |
||||
end |
||||
|
||||
it "has the correct check_answer_label" do |
||||
expect(question.check_answer_label).to eq("Buyer 1’s nationality") |
||||
end |
||||
|
||||
it "has the correct type" do |
||||
expect(question.type).to eq("text") |
||||
end |
||||
|
||||
it "is not marked as derived" do |
||||
expect(question.derived?).to be false |
||||
end |
||||
|
||||
it "has the correct hint" do |
||||
expect(question.hint_text).to be_nil |
||||
end |
||||
end |
||||
Loading…
Reference in new issue