From 25bf7338141329f621fee55254d60eed244fcf63 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Fri, 16 Sep 2022 09:58:32 +0100 Subject: [PATCH] Question order --- app/models/form/sales/subsections/setup.rb | 2 +- spec/features/sales_log_spec.rb | 8 ++++---- spec/models/form/sales/subsections/setup_spec.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index db91e261f..4c8601e8d 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -10,8 +10,8 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection @pages ||= [ Form::Common::Pages::Organisation.new(nil, nil, self), Form::Common::Pages::CreatedBy.new(nil, nil, self), - Form::Sales::Pages::PurchaserCode.new(nil, nil, self), Form::Sales::Pages::SaleDate.new(nil, nil, self), + Form::Sales::Pages::PurchaserCode.new(nil, nil, self), ] end end diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index 4c07f2acd..270d9bf37 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -38,18 +38,18 @@ RSpec.describe "Sales Log Features" do visit("/sales-logs") click_button("Create a new sales log") click_link("Set up this sales log") - fill_in("sales_log[purchid]", with: "PC123") - click_button("Save and continue") fill_in("sales_log[saledate(1i)]", with: "2022") fill_in("sales_log[saledate(2i)]", with: "08") fill_in("sales_log[saledate(3i)]", with: "10") click_button("Save and continue") + fill_in("sales_log[purchid]", with: "PC123") + click_button("Save and continue") log_id = page.current_path.scan(/\d/).join visit("sales-logs/#{log_id}/setup/check-answers") - expect(page).to have_content("Purchaser code") - expect(page).to have_content("PC123") expect(page).to have_content("Sale completion date") expect(page).to have_content("2022") + expect(page).to have_content("Purchaser code") + expect(page).to have_content("PC123") end end diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 7c2f20287..4e00a7631 100644 --- a/spec/models/form/sales/subsections/setup_spec.rb +++ b/spec/models/form/sales/subsections/setup_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do it "has correct pages" do expect(setup.pages.map(&:id)).to eq( - %w[organisation created_by purchaser_code completion_date], + %w[organisation created_by completion_date purchaser_code], ) end