vcr 2.7.0 → 2.8.0

data/spec/vcr/configuration_spec.rb

@@ -62,7 +62,7 @@ describe VCR::Configuration do
       matcher_run = false
       subject.register_request_matcher(:custom) { |r1, r2| matcher_run = true }
       VCR.request_matchers[:custom].matches?(:r1, :r2)
-      expect(matcher_run).to be_true
+      expect(matcher_run).to be true
     end
   end
 
@@ -83,7 +83,7 @@ describe VCR::Configuration do
       called = false
       subject.after_library_hooks_loaded { called = true }
       subject.hook_into :fakeweb
-      expect(called).to be_true
+      expect(called).to be true
     end
   end
 
@@ -108,7 +108,7 @@ describe VCR::Configuration do
       block_called = false
       subject.ignore_request { |r| block_called = true }
       VCR.request_ignorer.ignore?(double(:parsed_uri => uri))
-      expect(block_called).to be_true
+      expect(block_called).to be true
     end
   end
 
@@ -156,9 +156,9 @@ describe VCR::Configuration do
         called = false
         VCR.configuration.send(hook_type, :my_tag) { called = true }
         VCR.configuration.invoke_hook(hook_type, double, double(:tags => []))
-        expect(called).to be_false
+        expect(called).to be false
         VCR.configuration.invoke_hook(hook_type, double, double(:tags => [:my_tag]))
-        expect(called).to be_true
+        expect(called).to be true
       end
     end
   end
@@ -218,11 +218,11 @@ describe VCR::Configuration do
       yielded = false
       subject.after_http_request(:stubbed_by_vcr?) { |req| yielded = true }
       subject.invoke_hook(:after_http_request, request(:stubbed_by_vcr), response)
-      expect(yielded).to be_true
+      expect(yielded).to be true
 
       yielded = false
       subject.invoke_hook(:after_http_request, request(:ignored), response)
-      expect(yielded).to be_false
+      expect(yielded).to be false
     end
   end
 
@@ -271,31 +271,31 @@ describe VCR::Configuration do
 
     context "default hook" do
       it "returns false when there is no current cassette" do
-        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be_false
+        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be false
       end
 
       it "returns false when the current cassette has been created without the :preserve_exact_body_bytes option" do
         VCR.insert_cassette('foo')
-        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be_false
+        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be false
       end
 
       it 'returns true when the current cassette has been created with the :preserve_exact_body_bytes option' do
         VCR.insert_cassette('foo', :preserve_exact_body_bytes => true)
-        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be_true
+        expect(subject.preserve_exact_body_bytes_for?(message_for "string")).to be true
       end
     end
 
     it "returns true when the configured block returns true" do
       subject.preserve_exact_body_bytes { |msg| msg.body == "a" }
-      expect(subject.preserve_exact_body_bytes_for?(message_for "a")).to be_true
-      expect(subject.preserve_exact_body_bytes_for?(message_for "b")).to be_false
+      expect(subject.preserve_exact_body_bytes_for?(message_for "a")).to be true
+      expect(subject.preserve_exact_body_bytes_for?(message_for "b")).to be false
     end
 
     it "returns true when any of the registered blocks returns true" do
       called_hooks = []
       subject.preserve_exact_body_bytes { called_hooks << :hook_1; false }
       subject.preserve_exact_body_bytes { called_hooks << :hook_2; true }
-      expect(subject.preserve_exact_body_bytes_for?(message_for "a")).to be_true
+      expect(subject.preserve_exact_body_bytes_for?(message_for "a")).to be true
       expect(called_hooks).to eq([:hook_1, :hook_2])
     end
 

data/spec/vcr/errors_spec.rb

@@ -23,6 +23,14 @@ module VCR
       end
 
       context 'when there is no current cassette' do
+        it 'identifies the request by its body when the default_cassette_options include the body in the match_requests_on option' do
+          VCR.configuration.default_cassette_options[:match_requests_on] = [:body]
+
+          expect(message_for(:body => 'param=val1')).to include(
+            "Body: param=val1"
+          )
+        end
+
         it 'mentions that there is no current cassette' do
           expect(message).to include('There is currently no cassette in use.')
         end
@@ -49,6 +57,21 @@ module VCR
       end
 
       context 'when there is a current cassette' do
+        it 'identifies the request by its body when the match_requests_on option includes the body' do
+          VCR.use_cassette('example', :match_requests_on => [:body]) do
+            expect(message_for(:body => 'param=val1')).to include(
+              "Body: param=val1"
+            )
+          end
+        end
+
+        it 'does not identify the request by its body when the cassette match_requests_on option does not include the body but the default_cassette_options do' do
+          VCR.configuration.default_cassette_options[:match_requests_on] = [:body]
+          VCR.use_cassette('example', :match_requests_on => [:uri]) do
+            expect(message_for(:body => 'param=val1')).to_not match(/body/i)
+          end
+        end
+
         it 'mentions the details about the current casette' do
           VCR.use_cassette('example') do
             expect(message).to match(/VCR is currently using the following cassette:.+example.yml/m)

data/spec/vcr/library_hooks/excon_spec.rb

@@ -30,6 +30,21 @@ describe "Excon hook", :with_monkey_patches => :excon do
     end
   end
 
+  context "when Excon's expects and idempotent middlewares cause errors to be raised" do
+    let(:excon) { ::Excon.new("http://localhost:#{VCR::SinatraApp.port}/404_not_200") }
+
+    def make_request
+      VCR.use_cassette('with_errors', :record => :once) do
+        excon.request(:method => :get, :expects => [200], :idempotent => true).body
+      end
+    end
+
+    it 'records and plays back properly' do
+      expect { make_request }.to raise_error(Excon::Errors::NotFound)
+      expect { make_request }.to raise_error(Excon::Errors::NotFound)
+    end
+  end
+
   include_examples "Excon streaming"
 
   context 'when Excon raises an error due to an unexpected response status' do

data/spec/vcr/library_hooks/fakeweb_spec.rb

@@ -111,7 +111,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
 
     context 'when WebMock has been loaded' do
       before(:each) do
-        expect(defined?(WebMock)).to be_true
+        expect(defined?(WebMock)).to be_truthy
       end
 
       it 'raises an error since FakeWeb and WebMock cannot both be used simultaneously' do

data/spec/vcr/library_hooks_spec.rb

@@ -4,8 +4,8 @@ module VCR
   describe LibraryHooks do
     describe '#disabled?' do
       it 'returns false by default for any argument given' do
-        expect(subject.disabled?(:foo)).to be_false
-        expect(subject.disabled?(:bar)).to be_false
+        expect(subject.disabled?(:foo)).to be false
+        expect(subject.disabled?(:bar)).to be false
       end
 
       context 'when a library hook is exclusively enabled' do
@@ -27,8 +27,8 @@ module VCR
             bar_disabled = subject.disabled?(:bar)
           end
 
-          expect(foo_disabled).to be_true
-          expect(bar_disabled).to be_true
+          expect(foo_disabled).to be true
+          expect(bar_disabled).to be true
         end
       end
     end
@@ -36,14 +36,14 @@ module VCR
     describe '#exclusively_enabled' do
       it 'restores all hook to being enabled when the block completes' do
         subject.exclusively_enabled(:faraday) { }
-        expect(subject.disabled?(:foo)).to be_false
-        expect(subject.disabled?(:faraday)).to be_false
+        expect(subject.disabled?(:foo)).to be false
+        expect(subject.disabled?(:faraday)).to be false
       end
 
       it 'restores all hooks to being enabled when the block completes, even if there is an error' do
         subject.exclusively_enabled(:faraday) { raise "boom" } rescue
-        expect(subject.disabled?(:foo)).to be_false
-        expect(subject.disabled?(:faraday)).to be_false
+        expect(subject.disabled?(:foo)).to be false
+        expect(subject.disabled?(:faraday)).to be false
       end
     end
   end

data/spec/vcr/middleware/faraday_spec.rb

@@ -111,7 +111,7 @@ describe VCR::Middleware::Faraday do
 
         make_request
         expect(VCR.library_hooks).not_to be_disabled(:fakeweb)
-        expect(hook_called).to be_true
+        expect(hook_called).to be true
       end
     end
 

data/spec/vcr/middleware/rack_spec.rb

@@ -93,7 +93,7 @@ module VCR
       let(:threaded_app) do
         lambda do |env|
           sleep 0.15
-          expect(VCR.send(:cassettes)).to have(1).cassette
+          expect(VCR.send(:cassettes).size).to eq(1)
           [200, {}, ['OK']]
         end
       end

data/spec/vcr/request_ignorer_spec.rb

@@ -58,11 +58,11 @@ module VCR
       end
 
       it 'ignores requests for which the block returns true' do
-        expect(subject.ignore?(request('http://foo.com:5/bar'))).to be_true
+        expect(subject.ignore?(request('http://foo.com:5/bar'))).to be true
       end
 
       it 'does not ignore requests for which the block returns false' do
-        expect(subject.ignore?(request('http://foo.com:6/bar'))).to be_false
+        expect(subject.ignore?(request('http://foo.com:6/bar'))).to be false
       end
     end
   end

data/spec/vcr/request_matcher_registry_spec.rb

@@ -26,7 +26,7 @@ module VCR
         matcher_called = false
         subject.register(:my_matcher) { |*a| matcher_called = true }
         subject[:my_matcher].matches?(double, double)
-        expect(matcher_called).to be_true
+        expect(matcher_called).to be true
       end
 
       context 'when there is already a matcher for the given name' do
@@ -37,7 +37,7 @@ module VCR
 
         it 'overrides the existing matcher' do
           subject.register(:foo) { |*a| true }
-          expect(subject[:foo].matches?(double, double)).to be_true
+          expect(subject[:foo].matches?(double, double)).to be true
         end
 
         it 'warns that there is a name collision' do
@@ -65,15 +65,15 @@ module VCR
 
       it 'returns an object that calls the named block when #matches? is called on it' do
         subject.register(:foo) { |r1, r2| r1 == 5 || r2 == 10 }
-        expect(subject[:foo].matches?(5, 0)).to be_true
-        expect(subject[:foo].matches?(0, 10)).to be_true
-        expect(subject[:foo].matches?(7, 7)).to be_false
+        expect(subject[:foo].matches?(5, 0)).to be true
+        expect(subject[:foo].matches?(0, 10)).to be true
+        expect(subject[:foo].matches?(7, 7)).to be false
       end
 
       it 'returns an object that calls the given callable when #matches? is called on it' do
         block_called = false
         subject[lambda { |r1, r2| block_called = true }].matches?(5, 0)
-        expect(block_called).to be_true
+        expect(block_called).to be true
       end
     end
 
@@ -86,7 +86,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123'),
             request_with(:uri => 'http://example.com/search?foo=123')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'matches two requests with URIs that are identical' do
@@ -94,7 +94,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123'),
             request_with(:uri => 'http://example.com/search?foo=123')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match two requests with different path parts' do
@@ -102,7 +102,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123'),
             request_with(:uri => 'http://example.com/find?foo=123')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
 
         it 'ignores the given query parameters when it is at the start' do
@@ -110,7 +110,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123&bar=r'),
             request_with(:uri => 'http://example.com/search?foo=124&bar=r')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'ignores the given query parameters when it is at the end' do
@@ -118,7 +118,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=124&bar=r'),
             request_with(:uri => 'http://example.com/search?foo=124&bar=q')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'still takes into account other query params' do
@@ -126,7 +126,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123&bar=r'),
             request_with(:uri => 'http://example.com/search?foo=124&bar=q')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
 
         it 'handles multiple query params of the same name' do
@@ -134,7 +134,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=124&tag[]=a&tag[]=b'),
             request_with(:uri => 'http://example.com/search?foo=124&tag[]=d&tag[]=e')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'can ignore multiple named parameters' do
@@ -142,7 +142,7 @@ module VCR
             request_with(:uri => 'http://example.com/search?foo=123&bar=r&baz=9'),
             request_with(:uri => 'http://example.com/search?foo=124&baz=9&bar=q')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'matches two requests with URIs that have no params' do
@@ -150,7 +150,7 @@ module VCR
             request_with(:uri => 'http://example.com/search'),
             request_with(:uri => 'http://example.com/search')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match two requests with URIs that have no params but different paths' do
@@ -158,7 +158,7 @@ module VCR
             request_with(:uri => 'http://example.com/foo'),
             request_with(:uri => 'http://example.com/bar')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
 
         it 'matches a second request when all parameters are filtered' do
@@ -166,7 +166,7 @@ module VCR
             request_with(:uri => 'http://example.com/search'),
             request_with(:uri => 'http://example.com/search?q=vcr&oq=vcr')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
       end
     end
@@ -178,7 +178,7 @@ module VCR
             request_with(:method => :get),
             request_with(:method => :get)
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -186,7 +186,7 @@ module VCR
             request_with(:method => :get),
             request_with(:method => :post)
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
 
@@ -196,7 +196,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?baz=7'),
             request_with(:uri => 'http://foo.com/bar?baz=7')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is different' do
@@ -204,7 +204,7 @@ module VCR
             request_with(:uri => 'http://foo1.com/bar?baz=7'),
             request_with(:uri => 'http://foo2.com/bar?baz=7')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
 
@@ -214,7 +214,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar'),
             request_with(:uri => 'http://foo.com/car')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -222,7 +222,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar'),
             request_with(:uri => 'http://goo.com/bar')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
 
@@ -232,7 +232,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?a=8'),
             request_with(:uri => 'http://goo.com/bar?a=9')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -240,7 +240,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?a=8'),
             request_with(:uri => 'http://foo.com/car?a=8')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
 
@@ -250,7 +250,7 @@ module VCR
             request_with(:body => 'foo'),
             request_with(:body => 'foo')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -258,7 +258,33 @@ module VCR
             request_with(:body => 'foo'),
             request_with(:body => 'bar')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
+        end
+      end
+
+      describe ":body_as_json" do
+        it 'matches when the body json is reordered' do
+          matches = subject[:body_as_json].matches?(
+            request_with(:body => '{ "a": "1", "b": "2" }'),
+            request_with(:body => '{ "b": "2", "a": "1" }')
+          )
+          expect(matches).to be true
+        end
+
+        it 'does not match when json is not the same' do
+          matches = subject[:body_as_json].matches?(
+            request_with(:body => '{ "a": "1", "b": "2" }'),
+            request_with(:body => '{ "a": "1", "b": "1" }')
+          )
+          expect(matches).to be false
+        end
+
+        it 'does not match when body is not json' do
+          matches = subject[:body_as_json].matches?(
+            request_with(:body => 'a=b'),
+            request_with(:body => 'a=b')
+          )
+          expect(matches).to be false
         end
       end
 
@@ -268,7 +294,7 @@ module VCR
             request_with(:headers => { 'a' => 1, 'b' => 2 }),
             request_with(:headers => { 'b' => 2, 'a' => 1 })
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -276,7 +302,7 @@ module VCR
             request_with(:headers => { 'a' => 3, 'b' => 2 }),
             request_with(:headers => { 'b' => 2, 'a' => 1 })
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
 
@@ -286,7 +312,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?a=8'),
             request_with(:uri => 'http://goo.com/car?a=8')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'matches when empty' do
@@ -294,7 +320,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar'),
             request_with(:uri => 'http://goo.com/car')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'matches when parameters are reordered' do
@@ -302,7 +328,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?a=8&b=9'),
             request_with(:uri => 'http://goo.com/car?b=9&a=8')
           )
-          expect(matches).to be_true
+          expect(matches).to be true
         end
 
         it 'does not match when it is not the same' do
@@ -310,7 +336,7 @@ module VCR
             request_with(:uri => 'http://foo.com/bar?a=8'),
             request_with(:uri => 'http://goo.com/car?b=8')
           )
-          expect(matches).to be_false
+          expect(matches).to be false
         end
       end
     end