diff --git a/spec/services/paas_configuration_service_spec.rb b/spec/services/paas_configuration_service_spec.rb index 471ef6729..f63db81ec 100644 --- a/spec/services/paas_configuration_service_spec.rb +++ b/spec/services/paas_configuration_service_spec.rb @@ -1,29 +1,27 @@ require "rails_helper" -RSpec.describe "PaasConfigurationService" do - context "when the paas configuration is unavailable" do - subject { PaasConfigurationService.new(logger) } +RSpec.describe PaasConfigurationService do + subject(:config_service) { described_class.new(logger) } - let(:logger) { double("logger") } + let(:logger) { instance_double(ActiveSupport::LogSubscriber) } + context "when the paas configuration is unavailable" do before { allow(logger).to receive(:warn) } it "returns the configuration as not present" do - expect(subject.config_present?).to be(false) + expect(config_service.config_present?).to be(false) end it "returns the S3 configuration as not present" do - expect(subject.s3_config_present?).to be(false) + expect(config_service.s3_config_present?).to be(false) end it "does not retrieve any S3 bucket configuration" do - expect(subject.s3_buckets).to be_empty + expect(config_service.s3_buckets).to be_empty end end context "when the paas configuration is present with S3 buckets" do - subject { PaasConfigurationService.new(double("logger")) } - let(:vcap_services) do <<-JSON {"aws-s3-bucket": [{"instance_name": "bucket_1"},{"instance_name": "bucket_2"}]} @@ -35,15 +33,15 @@ RSpec.describe "PaasConfigurationService" do end it "returns the configuration as present" do - expect(subject.config_present?).to be(true) + expect(config_service.config_present?).to be(true) end it "returns the S3 configuration as present" do - expect(subject.s3_config_present?).to be(true) + expect(config_service.s3_config_present?).to be(true) end it "does retrieve the S3 bucket configurations" do - s3_buckets = subject.s3_buckets + s3_buckets = config_service.s3_buckets expect(s3_buckets).not_to be_empty expect(s3_buckets.count).to be(2) @@ -53,22 +51,20 @@ RSpec.describe "PaasConfigurationService" do end context "when the paas configuration is present without S3 buckets" do - subject { PaasConfigurationService.new(double("logger")) } - before do allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return("{}") end it "returns the configuration as present" do - expect(subject.config_present?).to be(true) + expect(config_service.config_present?).to be(true) end it "returns the S3 configuration as not present" do - expect(subject.s3_config_present?).to be(false) + expect(config_service.s3_config_present?).to be(false) end it "does not retrieve any S3 bucket configuration" do - expect(subject.s3_buckets).to be_empty + expect(config_service.s3_buckets).to be_empty end end end diff --git a/spec/views/form/page_view_spec.rb b/spec/views/form/page_view_spec.rb index 76d884a2a..e75f650cf 100644 --- a/spec/views/form/page_view_spec.rb +++ b/spec/views/form/page_view_spec.rb @@ -2,10 +2,6 @@ require "rails_helper" require_relative "../../request_helper" RSpec.describe "form/page" do - before do - RequestHelper.stub_http_requests - end - let(:case_log) { FactoryBot.create(:case_log, :in_progress) } let(:form) { case_log.form } let(:subsection) { form.get_subsection("income_and_benefits") } @@ -23,6 +19,7 @@ RSpec.describe "form/page" do end before do + RequestHelper.stub_http_requests assign(:case_log, case_log) assign(:page, page) assign(:subsection, subsection) @@ -38,7 +35,7 @@ RSpec.describe "form/page" do assign_attributes(question, initial_question_attributes) end - context "given a page with a description" do + context "with a page containing a description" do let(:description) { "Test description with link." } let(:page_attributes) { { description: description } } let(:expected_html) { '

Test description with link.

' } @@ -48,14 +45,14 @@ RSpec.describe "form/page" do end end - context "given a page with a header" do + context "with a page containing a header" do it "renders the header and the subsection label" do expect(rendered).to match(page.header) expect(rendered).to match(subsection.label) end end - context "given a page with a header and hide_subsection_label true" do + context "with a page containing a header and hide_subsection_label true" do let(:page_attributes) { { hide_subsection_label: true } } it "renders the header but not the subsection label" do @@ -64,7 +61,7 @@ RSpec.describe "form/page" do end end - context "given a numeric question with prefix and suffix" do + context "when rendering a numeric question with prefix and suffix" do let(:question_attributes) { { type: "numeric", prefix: "£", suffix: "every week" } } it "renders prefix and suffix text" do @@ -75,7 +72,7 @@ RSpec.describe "form/page" do end end - context "given a question with extra guidance" do + context "with a question containing extra guidance" do let(:expected_guidance) { /What counts as income?/ } context "with radio type" do