From 51dd7fe39312441fa64b2e47fe2f17f9a40be3da Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 14 Dec 2021 12:09:40 +0000 Subject: [PATCH] Fix tests --- .env.example | 2 -- app/models/case_log.rb | 3 --- db/schema.rb | 2 +- spec/features/form/page_routing_spec.rb | 12 ++++++------ spec/models/case_log_spec.rb | 2 +- spec/models/form_handler_spec.rb | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index 6d4c5c053..d30382d9e 100644 --- a/.env.example +++ b/.env.example @@ -2,5 +2,3 @@ DB_USERNAME=postgres-user DB_PASSWORD=postgres-password CORE_EMAIL_USERNAME=email@example.com CORE_EMAIL_PASSWORD=password123 -OS_PLACES_API_KEY=xx - diff --git a/app/models/case_log.rb b/app/models/case_log.rb index d90cb1b8a..50444d311 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -1,6 +1,3 @@ -require "uri" -require "net/http" -require "json" require "postcodes_io" class CaseLogValidator < ActiveModel::Validator diff --git a/db/schema.rb b/db/schema.rb index dde9a5ff4..70cdb5569 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_12_09_092131) do +ActiveRecord::Schema.define(version: 2021_12_13_122642) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/spec/features/form/page_routing_spec.rb b/spec/features/form/page_routing_spec.rb index 063583d10..5c33f4b8c 100644 --- a/spec/features/form/page_routing_spec.rb +++ b/spec/features/form/page_routing_spec.rb @@ -50,26 +50,26 @@ RSpec.describe "Form Page Routing" do context "inferred answers routing", js: true do it "shows question if the answer could not be inferred" do - visit("/case-logs/#{id}/property-postcode") + visit("/logs/#{id}/property-postcode") fill_in("case-log-property-postcode-field", with: "P0 5ST") click_button("Save and continue") - expect(page).to have_current_path("/case-logs/#{id}/do-you-know-the-local-authority") + expect(page).to have_current_path("/logs/#{id}/do-you-know-the-local-authority") end it "shows question if the answer could not be inferred" do - visit("/case-logs/#{id}/property-postcode") + visit("/logs/#{id}/property-postcode") click_button("Save and continue") - expect(page).to have_current_path("/case-logs/#{id}/do-you-know-the-local-authority") + expect(page).to have_current_path("/logs/#{id}/do-you-know-the-local-authority") end it "does not show question if the answer could be inferred" do stub_request(:get, /api.postcodes.io/) .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\"}}", headers: {}) - visit("/case-logs/#{id}/property-postcode") + visit("/logs/#{id}/property-postcode") fill_in("case-log-property-postcode-field", with: "P0 5ST") click_button("Save and continue") - expect(page).to have_current_path("/case-logs/#{id}/property-wheelchair-accessible") + expect(page).to have_current_path("/logs/#{id}/property-wheelchair-accessible") end end end diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index e2eb40864..c8ad9195e 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -1020,7 +1020,7 @@ RSpec.describe Form, type: :model do expect(record_from_db["month"]).to eq(10) expect(record_from_db["year"]).to eq(2021) end - + context "addresses" do before do stub_request(:get, /api.postcodes.io/) diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 5ffb54514..4e5883ec2 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -15,7 +15,7 @@ RSpec.describe FormHandler do form_handler = FormHandler.instance form = form_handler.get_form("test_form") expect(form).to be_a(Form) - expect(form.pages.count).to eq(26) + expect(form.pages.count).to eq(27) end end