http_stub 0.25.1 → 0.26.0

data/spec/acceptance/stub_body_request_matching_spec.rb

@@ -1,11 +1,9 @@
 describe "Scenario acceptance" do
-  include_context "configurer integration"
 
   context "when a configurer that contains a stub matching a request body" do
+    include_context "configurer integration"
 
-    let(:configurer) { HttpStub::Examples::ConfigurerWithStubRequestBody.new }
-
-    before(:example) { configurer.class.initialize! }
+    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithStubRequestBody } }
 
     context "against an exact match" do
 

data/spec/acceptance/stub_control_values_spec.rb

@@ -1,16 +1,17 @@
 describe "Stub control value acceptance" do
   include_context "configurer integration"
 
-  let(:configurer)  { HttpStub::Examples::ConfigurerWithTrivialStub.new }
-
-  before(:example) { configurer.class.initialize! }
+  let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithTrivialStub } }
 
   context "when a stub is submitted" do
 
     context "with a stub uri that is regular expression containing meta characters" do
 
       before(:example) do
-        configurer.stub_response!(/\/stub\/regexp\/\$key=value/, method: :get, response: { body: "Stub body" })
+        stub_server.add_stub! do |stub|
+          stub.match_requests(uri: /\/stub\/regexp\/\$key=value/, method: :get)
+          stub.respond_with(body: "Stub body")
+        end
       end
 
       context "and a request is made whose uri matches the regular expression" do
@@ -38,10 +39,10 @@ describe "Stub control value acceptance" do
     context "with headers whose values are regular expressions" do
 
       before(:example) do
-        configurer.stub_response!(
-          "/stub_with_headers", method: :get, headers: { key: /^match.*/ },
-          response: { status: 202, body: "Another stub body" }
-        )
+        stub_server.add_stub! do |stub|
+          stub.match_requests(uri: "/stub_with_headers", method: :get, headers: { key: /^match.*/ })
+          stub.respond_with(status: 202, body: "Another stub body")
+        end
       end
 
       context "and a request that matches is made" do
@@ -76,10 +77,10 @@ describe "Stub control value acceptance" do
       context "whose values are regular expressions" do
 
         before(:example) do
-          configurer.stub_response!(
-            "/stub_with_parameters", method: :get, parameters: { key: /^match.*/ },
-            response: { status: 202, body: "Another stub body" }
-          )
+          stub_server.add_stub! do |stub|
+            stub.match_requests(uri: "/stub_with_parameters", method: :get, parameters: { key: /^match.*/ })
+            stub.respond_with(status: 202, body: "Another stub body")
+          end
         end
 
         context "and a request that matches is made" do
@@ -110,10 +111,10 @@ describe "Stub control value acceptance" do
       context "whose values indicate the parameters must be omitted" do
 
         before(:example) do
-          configurer.stub_response!(
-            "/stub_with_omitted_parameters", method: :get, parameters: { key: :omitted },
-            response: { status: 202, body: "Omitted parameter stub body" }
-          )
+          stub_server.add_stub! do |stub|
+            stub.match_requests(uri: "/stub_with_omitted_parameters", method: :get, parameters: { key: :omitted })
+            stub.respond_with(status: 202, body: "Omitted parameter stub body")
+          end
         end
 
         context "and a request that matches is made" do
@@ -145,7 +146,7 @@ describe "Stub control value acceptance" do
     context "with a response delay" do
 
       before(:example) do
-        configurer.stub_response!("/some_stub_path", method: :get, response: { delay_in_seconds: 2 })
+        stub_server.add_stub! { match_requests(uri: "/some_stub_path", method: :get).respond_with(delay_in_seconds: 1) }
       end
 
       it "delays the response by the time provided" do
@@ -153,7 +154,7 @@ describe "Stub control value acceptance" do
 
         response = HTTParty.get("#{server_uri}/some_stub_path")
 
-        expect(Time.now - start_time).to be >= 2.0
+        expect(Time.now - start_time).to be >= 1.0
       end
 
     end

data/spec/acceptance/stub_match_last_spec.rb

@@ -1,10 +1,6 @@
 describe "Stub matches last acceptance" do
   include_context "configurer integration"
 
-  before(:example) { configurer.initialize! }
-
-  after(:example) { configurer.clear_stubs! }
-
   describe "GET /http_stub/stubs/matches/last" do
 
     let(:request_uri)        { stub_registrator.request_uri }

data/spec/acceptance/stub_match_list_spec.rb

@@ -1,10 +1,6 @@
 describe "Stub match list acceptance" do
   include_context "configurer integration"
 
-  before(:example) { configurer.initialize! }
-
-  after(:example) { configurer.clear_stubs! }
-
   describe "GET /http_stub/stubs/matches" do
 
     let(:response)          { HTTParty.get("#{server_uri}/http_stub/stubs/matches") }

data/spec/acceptance/stub_miss_list_spec.rb

@@ -1,10 +1,6 @@
 describe "Stub miss list acceptance" do
   include_context "configurer integration"
 
-  before(:example) { configurer.initialize! }
-
-  after(:example) { configurer.clear_stubs! }
-
   describe "GET /http_stub/stubs/misses" do
 
     let(:response)          { HTTParty.get("#{server_uri}/http_stub/stubs/misses") }

data/spec/acceptance/stub_spec.rb

@@ -1,10 +1,6 @@
 describe "Stub basics acceptance" do
   include_context "configurer integration"
 
-  let(:configurer) { HttpStub::Examples::ConfigurerWithTrivialStub.new }
-
-  before(:example) { configurer.class.initialize! }
-
   context "when a stub is submitted" do
 
     context "that contains no request headers or parameters" do
@@ -12,8 +8,9 @@ describe "Stub basics acceptance" do
       context "and it contains a response status" do
 
         before(:example) do
-          stub_server.add_stub! do
-            match_requests(uri: "/stub_with_status", method: :get).respond_with(status: 201, body: "Stub body")
+          stub_server.add_stub! do |stub|
+            stub.match_requests(uri: "/stub_with_status", method: :get)
+            stub.respond_with(status: 201, body: "Stub body")
           end
         end
 
@@ -33,7 +30,7 @@ describe "Stub basics acceptance" do
 
         context "and stubs are cleared" do
 
-          before(:example) { configurer.clear_stubs! }
+          before(:example) { stub_server.clear_stubs! }
 
           context "and a matching request is made" do
 
@@ -52,7 +49,10 @@ describe "Stub basics acceptance" do
       context "and it does not contain a response status" do
 
         before(:example) do
-          stub_server.add_stub! { match_requests(uri: "/stub_without_status", method: :get).respond_with(body: "Stub body") }
+          stub_server.add_stub! do |stub|
+            stub.match_requests(uri: "/stub_without_status", method: :get)
+            stub.respond_with(body: "Stub body")
+          end
         end
 
         context "and a matching request is made" do
@@ -233,7 +233,7 @@ describe "Stub basics acceptance" do
 
     context "that contains a response body that is a file" do
 
-      let(:configurer) { HttpStub::Examples::ConfigurerWithFileResponses.new }
+      let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithFileResponses } }
 
       context "and a request that matches is made" do
 
@@ -250,7 +250,7 @@ describe "Stub basics acceptance" do
           end
 
           it "responds with the configured file" do
-            expect_response_to_contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
+            expect(response).to contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
           end
 
           context "and a subsequent request is made that requests the file if it has been modified" do
@@ -289,7 +289,7 @@ describe "Stub basics acceptance" do
           end
 
           it "responds with the configured response" do
-            expect_response_to_contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
+            expect(response).to contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
           end
 
         end

data/spec/acceptance/stub_trigger_spec.rb

@@ -1,13 +1,60 @@
 describe "Stub trigger acceptance" do
   include_context "configurer integration"
 
-  let(:configurer) { HttpStub::Examples::ConfigurerWithStubTriggers.new }
-
-  before(:example) { configurer.class.initialize! }
+  let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithStubTriggers } }
 
   context "when a stub is submitted that contains triggers" do
 
-    context "with simple response bodies" do
+    context "that trigger scenarios" do
+
+      let(:triggered_scenario_names) do
+        (1..3).map do |scenario_number|
+          "Triggered Scenario #{scenario_number}".tap do |scenario_name|
+            stub_server.add_scenario_with_one_stub!(scenario_name) do |stub|
+              stub.match_requests(uri: "/triggered_scenario_#{scenario_number}", method: :get)
+              stub.respond_with(status: 200 + scenario_number, body: "Triggered scenario body #{scenario_number}")
+            end
+          end
+        end
+      end
+
+      before(:example) do
+        stub_server.add_stub! do |stub|
+          stub.match_requests(uri: "/triggers_scenarios", method: :get)
+          stub.respond_with(body: "Stub triggering scenarios body")
+          stub.trigger(scenarios: triggered_scenario_names)
+        end
+      end
+
+      context "and a request is made matching the stub" do
+
+        before(:example) { @stub_with_triggers_response = HTTParty.get("#{server_uri}/triggers_scenarios") }
+
+        it "replays the stubbed response" do
+          expect(@stub_with_triggers_response.code).to eql(200)
+          expect(@stub_with_triggers_response.body).to eql("Stub triggering scenarios body")
+        end
+
+        (1..3).each do |scenario_number|
+
+          context "and then a request matching triggered scenario ##{scenario_number} is made" do
+
+            let(:response) { HTTParty.get("#{server_uri}/triggered_scenario_#{scenario_number}") }
+
+            it "replays the triggered response" do
+              expect(response.code).to eql("20#{scenario_number}".to_i)
+              expect(response.body).to eql("Triggered scenario body #{scenario_number}")
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+    context "that trigger stubs" do
 
       let(:triggered_stubs) do
         (1..3).map do |trigger_number|
@@ -20,24 +67,24 @@ describe "Stub trigger acceptance" do
 
       before(:example) do
         stub_server.add_stub! do |stub|
-          stub.match_requests(uri: "/stub_with_triggers", method: :get)
-          stub.respond_with(body: "Trigger stub body")
-          stub.trigger(triggered_stubs)
+          stub.match_requests(uri: "/triggers_stubs", method: :get)
+          stub.respond_with(body: "Stub triggering stubs body")
+          stub.trigger(stubs: triggered_stubs)
         end
       end
 
       context "and a request is made matching the stub" do
 
-        before(:example) { @stub_with_triggers_response = HTTParty.get("#{server_uri}/stub_with_triggers") }
+        before(:example) { @stub_with_triggers_response = HTTParty.get("#{server_uri}/triggers_stubs") }
 
         it "replays the stubbed response" do
           expect(@stub_with_triggers_response.code).to eql(200)
-          expect(@stub_with_triggers_response.body).to eql("Trigger stub body")
+          expect(@stub_with_triggers_response.body).to eql("Stub triggering stubs body")
         end
 
         (1..3).each do |trigger_number|
 
-          context "and then a request matching triggered stub ##{trigger_number} is made" do
+          context "and then a request matching a triggered stub ##{trigger_number} is made" do
 
             let(:response) { HTTParty.get("#{server_uri}/triggered_stub_#{trigger_number}") }
 
@@ -54,7 +101,7 @@ describe "Stub trigger acceptance" do
 
     end
 
-    context "with a mix of text and file responses" do
+    context "that contain a mix of text and file responses" do
 
       let(:pdf_file_path) { "#{HttpStub::Spec::RESOURCES_DIR}/sample.pdf" }
       let(:pdf_file_trigger) do
@@ -92,7 +139,7 @@ describe "Stub trigger acceptance" do
         stub_server.add_stub! do |stub|
           stub.match_requests(uri: "/stub_with_triggers", method: :get)
           stub.respond_with(body: "Trigger stub body")
-          stub.trigger(triggered_stubs)
+          stub.trigger(stubs: triggered_stubs)
         end
       end
 
@@ -106,7 +153,7 @@ describe "Stub trigger acceptance" do
 
           it "replays the triggered response" do
             expect(response.code).to eql(200)
-            expect_response_to_contain_file(pdf_file_path)
+            expect(response).to contain_file(pdf_file_path)
           end
 
         end

data/spec/lib/http_stub/configurer/dsl/scenario_builder_spec.rb

@@ -2,40 +2,50 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
 
   let(:stub_fixture) { HttpStub::StubFixture.new }
 
-  let(:response_defaults) { { some_default_key: "some default value" } }
-  let(:scenario_name)     { "some/scenario/name" }
+  let(:scenario_name)        { "some scenario name" }
+  let(:default_stub_template) { instance_double(HttpStub::Configurer::DSL::StubBuilderTemplate) }
 
-  let(:scenario_builder) { HttpStub::Configurer::DSL::ScenarioBuilder.new(response_defaults, scenario_name) }
+  let(:scenario_builder) { HttpStub::Configurer::DSL::ScenarioBuilder.new(scenario_name, default_stub_template) }
 
-  it "activates scenarios" do
-    expect(scenario_builder).to be_a(HttpStub::Configurer::DSL::ScenarioActivator)
-  end
+  describe "#build_stub" do
+
+    let(:response_overrides) { { status: 201 } }
+    let(:block_verifier)     { double("BlockVerifier") }
+    let(:block)              { lambda { block_verifier.verify } }
+
+    subject { scenario_builder.build_stub(response_overrides, &block) }
+
+    it "delegates to the provided default stub template" do
+      expect(default_stub_template).to receive(:build_stub).with(response_overrides).and_yield
+      expect(block_verifier).to receive(:verify)
+
+      subject
+    end
+
+    it "returns the built stub" do
+      built_stub = instance_double(HttpStub::Configurer::DSL::StubBuilder)
+      allow(default_stub_template).to receive(:build_stub).and_return(built_stub)
+
+      expect(subject).to eql(built_stub)
+    end
 
-  it "produces stub builders" do
-    expect(scenario_builder).to be_a(HttpStub::Configurer::DSL::StubBuilderProducer)
   end
 
   describe "#add_stub!" do
 
-    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder, invoke: nil) }
+    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
 
     context "when a block is provided" do
 
       let(:block_verifier) { double("BlockVerifier") }
-      let(:block) { lambda { block_verifier.verify } }
+      let(:block)          { lambda { block_verifier.verify } }
 
       subject { scenario_builder.add_stub!(&block) }
 
-      before(:example) { allow(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).and_return(stub_builder) }
-
-      it "creates a stub builder with the response defaults provided to the scenario builder" do
-        expect(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).and_return(stub_builder)
-
-        subject
-      end
+      before(:example) { allow(scenario_builder).to receive(:build_stub).and_return(stub_builder) }
 
-      it "requests the stub builder invoke the provided block" do
-        expect(stub_builder).to receive(:invoke).and_yield
+      it "builds a stub whose values are initialized via the provided block" do
+        expect(scenario_builder).to receive(:build_stub).with(no_args).and_yield
         expect(block_verifier).to receive(:verify)
 
         subject
@@ -65,6 +75,20 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
 
   end
 
+  describe "#add_stubs!" do
+
+    let(:stub_builders) { (1..3).map { instance_double(HttpStub::Configurer::DSL::StubBuilder) } }
+
+    subject { scenario_builder.add_stubs!(stub_builders) }
+
+    it "adds each stub to the scenario builders" do
+      stub_builders.each { |stub_builder| expect(scenario_builder).to receive(:add_stub!).with(stub_builder) }
+
+      subject
+    end
+
+  end
+
   describe "#build" do
 
     let(:scenario) { instance_double(HttpStub::Configurer::Request::Scenario) }
@@ -79,17 +103,14 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
       subject
     end
 
-    context "when multiple stubs have been added" do
+    context "when the scenario registers multiple stubs" do
 
-      let(:stubs) { (1..3).map { instance_double(HttpStub::Configurer::Request::Stub) } }
+      let(:stubs)         { (1..3).map { instance_double(HttpStub::Configurer::Request::Stub) } }
       let(:stub_builders) do
-        stubs.map { |stub| instance_double(HttpStub::Configurer::DSL::StubBuilder, invoke: nil, build: stub) }
+        stubs.map { |stub| instance_double(HttpStub::Configurer::DSL::StubBuilder, build: stub) }
       end
 
-      before(:example) do
-        allow(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).and_return(*stub_builders)
-        stub_builders.each { scenario_builder.add_stub! { |_builder| "some block" } }
-      end
+      before(:example) { scenario_builder.add_stubs!(stub_builders) }
 
       it "builds the stubs" do
         stub_builders.each { |stub_builder| expect(stub_builder).to receive(:build) }
@@ -105,7 +126,7 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
 
     end
 
-    context "when no stubs have been added" do
+    context "when the scenario registers no stubs" do
 
       it "creates a scenario that has empty stubs" do
         expect(HttpStub::Configurer::Request::Scenario).to receive(:new).with(hash_including(stubs: []))
@@ -115,9 +136,9 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
 
     end
 
-    context "when triggered scenarios have been added" do
+    context "when the scenario activates an array scenarios" do
 
-      let(:triggered_scenario_names) { (1..3).map { |i| "activator_#{i}" } }
+      let(:triggered_scenario_names) { (1..3).map { |i| "scenario #{i}" } }
 
       before(:example) { scenario_builder.activate!(triggered_scenario_names) }
 
@@ -131,7 +152,39 @@ describe HttpStub::Configurer::DSL::ScenarioBuilder do
 
     end
 
-    context "when no scenario activators have been added" do
+    context "when the scenario activates a list of scenarios" do
+
+      let(:triggered_scenario_names) { (1..3).map { |i| "activator_#{i}" } }
+
+      before(:example) { scenario_builder.activate!(*triggered_scenario_names) }
+
+      it "creates a scenario that includes the triggered scenario names" do
+        expect(HttpStub::Configurer::Request::Scenario).to(
+          receive(:new).with(hash_including(triggered_scenario_names: triggered_scenario_names))
+        )
+
+        subject
+      end
+
+    end
+
+    context "when the scenario activates one scenario" do
+
+      let(:triggered_scenario_name) { "a scenario" }
+
+      before(:example) { scenario_builder.activate!(triggered_scenario_name) }
+
+      it "creates a scenario that includes the triggered scenario names" do
+        expect(HttpStub::Configurer::Request::Scenario).to(
+          receive(:new).with(hash_including(triggered_scenario_names: [ triggered_scenario_name ]))
+        )
+
+        subject
+      end
+
+    end
+
+    context "when the scenario does not activate any scenarios" do
 
       it "creates a scenario that has empty triggered scenario names" do
         expect(HttpStub::Configurer::Request::Scenario).to(