From 1e464b68ed886d873dc0dbd946c8881ce4bd24a0 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 3 Jan 2023 08:36:31 +0000 Subject: [PATCH] rebase changes --- db/schema.rb | 2 +- spec/models/form_handler_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index f79423818..0b85e7f1d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -415,7 +415,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_133600) do t.integer "ecstat4" t.integer "ecstat5" t.integer "ecstat6" - t.integer "disabled" t.integer "frombeds" t.integer "staircase" t.integer "stairbought" @@ -428,6 +427,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_133600) do t.integer "resale" t.decimal "deposit", precision: 10, scale: 2 t.decimal "cashdis", precision: 10, scale: 2 + t.integer "disabled" t.integer "lanomagr" t.integer "soctenant" t.decimal "value", precision: 10, scale: 2 diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 880068012..eac4f5825 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,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(83) + expect(form.pages.count).to eq(84) 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(83) + expect(form.pages.count).to eq(84) expect(form.name).to eq("2021_2022_sales") end end