From d7102b6a7b42365673c520c2aab586e856c0a027 Mon Sep 17 00:00:00 2001 From: Jack S Date: Thu, 20 Apr 2023 13:35:52 +0100 Subject: [PATCH] Move sales created_by page and question out of common --- app/models/form/{common => sales}/pages/created_by.rb | 4 ++-- app/models/form/{common => sales}/questions/created_by_id.rb | 2 +- app/models/form/sales/subsections/setup.rb | 2 +- spec/models/form/lettings/questions/created_by_id_spec.rb | 2 +- spec/models/form/{common => sales}/pages/created_by_spec.rb | 2 +- .../form/{common => sales}/questions/created_by_id_spec.rb | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename app/models/form/{common => sales}/pages/created_by.rb (70%) rename app/models/form/{common => sales}/questions/created_by_id.rb (95%) rename spec/models/form/{common => sales}/pages/created_by_spec.rb (95%) rename spec/models/form/{common => sales}/questions/created_by_id_spec.rb (96%) diff --git a/app/models/form/common/pages/created_by.rb b/app/models/form/sales/pages/created_by.rb similarity index 70% rename from app/models/form/common/pages/created_by.rb rename to app/models/form/sales/pages/created_by.rb index ac4fefa6d..3b8fcb56c 100644 --- a/app/models/form/common/pages/created_by.rb +++ b/app/models/form/sales/pages/created_by.rb @@ -1,4 +1,4 @@ -class Form::Common::Pages::CreatedBy < ::Form::Page +class Form::Sales::Pages::CreatedBy < ::Form::Page def initialize(id, hsh, subsection) super @id = "created_by" @@ -6,7 +6,7 @@ class Form::Common::Pages::CreatedBy < ::Form::Page def questions @questions ||= [ - Form::Common::Questions::CreatedById.new(nil, nil, self), + Form::Sales::Questions::CreatedById.new(nil, nil, self), ] end diff --git a/app/models/form/common/questions/created_by_id.rb b/app/models/form/sales/questions/created_by_id.rb similarity index 95% rename from app/models/form/common/questions/created_by_id.rb rename to app/models/form/sales/questions/created_by_id.rb index 1ce4deec7..2563478a1 100644 --- a/app/models/form/common/questions/created_by_id.rb +++ b/app/models/form/sales/questions/created_by_id.rb @@ -1,4 +1,4 @@ -class Form::Common::Questions::CreatedById < ::Form::Question +class Form::Sales::Questions::CreatedById < ::Form::Question ANSWER_OPTS = { "" => "Select an option" }.freeze def initialize(id, hsh, page) diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index c723b732c..4413575d6 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -8,7 +8,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection def pages @pages ||= [ Form::Common::Pages::Organisation.new(nil, nil, self), - Form::Common::Pages::CreatedBy.new(nil, nil, self), + Form::Sales::Pages::CreatedBy.new(nil, nil, self), Form::Sales::Pages::SaleDate.new(nil, nil, self), Form::Sales::Pages::SaleDateCheck.new(nil, nil, self), Form::Sales::Pages::PurchaserCode.new(nil, nil, self), diff --git a/spec/models/form/lettings/questions/created_by_id_spec.rb b/spec/models/form/lettings/questions/created_by_id_spec.rb index aff15e93e..c7b843a89 100644 --- a/spec/models/form/lettings/questions/created_by_id_spec.rb +++ b/spec/models/form/lettings/questions/created_by_id_spec.rb @@ -129,7 +129,7 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do end it "only displays users that belong user's org" do - expect(question.displayed_answer_options(lettings_log, data_provider)).to eq(Form::Common::Questions::CreatedById::ANSWER_OPTS) + expect(question.displayed_answer_options(lettings_log, data_provider)).to eq(Form::Lettings::Questions::CreatedById::ANSWER_OPTS) end end end diff --git a/spec/models/form/common/pages/created_by_spec.rb b/spec/models/form/sales/pages/created_by_spec.rb similarity index 95% rename from spec/models/form/common/pages/created_by_spec.rb rename to spec/models/form/sales/pages/created_by_spec.rb index b095b1a30..2d3d7b7d7 100644 --- a/spec/models/form/common/pages/created_by_spec.rb +++ b/spec/models/form/sales/pages/created_by_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe Form::Common::Pages::CreatedBy, type: :model do +RSpec.describe Form::Sales::Pages::CreatedBy, type: :model do subject(:page) { described_class.new(page_id, page_definition, subsection) } let(:page_id) { nil } diff --git a/spec/models/form/common/questions/created_by_id_spec.rb b/spec/models/form/sales/questions/created_by_id_spec.rb similarity index 96% rename from spec/models/form/common/questions/created_by_id_spec.rb rename to spec/models/form/sales/questions/created_by_id_spec.rb index e287198b1..1bbebe0ac 100644 --- a/spec/models/form/common/questions/created_by_id_spec.rb +++ b/spec/models/form/sales/questions/created_by_id_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe Form::Common::Questions::CreatedById, type: :model do +RSpec.describe Form::Sales::Questions::CreatedById, type: :model do subject(:question) { described_class.new(question_id, question_definition, page) } let(:question_id) { nil } @@ -120,7 +120,7 @@ RSpec.describe Form::Common::Questions::CreatedById, type: :model do end it "only displays users that belong user's org" do - expect(question.displayed_answer_options(sales_log, data_provider)).to eq(Form::Common::Questions::CreatedById::ANSWER_OPTS) + expect(question.displayed_answer_options(sales_log, data_provider)).to eq(Form::Sales::Questions::CreatedById::ANSWER_OPTS) end end end