http_stub 0.13.5 → 0.14.0.rc1

data/spec/lib/http_stub/configurer_spec.rb

@@ -9,12 +9,12 @@ describe HttpStub::Configurer do
 
   describe ".get_base_uri" do
 
-    it "should return a uri that combines the provided host and port" do
-      TestableConfigurer.get_base_uri.should include("some_host:8888")
+    it "returns a uri that combines the provided host and port" do
+      expect(TestableConfigurer.get_base_uri).to include("some_host:8888")
     end
 
-    it "should return a uri accessed via http" do
-      TestableConfigurer.get_base_uri.should match(/^http:\/\//)
+    it "returns a uri accessed via http" do
+      expect(TestableConfigurer.get_base_uri).to match(/^http:\/\//)
     end
 
   end

data/spec/lib/http_stub/controllers/stub_activator_controller_spec.rb

@@ -9,34 +9,34 @@ describe HttpStub::Controllers::StubActivatorController do
   let(:stub_registry) { double("HttpStub::Models::StubRegistry").as_null_object }
   let(:controller) { HttpStub::Controllers::StubActivatorController.new(stub_activator_registry, stub_registry) }
 
-  before(:each) { JSON.stub(:parse).and_return(stub_activator_options) }
+  before(:example) { allow(JSON).to receive(:parse).and_return(stub_activator_options) }
 
   describe "#register" do
 
-    before(:each) do
-      HttpStub::Models::StubActivator.stub(:new).and_return(stub_activator)
+    before(:example) do
+      allow(HttpStub::Models::StubActivator).to receive(:new).and_return(stub_activator)
     end
 
-    it "should parse an options hash from the JSON request body" do
-      JSON.should_receive(:parse).with(request_body).and_return(stub_activator_options)
+    it "parses an options hash from the JSON request body" do
+      expect(JSON).to receive(:parse).with(request_body).and_return(stub_activator_options)
 
       controller.register(request)
     end
 
-    it "should create a stub activator from the parsed options" do
-      HttpStub::Models::StubActivator.should_receive(:new).with(stub_activator_options).and_return(stub_activator)
+    it "creates a stub activator from the parsed options" do
+      expect(HttpStub::Models::StubActivator).to receive(:new).with(stub_activator_options).and_return(stub_activator)
 
       controller.register(request)
     end
 
-    it "should add the created activator to the activator registry" do
-      stub_activator_registry.should_receive(:add).with(stub_activator, request)
+    it "adds the created activator to the activator registry" do
+      expect(stub_activator_registry).to receive(:add).with(stub_activator, request)
 
       controller.register(request)
     end
 
-    it "should return a success response" do
-      controller.register(request).should eql(HttpStub::Models::Response::SUCCESS)
+    it "returns a success response" do
+      expect(controller.register(request)).to eql(HttpStub::Models::Response::SUCCESS)
     end
 
   end
@@ -45,36 +45,36 @@ describe HttpStub::Controllers::StubActivatorController do
 
     describe "when a stub activator has been registered that is activated by the request" do
 
-      before(:each) do
-        stub_activator_registry.stub(:find_for).with(request).and_return(stub_activator)
+      before(:example) do
+        allow(stub_activator_registry).to receive(:find_for).with(request).and_return(stub_activator)
       end
 
-      it "should add the activators stub to the stub registry" do
-        stub_registry.should_receive(:add).with(the_stub, request)
+      it "adds the activators stub to the stub registry" do
+        expect(stub_registry).to receive(:add).with(the_stub, request)
 
         controller.activate(request)
       end
 
-      it "should return a success response" do
-        controller.activate(request).should eql(HttpStub::Models::Response::SUCCESS)
+      it "returns a success response" do
+        expect(controller.activate(request)).to eql(HttpStub::Models::Response::SUCCESS)
       end
 
     end
 
     describe "when no stub activator is activated by the request" do
 
-      before(:each) do
-        stub_activator_registry.stub(:find_for).with(request).and_return(nil)
+      before(:example) do
+        allow(stub_activator_registry).to receive(:find_for).with(request).and_return(nil)
       end
 
-      it "should not add a stub to the registry" do
-        stub_registry.should_not_receive(:add)
+      it "does not add a stub to the registry" do
+        expect(stub_registry).not_to receive(:add)
 
         controller.activate(request)
       end
 
-      it "should return an empty response" do
-        controller.activate(request).should eql(HttpStub::Models::Response::EMPTY)
+      it "returns an empty response" do
+        expect(controller.activate(request)).to eql(HttpStub::Models::Response::EMPTY)
       end
 
     end
@@ -83,8 +83,8 @@ describe HttpStub::Controllers::StubActivatorController do
 
   describe "#clear" do
 
-    it "should clear the activator registry" do
-      stub_activator_registry.should_receive(:clear).with(request)
+    it "clears the activator registry" do
+      expect(stub_activator_registry).to receive(:clear).with(request)
 
       controller.clear(request)
     end

data/spec/lib/http_stub/controllers/stub_controller_spec.rb

@@ -8,34 +8,34 @@ describe HttpStub::Controllers::StubController do
   let(:registry) { double(HttpStub::Models::Registry).as_null_object }
   let(:controller) { HttpStub::Controllers::StubController.new(registry) }
 
-  before(:each) { JSON.stub(:parse).and_return(stub_options) }
+  before(:example) { allow(JSON).to receive(:parse).and_return(stub_options) }
 
   describe "#register" do
 
-    before(:each) do
-      HttpStub::Models::Stub.stub(:new).and_return(the_stub)
+    before(:example) do
+      allow(HttpStub::Models::Stub).to receive(:new).and_return(the_stub)
     end
 
-    it "should parse an options hash from the JSON request body" do
-      JSON.should_receive(:parse).with(request_body).and_return(stub_options)
+    it "parses an options hash from the JSON request body" do
+      expect(JSON).to receive(:parse).with(request_body).and_return(stub_options)
 
       controller.register(request)
     end
 
-    it "should create a stub from the parsed options" do
-      HttpStub::Models::Stub.should_receive(:new).with(stub_options).and_return(the_stub)
+    it "creates a stub from the parsed options" do
+      expect(HttpStub::Models::Stub).to receive(:new).with(stub_options).and_return(the_stub)
 
       controller.register(request)
     end
 
-    it "should add the stub to the stub registry" do
-      registry.should_receive(:add).with(the_stub, request)
+    it "adds the stub to the stub registry" do
+      expect(registry).to receive(:add).with(the_stub, request)
 
       controller.register(request)
     end
 
-    it "should return a success response" do
-      controller.register(request).should eql(HttpStub::Models::Response::SUCCESS)
+    it "returns a success response" do
+      expect(controller.register(request)).to eql(HttpStub::Models::Response::SUCCESS)
     end
 
   end
@@ -44,26 +44,26 @@ describe HttpStub::Controllers::StubController do
 
     describe "when a stub has been registered that should be replayed for the request" do
 
-      before(:each) do
-        registry.stub(:find_for).with(request).and_return(the_stub)
+      before(:example) do
+        allow(registry).to receive(:find_for).with(request).and_return(the_stub)
       end
 
-      it "should return the stubs response" do
-        the_stub.should_receive(:response).and_return(response)
+      it "returns the stubs response" do
+        expect(the_stub).to receive(:response).and_return(response)
 
-        controller.replay(request).should eql(response)
+        expect(controller.replay(request)).to eql(response)
       end
 
     end
 
     describe "when no stub should be replayed for the request" do
 
-      before(:each) do
-        registry.stub(:find_for).with(request).and_return(nil)
+      before(:example) do
+        allow(registry).to receive(:find_for).with(request).and_return(nil)
       end
 
-      it "should return an empty response" do
-        controller.replay(request).should eql(HttpStub::Models::Response::EMPTY)
+      it "returns an empty response" do
+        expect(controller.replay(request)).to eql(HttpStub::Models::Response::EMPTY)
       end
 
     end
@@ -72,8 +72,8 @@ describe HttpStub::Controllers::StubController do
 
   describe "#clear" do
 
-    it "should clear the stub registry" do
-      registry.should_receive(:clear).with(request)
+    it "clears the stub registry" do
+      expect(registry).to receive(:clear).with(request)
 
       controller.clear(request)
     end

data/spec/lib/http_stub/hash_extensions_spec.rb

@@ -8,8 +8,8 @@ describe HttpStub::HashExtensions do
         { "lower" => 1, "UPPER" => 2, "MiXeDcAsE" => 3 }
       end
 
-      it "should downcase the string keys" do
-        hash.downcase_and_underscore_keys.should eql({ "lower" => 1, "upper" => 2, "mixedcase" => 3 })
+      it "downcases the string keys" do
+        expect(hash.downcase_and_underscore_keys).to eql({ "lower" => 1, "upper" => 2, "mixedcase" => 3 })
       end
 
       describe "and keys contain underscores and hyphens" do
@@ -18,8 +18,8 @@ describe HttpStub::HashExtensions do
           { "has_underscore" => 1, "has-hypen" => 2, "has_underscore_and-hypen" => 3 }
         end
 
-        it "should downcase the string keys" do
-          hash.downcase_and_underscore_keys.should eql({ "has_underscore" => 1,
+        it "downcases the string keys" do
+          expect(hash.downcase_and_underscore_keys).to eql({ "has_underscore" => 1,
                                                          "has_hypen" => 2,
                                                          "has_underscore_and_hypen" => 3 })
         end
@@ -34,8 +34,8 @@ describe HttpStub::HashExtensions do
         { 1 => 2, :symbol => 3, nil => 4 }
       end
 
-      it "should not alter a hash" do
-        hash.downcase_and_underscore_keys.should eql({ 1 => 2, :symbol => 3, nil => 4 })
+      it "does not alter a hash" do
+        expect(hash.downcase_and_underscore_keys).to eql({ 1 => 2, :symbol => 3, nil => 4 })
       end
 
     end
@@ -52,8 +52,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { hash_parameter }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end
@@ -62,8 +62,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { hash_parameter.merge("key4" => "value4") }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end
@@ -72,8 +72,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { { "key1" => "value1", "key2" => "nonMatchingValue", "key3" => "value3" } }
 
-        it "should return false" do
-          hash.has_hash?(hash_parameter).should be(false)
+        it "returns false" do
+          expect(hash.has_hash?(hash_parameter)).to be(false)
         end
 
       end
@@ -82,8 +82,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { { "key1" => "value1", "key3" => "value3" } }
 
-        it "should return false" do
-          hash.has_hash?(hash_parameter).should be(false)
+        it "returns false" do
+          expect(hash.has_hash?(hash_parameter)).to be(false)
         end
 
       end
@@ -92,8 +92,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { {} }
 
-        it "should return false" do
-          hash.has_hash?(hash_parameter).should be(false)
+        it "returns false" do
+          expect(hash.has_hash?(hash_parameter)).to be(false)
         end
 
       end
@@ -108,8 +108,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { {} }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end
@@ -118,8 +118,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { { "key" => "value" } }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end
@@ -134,8 +134,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { {} }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end
@@ -144,8 +144,8 @@ describe HttpStub::HashExtensions do
 
         let(:hash) { { "key" => "value" } }
 
-        it "should return true" do
-          hash.has_hash?(hash_parameter).should be(true)
+        it "returns true" do
+          expect(hash.has_hash?(hash_parameter)).to be(true)
         end
 
       end

data/spec/lib/http_stub/models/exact_value_matcher_spec.rb

@@ -8,8 +8,8 @@ describe HttpStub::Models::ExactValueMatcher do
 
       let(:actual_value) { stub_value }
 
-      it "should return true" do
-        perform_match.should be_true
+      it "returns true" do
+        expect(perform_match).to be_truthy
       end
 
     end
@@ -18,8 +18,8 @@ describe HttpStub::Models::ExactValueMatcher do
 
       let(:actual_value) { "not equal to stub value" }
 
-      it "should return false" do
-        perform_match.should be_false
+      it "returns false" do
+        expect(perform_match).to be_falsey
       end
 
     end

data/spec/lib/http_stub/models/hash_with_string_value_matchers_spec.rb

@@ -13,22 +13,22 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
   let(:value_matcher_hash) { HttpStub::Models::HashWithStringValueMatchers.new(stubbed_hash) }
 
-  before(:each) do
-    value_matchers.each { |value| HttpStub::Models::StringValueMatcher.stub(:new).with(value.to_s).and_return(value) }
+  before(:example) do
+    value_matchers.each { |value| allow(HttpStub::Models::StringValueMatcher).to receive(:new).with(value.to_s).and_return(value) }
   end
 
-  it "should be hash" do
-    value_matcher_hash.should be_a(Hash)
+  it "is a hash" do
+    expect(value_matcher_hash).to be_a(Hash)
   end
 
   describe "constructor" do
 
-    it "should create a value matcher representation of each value in the hash" do
+    it "creates a value matcher representation of each value in the hash" do
       value_matchers.each do |value|
-        HttpStub::Models::StringValueMatcher.should_receive(:new).with(value.to_s).and_return(value)
+        expect(HttpStub::Models::StringValueMatcher).to receive(:new).with(value.to_s).and_return(value)
       end
 
-      value_matcher_hash.values.should eql(value_matchers)
+      expect(value_matcher_hash.values).to eql(value_matchers)
     end
     
   end
@@ -50,27 +50,27 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
           context "and the values match" do
 
-            before(:each) do
-              value_matchers.each { |value| value.stub(:match?).with("another #{value}").and_return(true) }
+            before(:example) do
+              value_matchers.each { |value| allow(value).to receive(:match?).with("another #{value}").and_return(true) }
             end
             
-            it "should return true" do
-              value_matcher_hash.match?(provided_hash).should be_true
+            it "returns true" do
+              expect(value_matcher_hash.match?(provided_hash)).to be_truthy
             end
             
           end
 
           context "and a value does not match" do
 
-            before(:each) do
-              value_matchers.each { |value| value.stub(:match?).with("another #{value}").and_return(true) }
+            before(:example) do
+              value_matchers.each { |value| allow(value).to receive(:match?).with("another #{value}").and_return(true) }
 
               non_matching_value = value_matchers[1]
-              non_matching_value.stub(:match?).with("another #{non_matching_value}").and_return(false)
+              allow(non_matching_value).to receive(:match?).with("another #{non_matching_value}").and_return(false)
             end
 
-            it "should return false" do
-              value_matcher_hash.match?(provided_hash).should be_false
+            it "returns false" do
+              expect(value_matcher_hash.match?(provided_hash)).to be_falsey
             end
 
           end
@@ -81,19 +81,19 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
           let(:provided_hash) { { "key1" => "value1", "differentkey2" => "another value2", "key3" => "value3" } }
 
-          it "should determine if the corresponding value matches nil" do
+          it "determines if the corresponding value matches nil" do
             expected_values = [ "value1", nil, "value3" ]
             value_matchers.zip(expected_values).each do |value_matcher, expected_value|
-              value_matcher.stub(:match?).with(expected_value)
+              allow(value_matcher).to receive(:match?).with(expected_value)
             end
 
             value_matcher_hash.match?(provided_hash)
           end
 
-          it "should return the result of evaluating the value matchers" do
-            value_matchers.each { |value| value.stub(:match?).and_return(true) }
+          it "returns the result of evaluating the value matchers" do
+            value_matchers.each { |value| allow(value).to receive(:match?).and_return(true) }
 
-            value_matcher_hash.match?(provided_hash).should be_true
+            expect(value_matcher_hash.match?(provided_hash)).to be_truthy
           end
 
         end
@@ -111,12 +111,12 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
         context "and it has matching keys and values" do
 
-          before(:each) do
-            value_matchers.each { |value| value.stub(:match?).with("another #{value}").and_return(true) }
+          before(:example) do
+            value_matchers.each { |value| allow(value).to receive(:match?).with("another #{value}").and_return(true) }
           end
 
-          it "should return true" do
-            value_matcher_hash.match?(provided_hash).should be_true
+          it "returns true" do
+            expect(value_matcher_hash.match?(provided_hash)).to be_truthy
           end
           
         end
@@ -133,8 +133,8 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
         let(:provided_hash) { { "key" => "value" } }
 
-        it "should return true" do
-          value_matcher_hash.match?(provided_hash).should be_true
+        it "returns true" do
+          expect(value_matcher_hash.match?(provided_hash)).to be_truthy
         end
 
       end
@@ -143,8 +143,8 @@ describe HttpStub::Models::HashWithStringValueMatchers do
 
         let(:provided_hash) { {} }
 
-        it "should return true" do
-          value_matcher_hash.match?(provided_hash).should be_true
+        it "returns true" do
+          expect(value_matcher_hash.match?(provided_hash)).to be_truthy
         end
 
       end