http_stub 0.28.0.beta2 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a737542b5fd35c087d6b3bf04d3db3622cd0107a899e8a63672f0481f83be2
-  data.tar.gz: 12f81c0ee5377ea7be40a9a6b096b90958666019b31f6ec9dd646113b777d28c
+  metadata.gz: 36a7a947b8f803c0ec1851b4e646d6c579bed2765195b7277a809b6a7500c895
+  data.tar.gz: 55e0b0a5ae19f81277e5c0c8fac67d58c0f2936b1a6240e03537f0090036fad1
 SHA512:
-  metadata.gz: ef25a1053b25eb93bb27939a558669f7f8b0f6e328cf3a3226292c95884aa5c0c5fcdd5cf354bfb3d09a65c06e17512e387ddcacef47b6292bfd7ada9eb4087f
-  data.tar.gz: e9abf1e38d3efc249b62acea9de54aa852468ed5008bc6c280f77a9ada64608d3277bacc0df7b25ae8d30290caa3082c3db99bdb7bb3f19d206bb3f51e70086a
+  metadata.gz: 0202cba44793df890e435672550795d988f13614471e9220eb1796965237e080ffeccd6cb54e62a8cc1ffe75684711b9ce80abeb662503c42130f9292d1624eb
+  data.tar.gz: ca13e5950fa73d3a5ff6dce748b37a4ef93f071dec782f46cea0ba71a00fb7fc3d08aa8ef47c3926df84a94f22d59c9839d0594704f3d5c23cea8a5b5f635137

data/lib/http_stub/configurator/endpoint_template.rb

@@ -11,7 +11,7 @@ module HttpStub
       end
 
       def add_scenario!(name, response_overrides={}, &block)
-        @server.add_scenario_with_one_stub!(name, self.build_stub(response_overrides, &block))
+        @server.add_scenario_with_one_stub!(name, self.build_stub(response_overrides), &block)
       end
 
       def add_stub!(response_overrides={}, &block)

data/lib/http_stub/configurator/server.rb

@@ -34,7 +34,9 @@ module HttpStub
 
       def add_scenario_with_one_stub!(name, stub=nil, &block)
         add_scenario!(name) do |scenario|
-          scenario.add_stub!(stub) { |added_stub| added_stub.invoke(block.arity == 2 ? scenario : nil, &block) }
+          built_stub = stub || scenario.build_stub
+          built_stub.invoke(block.arity == 2 ? scenario : nil, &block) if block_given?
+          scenario.add_stub!(built_stub)
         end
       end
 

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.28.0.beta2".freeze
+  VERSION = "0.28.0".freeze
 end

data/spec/acceptance/endpoint_template_spec.rb

@@ -18,6 +18,13 @@ describe "Endpoint template acceptance" do
       expect(response.body).to eql("custom stub body")
     end
 
+    it "registers any stubs for templated scenarios initially activated" do
+      response = issue_request("scenario_initially_activated")
+
+      expect(response.code).to eql(202)
+      expect(response.body).to eql("scenario initially activated body")
+    end
+
     context "and a templated scenario is activated" do
 
       before(:example) { client.activate!(scenario_name) }

data/spec/lib/http_stub/configurator/endpoint_template_spec.rb

@@ -130,15 +130,15 @@ describe HttpStub::Configurator::EndpointTemplate do
       allow(server).to receive(:add_scenario_with_one_stub!)
     end
 
-    it "builds a stub using any provided response overrides and block" do
-      expect(endpoint_stub_template).to receive(:build_stub).with(response_overrides).and_yield
-      expect(block_verifier).to receive(:verify)
+    it "builds a stub using any provided response overrides" do
+      expect(endpoint_stub_template).to receive(:build_stub).with(response_overrides)
 
       subject
     end
 
-    it "adds a one stub scenario to the server with the provided name and built stub" do
-      expect(server).to receive(:add_scenario_with_one_stub!).with(name, built_stub)
+    it "adds a one stub scenario to the server with the provided name, built stub and block" do
+      expect(server).to receive(:add_scenario_with_one_stub!).with(name, built_stub).and_yield
+      expect(block_verifier).to receive(:verify)
 
       subject
     end

data/spec/lib/http_stub/configurator/server_spec.rb

@@ -211,14 +211,23 @@ describe HttpStub::Configurator::Server do
 
       subject { server.add_scenario_with_one_stub!(scenario_name, &block) }
 
-      before(:example) { allow(scenario).to receive(:add_stub!).and_yield(the_stub) }
+      before(:example) do
+        allow(scenario).to receive(:build_stub).and_return(the_stub)
+        allow(scenario).to receive(:add_stub!)
+      end
 
-      it "adds an empty stub to the scenario" do
-        expect(scenario).to receive(:add_stub!).with(nil)
+      it "builds a stub from the scenario" do
+        expect(scenario).to receive(:build_stub).with(no_args)
         
         subject
       end
 
+      it "adds the built stub to the scenario" do
+        expect(scenario).to receive(:add_stub!).with(the_stub)
+
+        subject
+      end
+
       context "that accepts the stub as an argument" do
 
         let(:block) { lambda { |_stub| block_verifier.verify } }
@@ -247,6 +256,46 @@ describe HttpStub::Configurator::Server do
 
     end
 
+    context "when a stub and block is provided" do
+
+      subject { server.add_scenario_with_one_stub!(scenario_name, the_stub, &block) }
+
+      before(:example) { allow(scenario).to receive(:add_stub!) }
+
+      it "adds the stub to the scenario" do
+        expect(scenario).to receive(:add_stub!).with(the_stub)
+
+        subject
+      end
+
+      context "and the block accepts the stub as an argument" do
+
+        let(:block) { lambda { |_stub| block_verifier.verify } }
+
+        it "invokes the stub with no additional argument" do
+          expect(the_stub).to receive(:invoke).with(nil).and_yield(the_stub)
+          expect(block_verifier).to receive(:verify)
+
+          subject
+        end
+
+      end
+
+      context "and the block accepts the stub and scenario as arguments" do
+
+        let(:block) { lambda { |_stub, _scenario| block_verifier.verify } }
+
+        it "invokes the stub and supplies the scenario" do
+          expect(the_stub).to receive(:invoke).with(scenario).and_yield(the_stub, scenario)
+          expect(block_verifier).to receive(:verify)
+
+          subject
+        end
+
+      end
+
+    end
+
   end
 
   describe "#build_stub" do

data/spec/support/http_stub/server/driver.rb

@@ -34,7 +34,7 @@ module HttpStub
           @port = HttpStub::Port.free_port
           @pid = Process.spawn("rake launch_server configurator=#{@configurator.name} port=#{@port}", out: DEV_NULL,
                                                                                                       err: DEV_NULL)
-          ::Wait.until!(description: "http stub server for #{@configurator.name} started", timeout_in_seconds: 3) do
+          ::Wait.until!(description: "http stub server for #{@configurator.name} started", timeout_in_seconds: 5) do
             Net::HTTP.get_response(@host, "/http_stub/status", @port)
             @uri    = "http://#{@host}:#{@port}"
             @client = HttpStub::Client.create(@uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.28.0.beta2
+  version: 0.28.0
 platform: ruby
 authors:
 - dueckes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.72'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.72'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -258,28 +258,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
@@ -594,9 +580,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.4
 signing_key: