From 106a6cc97bf4ff49bb64e7c71c8907985e7050ce Mon Sep 17 00:00:00 2001 From: JG Date: Wed, 13 Jul 2022 13:15:10 +0100 Subject: [PATCH] fixed after rebasing --- app/views/locations/new.html.erb | 2 +- config/locales/en.yml | 1 - spec/factories/location.rb | 1 + spec/features/schemes_spec.rb | 7 ------- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/views/locations/new.html.erb b/app/views/locations/new.html.erb index 031636ed0..88624d00d 100644 --- a/app/views/locations/new.html.erb +++ b/app/views/locations/new.html.erb @@ -20,7 +20,7 @@ width: 5 %> <%= f.govuk_text_field :name, - label: { text: "Location name (optional)", size: "m" }, + label: { text: "Name (optional)", size: "m" }, hint: { text: "This is how you refer to this location within your organisation" } %> <%= f.govuk_number_field :units, diff --git a/config/locales/en.yml b/config/locales/en.yml index 5046a05aa..1cba663a1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -77,7 +77,6 @@ en: type_of_unit: blank: "Select the most common type of unit at this location" - validations: organisation: name_missing: "Enter the organisation’s name" diff --git a/spec/factories/location.rb b/spec/factories/location.rb index 532a29da6..a42ebb693 100644 --- a/spec/factories/location.rb +++ b/spec/factories/location.rb @@ -4,6 +4,7 @@ FactoryBot.define do postcode { Faker::Address.postcode.delete(" ") } name { Faker::Address.street_name } type_of_unit { [1, 2, 3, 4, 6, 7].sample } + units { [1, 2, 3, 4, 6, 7].sample } type_of_building { "Purpose built" } mobility_type { %w[A M N W X].sample } wheelchair_adaptation { 0 } diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index 8bc5db9cf..009b0bd79 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -667,12 +667,6 @@ RSpec.describe "Schemes scheme Features" do context "when I select the support answers" do before do - fill_in "Postcode", with: "SW1P 4DF" - fill_in "Location name (optional)", with: "Some name" - fill_in "Total number of units at this location", with: 1 - choose "Self-contained house" - choose "location-wheelchair-adaptation-no-field" - choose "location-add-another-location-no-field" choose "Floating support" choose "Very short stay" click_button "Save and continue" @@ -702,7 +696,6 @@ RSpec.describe "Schemes scheme Features" do context "when I add location to the scheme" do before do - click_link "Add a location" fill_in "Postcode", with: "SW1P 4DF" fill_in "Name (optional)", with: "Some name" fill_in "Total number of units at this location", with: 1