From f854c771764cbc72098d8116daee18a11be968c6 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 8 Dec 2021 10:35:00 +0000 Subject: [PATCH] Fix other tests and lint --- spec/controllers/admin/case_logs_controller_spec.rb | 4 ++++ spec/controllers/admin/dashboard_controller_spec.rb | 4 ++++ spec/features/form/check_answers_page_spec.rb | 2 ++ spec/features/form/conditional_questions_spec.rb | 2 ++ spec/features/form/form_navigation_spec.rb | 2 ++ spec/features/form/page_routing_spec.rb | 2 ++ spec/features/form/saving_data_spec.rb | 2 ++ spec/features/form/validations_spec.rb | 10 ++++++---- spec/helpers/tasklist_helper_spec.rb | 4 ++++ spec/models/organisation_spec.rb | 4 ++++ spec/models/user_spec.rb | 4 ++++ spec/requests/case_log_controller_spec.rb | 3 +++ spec/requests/soft_validations_controller_spec.rb | 5 +++++ spec/views/case_log_index_view_spec.rb | 6 ++++++ 14 files changed, 50 insertions(+), 4 deletions(-) diff --git a/spec/controllers/admin/case_logs_controller_spec.rb b/spec/controllers/admin/case_logs_controller_spec.rb index 8c4d9a1e6..13684951c 100644 --- a/spec/controllers/admin/case_logs_controller_spec.rb +++ b/spec/controllers/admin/case_logs_controller_spec.rb @@ -1,7 +1,11 @@ require "rails_helper" require_relative "../../support/devise" +require_relative "../../request_helper" describe Admin::CaseLogsController, type: :controller do + before do + RequestHelper.stub_http_requests + end render_views let(:page) { Capybara::Node::Simple.new(response.body) } let(:resource_title) { "Logs" } diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb index 6b9f6f808..8bf8652d2 100644 --- a/spec/controllers/admin/dashboard_controller_spec.rb +++ b/spec/controllers/admin/dashboard_controller_spec.rb @@ -1,7 +1,11 @@ require "rails_helper" require_relative "../../support/devise" +require_relative "../../request_helper" describe Admin::DashboardController, type: :controller do + before do + RequestHelper.stub_http_requests + end render_views let(:page) { Capybara::Node::Simple.new(response.body) } let(:resource_title) { "Dashboard" } diff --git a/spec/features/form/check_answers_page_spec.rb b/spec/features/form/check_answers_page_spec.rb index a3abeae4f..57e09c295 100644 --- a/spec/features/form/check_answers_page_spec.rb +++ b/spec/features/form/check_answers_page_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "Form Check Answers Page" do include Helpers @@ -22,6 +23,7 @@ RSpec.describe "Form Check Answers Page" do let(:id) { case_log.id } before do + RequestHelper.stub_http_requests sign_in user end diff --git a/spec/features/form/conditional_questions_spec.rb b/spec/features/form/conditional_questions_spec.rb index fe6d866ce..357b0414d 100644 --- a/spec/features/form/conditional_questions_spec.rb +++ b/spec/features/form/conditional_questions_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "Form Conditional Questions" do include Helpers @@ -15,6 +16,7 @@ RSpec.describe "Form Conditional Questions" do let(:id) { case_log.id } before do + RequestHelper.stub_http_requests sign_in user end diff --git a/spec/features/form/form_navigation_spec.rb b/spec/features/form/form_navigation_spec.rb index 353497eb8..445ff98e5 100644 --- a/spec/features/form/form_navigation_spec.rb +++ b/spec/features/form/form_navigation_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "Form Navigation" do include Helpers @@ -23,6 +24,7 @@ RSpec.describe "Form Navigation" do end before do + RequestHelper.stub_http_requests sign_in user end diff --git a/spec/features/form/page_routing_spec.rb b/spec/features/form/page_routing_spec.rb index c7b37ac04..f92ffc2c9 100644 --- a/spec/features/form/page_routing_spec.rb +++ b/spec/features/form/page_routing_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "Form Page Routing" do include Helpers @@ -15,6 +16,7 @@ RSpec.describe "Form Page Routing" do let(:id) { case_log.id } before do + RequestHelper.stub_http_requests allow_any_instance_of(CaseLogValidator).to receive(:validate_pregnancy).and_return(true) sign_in user end diff --git a/spec/features/form/saving_data_spec.rb b/spec/features/form/saving_data_spec.rb index f419a3438..c4e634909 100644 --- a/spec/features/form/saving_data_spec.rb +++ b/spec/features/form/saving_data_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "Form Saving Data" do include Helpers @@ -31,6 +32,7 @@ RSpec.describe "Form Saving Data" do end before do + RequestHelper.stub_http_requests sign_in user end diff --git a/spec/features/form/validations_spec.rb b/spec/features/form/validations_spec.rb index 83999139c..4aa72e261 100644 --- a/spec/features/form/validations_spec.rb +++ b/spec/features/form/validations_spec.rb @@ -1,7 +1,13 @@ require "rails_helper" require_relative "helpers" +require_relative "../../request_helper" RSpec.describe "validations" do + before do + RequestHelper.stub_http_requests + sign_in user + end + include Helpers let(:user) { FactoryBot.create(:user) } let(:case_log) do @@ -21,10 +27,6 @@ RSpec.describe "validations" do end let(:id) { case_log.id } - before do - sign_in user - end - describe "Question validation" do context "given an invalid tenant age" do it " of less than 0 it shows validation" do diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb index e609c142b..c17c89de3 100644 --- a/spec/helpers/tasklist_helper_spec.rb +++ b/spec/helpers/tasklist_helper_spec.rb @@ -1,6 +1,10 @@ require "rails_helper" +require_relative "../request_helper" RSpec.describe TasklistHelper do + before do + RequestHelper.stub_http_requests + end let(:empty_case_log) { FactoryBot.create(:case_log) } let(:case_log) { FactoryBot.create(:case_log, :in_progress) } form_handler = FormHandler.instance diff --git a/spec/models/organisation_spec.rb b/spec/models/organisation_spec.rb index 1194483d9..99a7cab96 100644 --- a/spec/models/organisation_spec.rb +++ b/spec/models/organisation_spec.rb @@ -1,6 +1,10 @@ require "rails_helper" +require_relative "../request_helper" RSpec.describe Organisation, type: :model do + before do + RequestHelper.stub_http_requests + end describe "#new" do let(:user) { FactoryBot.create(:user) } let(:organisation) { user.organisation } diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 3195b73a0..1c65f597e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,6 +1,10 @@ require "rails_helper" +require_relative "../request_helper" RSpec.describe User, type: :model do + before do + RequestHelper.stub_http_requests + end describe "#new" do let(:user) { FactoryBot.create(:user) } let(:other_organisation) { FactoryBot.create(:organisation) } diff --git a/spec/requests/case_log_controller_spec.rb b/spec/requests/case_log_controller_spec.rb index 0dac4f9b3..c46394742 100644 --- a/spec/requests/case_log_controller_spec.rb +++ b/spec/requests/case_log_controller_spec.rb @@ -1,4 +1,5 @@ require "rails_helper" +require_relative "../request_helper" RSpec.describe CaseLogsController, type: :request do let(:owning_organisation) { FactoryBot.create(:organisation) } @@ -19,6 +20,7 @@ RSpec.describe CaseLogsController, type: :request do end before do + RequestHelper.stub_http_requests allow(ENV).to receive(:[]) allow(ENV).to receive(:[]).with("API_USER").and_return(api_username) allow(ENV).to receive(:[]).with("API_KEY").and_return(api_password) @@ -136,6 +138,7 @@ RSpec.describe CaseLogsController, type: :request do let(:headers) { { "Accept" => "text/html" } } before do + RequestHelper.stub_http_requests sign_in user get "/logs", headers: headers, params: {} end diff --git a/spec/requests/soft_validations_controller_spec.rb b/spec/requests/soft_validations_controller_spec.rb index 56bccea9d..03dd71c06 100644 --- a/spec/requests/soft_validations_controller_spec.rb +++ b/spec/requests/soft_validations_controller_spec.rb @@ -1,10 +1,15 @@ require "rails_helper" +require_relative "../request_helper" RSpec.describe SoftValidationsController, type: :request do let(:params) { { case_log_id: case_log.id } } let(:url) { "/logs/#{case_log.id}/net-income/soft-validations" } let(:user) { FactoryBot.create(:user) } + before do + RequestHelper.stub_http_requests + end + context "a not signed in user" do let(:case_log) { FactoryBot.create(:case_log, :in_progress) } diff --git a/spec/views/case_log_index_view_spec.rb b/spec/views/case_log_index_view_spec.rb index 17da18411..63f7dd29b 100644 --- a/spec/views/case_log_index_view_spec.rb +++ b/spec/views/case_log_index_view_spec.rb @@ -1,5 +1,11 @@ require "rails_helper" +require_relative "../request_helper" + RSpec.describe "case_logs/index" do + before do + RequestHelper.stub_http_requests + end + let(:in_progress_log) { FactoryBot.create(:case_log, :in_progress) } let(:completed_log) { FactoryBot.create(:case_log, :completed) }