From 50bd13a608dd49209866ed321d4b73fe187f543d Mon Sep 17 00:00:00 2001 From: JG Date: Wed, 29 Jun 2022 11:01:32 +0100 Subject: [PATCH] final touches --- spec/features/schemes_spec.rb | 2 +- spec/requests/schemes_controller_spec.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index 8f4c755ed..f9f76095b 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -130,7 +130,7 @@ RSpec.describe "Schemes scheme Features" do click_link("Clear search") expect(page).to have_content(scheme_to_search.id_to_display) schemes.each do |scheme| - expect(page).to have_content(scheme.id) + expect(page).to have_content(scheme.id_to_display) end end end diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb index 922e7e01f..3f93bcba7 100644 --- a/spec/requests/schemes_controller_spec.rb +++ b/spec/requests/schemes_controller_spec.rb @@ -56,7 +56,7 @@ RSpec.describe SchemesController, type: :request do it "shows all schemes" do schemes.each do |scheme| - expect(page).to have_content(scheme.id) + expect(page).to have_content(scheme.id_to_display) end end @@ -137,7 +137,7 @@ RSpec.describe SchemesController, type: :request do context "when searching" do let!(:searched_scheme) { FactoryBot.create(:scheme) } - let(:search_param) { searched_scheme.id } + let(:search_param) { searched_scheme.id_to_display } before do FactoryBot.create(:location, scheme: searched_scheme) @@ -145,9 +145,9 @@ RSpec.describe SchemesController, type: :request do end it "returns matching results" do - expect(page).to have_content(searched_scheme.id) + expect(page).to have_content(searched_scheme.id_to_display) schemes.each do |scheme| - expect(page).not_to have_content(scheme.id) + expect(page).not_to have_content(scheme.id_to_display) end end @@ -196,11 +196,11 @@ RSpec.describe SchemesController, type: :request do it "has page heading" do get "/schemes/#{specific_scheme.id}" - expect(page).to have_content(specific_scheme.id) + expect(page).to have_content(specific_scheme.id_to_display) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.organisation.name) expect(page).to have_content(specific_scheme.sensitive) - expect(page).to have_content(specific_scheme.id) + expect(page).to have_content(specific_scheme.id_to_display) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.sensitive) expect(page).to have_content(specific_scheme.scheme_type) @@ -230,11 +230,11 @@ RSpec.describe SchemesController, type: :request do end it "has page heading" do - expect(page).to have_content(specific_scheme.id) + expect(page).to have_content(specific_scheme.id_to_display) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.organisation.name) expect(page).to have_content(specific_scheme.sensitive) - expect(page).to have_content(specific_scheme.id) + expect(page).to have_content(specific_scheme.id_to_display) expect(page).to have_content(specific_scheme.service_name) expect(page).to have_content(specific_scheme.sensitive) expect(page).to have_content(specific_scheme.scheme_type)