From 651ec064d33fd1787cc1c5ce42e750c00fcfd9cf Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 16 Sep 2022 15:25:53 +0100 Subject: [PATCH] Fix tests --- app/models/sales_log.rb | 1 + db/schema.rb | 2 ++ spec/models/form_handler_spec.rb | 4 ++-- spec/models/form_spec.rb | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 6c4ae2ec8..a2a6dcff3 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -3,6 +3,7 @@ class SalesLogValidator < ActiveModel::Validator end class SalesLog < Log + self.inheritance_column = :_type_disabled has_paper_trail validates_with SalesLogValidator diff --git a/db/schema.rb b/db/schema.rb index ccd8af420..6548f2c86 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -322,6 +322,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_16_125704) do t.bigint "managing_organisation_id" t.bigint "created_by_id" t.string "purchid" + t.integer "type" + t.integer "ownershipsch" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 4a5908773..80e291ead 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -51,14 +51,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(4) + expect(form.pages.count).to eq(5) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(4) + expect(form.pages.count).to eq(5) expect(form.name).to eq("2021_2022_sales") end end diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index 9305b61b9..38caa5ec6 100644 --- a/spec/models/form_spec.rb +++ b/spec/models/form_spec.rb @@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup) expect(form.subsections.count).to eq(1) expect(form.subsections.first.id).to eq("setup") - expect(form.pages.count).to eq(4) + expect(form.pages.count).to eq(5) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(4) + expect(form.questions.count).to eq(5) expect(form.questions.first.id).to eq("owning_organisation_id") expect(form.start_date).to eq(Time.zone.parse("2022-04-01")) expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))