rspec-mocks 2.14.5 → 2.14.6

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA1: 
-  metadata.gz: 0a57d504d5c028fb2a8a99979fe762432c66e2c5
-  data.tar.gz: 3936343e8929abf162cdec91f649590b94ee640b
-SHA512: 
-  metadata.gz: ec22b359484944c334d959dfc969446635712db242ceed9048855038948bc3fb29e58f6fc02057f179ef81e14e8481c6b87ad3e9994641ee16acef2ee9c7c4a0
-  data.tar.gz: 9563ceb3a3aef25c443406f11f489dc48d9ea2b37e8052698ac167d430b34456ad90b0557c937777e170823def793d481b87ce0a80da711e4c1c371d84d5c150
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWYzOGM0ZDZlNWI1YjhiOGY5N2MxMGEzODNlNzA4NzJiYmRiOWIwMg==
+  data.tar.gz: !binary |-
+    MjhlMWMxOWI0MTMxYjQzYmExMWVmODkwMGNhYzczYmY1MWU1ZTliMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGM2M2FjZWM0YzJkMjkwOWE5Nzk0NWY3YjNmNGJlN2QxZjBjNmI2ZTU5NTQy
+    ODA3N2EyODNmNGFiYjA3M2FiZDQ5NTc5NThmYzVlNGJhMTY3ZTg0MTQyNjBj
+    NDZjY2Q2Y2ZiZTA1NTBlMjBhYTQzMWU1MDgyNzU1OGNhYzZkOTE=
+  data.tar.gz: !binary |-
+    MmNjMDFlNDM0MTZhZGNiZjhjMmQ1NDk4OGQ3YzViOGExOTVlMzUzNzI1MTI0
+    NjlkMTdkZmQyNjE5ODljNTc5MWE4M2E3NzQzY2Y0ZWEzZDVkYTQzNmM3OGY3
+    Yjg4ODM5ZmI0NjYyYjEzZGMyZGZjNzA2ZDExOTM3ZDY1OWY2YmQ=

data/Changelog.md

@@ -1,3 +1,11 @@
+### 2.14.6 development
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.5...v2.14.6)
+
+Bug Fixes:
+
+* Ensure `any_instance` method stubs and expectations are torn down regardless of
+  expectation failures. (Sam Phippen)
+
 ### 2.14.5 / 2014-02-01
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.14.5)
 

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -88,9 +88,6 @@ module RSpec
           if @expectation_set && !message_chains.all_expectations_fulfilled?
             raise RSpec::Mocks::MockExpectationError, "Exactly one instance should have received the following message(s) but didn't: #{message_chains.unfulfilled_expectations.sort.join(', ')}"
           end
-        ensure
-          stop_all_observation!
-          ::RSpec::Mocks.space.remove_any_instance_recorder_for(@klass)
         end
 
         # @private

data/lib/rspec/mocks/space.rb

@@ -27,6 +27,11 @@ module RSpec
         end
 
         proxies.clear
+
+        any_instance_recorders.each_value do |recorder|
+          recorder.stop_all_observation!
+        end
+
         any_instance_recorders.clear
         expectation_ordering.clear
       end
@@ -42,10 +47,6 @@ module RSpec
         end
       end
 
-      def remove_any_instance_recorder_for(klass)
-        any_instance_recorders.delete(klass.__id__)
-      end
-
       def proxies_of(klass)
         proxies.values.select { |proxy| klass === proxy.object }
       end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.14.5'
+      STRING = '2.14.6'
     end
   end
 end

data/spec/rspec/mocks/any_instance_spec.rb

@@ -369,6 +369,7 @@ module RSpec
             klass.any_instance.should_not_receive(:bar)
             klass.new.foo
             RSpec::Mocks.space.verify_all
+            RSpec::Mocks.space.reset_all
           end
         end
 
@@ -391,24 +392,36 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              klass.any_instance.should_receive(:foo)
-              klass.new
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo)
+                klass.new
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              klass.any_instance.should_receive(:foo).and_return(1)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo).and_return(1)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              klass.any_instance.should_receive(:foo)
-              klass.any_instance.should_receive(:bar)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo)
+                klass.any_instance.should_receive(:bar)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: bar, foo')
           end
 
@@ -470,24 +483,36 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              klass.new
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                klass.new
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              klass.any_instance.should_receive(:another_existing_method)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                klass.any_instance.should_receive(:another_existing_method)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: another_existing_method, existing_method')
           end
 
@@ -580,16 +605,24 @@ module RSpec
 
             it "fails when no instances are declared" do
               expect do
-                klass.any_instance.should_receive(:foo).once
-                RSpec::Mocks.space.verify_all
+                begin
+                  klass.any_instance.should_receive(:foo).once
+                  RSpec::Mocks.space.verify_all
+                ensure
+                  RSpec::Mocks.space.reset_all
+                end
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
             it "fails when an instance is declared but there are no invocations" do
               expect do
-                klass.any_instance.should_receive(:foo).once
-                klass.new
-                RSpec::Mocks.space.verify_all
+                begin
+                  klass.any_instance.should_receive(:foo).once
+                  klass.new
+                  RSpec::Mocks.space.verify_all
+                ensure
+                  RSpec::Mocks.space.reset_all
+                end
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -714,9 +747,13 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  klass.any_instance.should_receive(:foo).never
-                  klass.any_instance.should_receive(:existing_method).and_return(5)
-                  RSpec::Mocks.space.verify_all
+                  begin
+                    klass.any_instance.should_receive(:foo).never
+                    klass.any_instance.should_receive(:existing_method).and_return(5)
+                    RSpec::Mocks.space.verify_all
+                  ensure
+                    RSpec::Mocks.space.reset_all
+                  end
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -752,9 +789,13 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  klass.any_instance.should_receive(:foo).any_number_of_times
-                  klass.any_instance.should_receive(:existing_method).and_return(5)
-                  RSpec::Mocks.space.verify_all
+                  begin
+                    klass.any_instance.should_receive(:foo).any_number_of_times
+                    klass.any_instance.should_receive(:existing_method).and_return(5)
+                    RSpec::Mocks.space.verify_all
+                  ensure
+                    RSpec::Mocks.space.reset_all
+                  end
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -779,6 +820,7 @@ module RSpec
 
               it "restores the class to its original state after each example when no instance is created" do
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -788,6 +830,7 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -798,6 +841,7 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -808,6 +852,7 @@ module RSpec
               before :each do
                 klass.any_instance.stub(:private_method).and_return(:something)
                 space.verify_all
+                space.reset_all
               end
 
               it "cleans up the backed up method" do
@@ -830,6 +875,7 @@ module RSpec
                 klass.any_instance.should_receive(:private_method).and_return(:something)
                 klass.new.private_method
                 space.verify_all
+                space.reset_all
               end
 
               it "cleans up the backed up method" do
@@ -877,6 +923,7 @@ module RSpec
               klass.any_instance.should_receive(:existing_method).and_return(Object.new)
               klass.new.existing_method
               space.verify_all
+              space.reset_all
 
               expect(klass.new.existing_method).to eq(existing_method_return_value)
             end
@@ -889,6 +936,7 @@ module RSpec
             klass.any_instance.stub(:existing_method).and_return(true)
 
             RSpec::Mocks.space.verify_all
+            RSpec::Mocks.space.reset_all
             expect(klass.new).to respond_to(:existing_method)
             expect(klass.new.existing_method).to eq(existing_method_return_value)
           end
@@ -978,6 +1026,7 @@ module RSpec
           expect(instance.existing_method).to eq :stubbed_return_value
 
           RSpec::Mocks.verify
+          RSpec::Mocks.teardown
 
           expect(instance.existing_method).to eq :existing_method_return_value
         end

data/spec/rspec/mocks/matchers/receive_spec.rb

@@ -9,6 +9,10 @@ module RSpec
         ::RSpec::Mocks.space.verify_all
       end
 
+      def reset_all
+        ::RSpec::Mocks.space.reset_all
+      end
+
       shared_examples_for "a receive matcher" do |*options|
         it 'allows the caller to configure how the subject responds' do
           wrapped.to receive(:foo).and_return(5)
@@ -97,6 +101,8 @@ module RSpec
           expect {
             verify_all
           }.to raise_error(RSpec::Mocks::MockExpectationError)
+
+          reset_all
         end
 
         it "reports the line number of expectation of unreceived message", :pending => options.include?(:does_not_report_line_num) do

data/spec/rspec/mocks/mock_space_spec.rb

@@ -97,16 +97,6 @@ module RSpec
         expect(r1).to be(r2)
         expect(r1).not_to be(r3)
       end
-
-      it 'removes an any_instance_recorder when requested' do
-        klass = Class.new
-
-        space.any_instance_recorder_for(klass)
-
-        expect {
-          space.remove_any_instance_recorder_for(klass)
-        }.to change { space.any_instance_recorders.size }.by(-1)
-      end
     end
   end
 end

metadata

@@ -1,56 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-mocks
-version: !ruby/object:Gem::Version 
-  version: 2.14.5
+version: !ruby/object:Gem::Version
+  version: 2.14.6
 platform: ruby
-authors: 
+authors:
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2014-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 10.0.0
-  prerelease: false
-  name: rake
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.9
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: cucumber
-  type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance/chain.rb
 - lib/rspec/mocks/any_instance/expectation_chain.rb
@@ -186,32 +194,31 @@ files:
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id004 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rspec
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-2.14.5
-test_files: 
+summary: rspec-mocks-2.14.6
+test_files:
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md