verified_double 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7ae16d1fbe0432c903b73550c4da1c0abad46f
-  data.tar.gz: 95596257e58d1597f9ad4294fab12552d12b07f9
+  metadata.gz: f8e1baaa1b9eda731d0b34f43fccd89258e0103f
+  data.tar.gz: 55add943b1d237e527a18956d51f804577947bb1
 SHA512:
-  metadata.gz: d7a957cdba5ce4f2339f3c56e15320625d5b4a1610ffbfba4a3377378013130d978067c11887c0c8c99ad8fbbfef9c9780f315e9a0930fb0fbdc2769bb5eb84b
-  data.tar.gz: 401ff433e309a8691d8fc8ec1382807d8bbebd1a286460ed79667066952500a8ee345d9a711908cb9bc7094c249aea1d2897971a0e08861ccbbf39d291421882
+  metadata.gz: 79d26b5f3debd6e9700c4ba4ac901c905e8f444a008ac1bd552c797b8f6fbdbdea044d8a8b28dce766c6b79327eb42f1cfcab69951ebba4f7bb0e18ad7798871
+  data.tar.gz: 4c3a954df4a90e1e66089b0b447ef04361d305bf200632f82e7b7aa044f3549482d5c792044c81c69acf2c7c4e65e760f1e6ef99e2ff496ad92c3b9b0cf7fa98

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+0.8.0 - 2014-01-30
+------------------
+
+* Fix: any_instance_of calls should not be recorded by VerifiedDouble.
+
 0.7.0 - 2014-01-22
 ------------------
 

data/features/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+0.8.0 - 2014-01-30
+------------------
+
+* Fix: any_instance_of calls should not be recorded by VerifiedDouble.
+
 0.7.0 - 2014-01-22
 ------------------
 

data/features/partial_mocks.feature

@@ -216,3 +216,63 @@ Feature: 65. Partial mocks
 
       1. ObjectUnderTest.some_method(SomeInput)=>SomeOutput
       """
+
+    And I should not be informed that the rspec mock is unverified:
+      """
+      ObjectUnderTest#another_method(SomeInput)=>SomeOutput
+      """
+
+  Scenario: Class partial mocks should not any_instance_of mocks in other tests
+    Given the following classes:
+      """
+      class ObjectUnderTest
+        def self.do_something
+          some_class_method
+          new.some_instance_method
+        end
+
+        def self.some_instance_method
+          SomeOutput.new
+        end
+
+        def self.some_class_method
+          SomeOutput.new
+        end
+      end
+
+      class SomeOutput
+      end
+      """
+
+    And a test that uses both any_instance_of and VerifiedDouble to mock a class:
+      """
+      require 'spec_helper'
+      describe ObjectUnderTest do
+        let(:output) { SomeOutput.new }
+
+        let(:object_under_test_class) { VerifiedDouble.wrap(ObjectUnderTest) }
+
+        it "tests something with VerifiedDouble partial mock and allow_any_instance_of" do
+          expect(object_under_test_class)
+            .to receive(:some_class_method).and_return(output)
+
+          allow_any_instance_of(ObjectUnderTest)
+            .to receive(:some_instance_method).and_return(output)
+
+          ObjectUnderTest.do_something
+        end
+      end
+      """
+
+    When I run the test suite
+    Then I should be informed that only the VerifiedDouble.wrap mock is unverified:
+      """
+      The following mocks are not verified:
+
+      1. ObjectUnderTest.some_class_method()=>SomeOutput
+      """
+
+    And I should not be informed that the any_instance_of mock is unverified:
+      """
+      ObjectUnderTest.some_instance_method()=>SomeOutput
+      """

data/features/step_definitions/verified_double_steps.rb

@@ -14,6 +14,12 @@ Given /^a test that uses VerifiedDouble to mock the object under test:$/ do |str
   write_file 'spec/main_spec.rb', string
 end
 
+Given("a test that uses both any_instance_of and VerifiedDouble to mock a " +
+  "class:") do |string|
+
+  write_file 'spec/main_spec.rb', string
+end
+
 Given "a test that uses both rspec-mock and VerifiedDouble to partially mock a " +
   "class:" do |string|
 
@@ -77,6 +83,16 @@ Then "I should be informed that only the VerifiedDouble\.wrap mock is " +
   assert_success('pass')
 end
 
+Then "I should not be informed that the any_instance_of mock is unverified:" do |string|
+  assert_no_partial_output(string, all_output)
+  assert_success('pass')
+end
+
+Then "I should not be informed that the rspec mock is unverified:" do |string|
+  assert_no_partial_output(string, all_output)
+  assert_success('pass')
+end
+
 Then /^I should not see any output saying the mock is unverified$/ do
   assert_no_partial_output("The following mocks are not verified", all_output)
   assert_success('pass')

data/lib/verified_double/can_record_interactions.rb

@@ -8,7 +8,6 @@ module VerifiedDouble
     def should_receive(*args)
       VerifiedDouble.registry.add_method_signature(self, args[0])
       super(*args).tap do |result|
-        VerifiedDouble.doubles_in_current_test << result
         result.extend(VerifiedDouble::CanRecordInteractions)
       end
     end
@@ -16,7 +15,6 @@ module VerifiedDouble
     def stub(*args)
       VerifiedDouble.registry.add_method_signature(self, args[0])
       super(*args).tap do |result|
-        VerifiedDouble.doubles_in_current_test << result
         result.extend(VerifiedDouble::CanRecordInteractions)
       end
     end

data/lib/verified_double/recorded_method_signature_registry.rb

@@ -10,5 +10,13 @@ module VerifiedDouble
     def add_method_signature_with_current_double(method)
       add_method_signature(current_double, method)
     end
+
+    def update_current_double(a_double)
+      if VerifiedDouble.doubles_in_current_test.include?(a_double)
+        VerifiedDouble.registry.current_double = a_double
+      else
+        VerifiedDouble.registry.current_double = nil
+      end
+    end
   end
-end
+end

data/lib/verified_double/rspec_configuration.rb

@@ -6,6 +6,7 @@ RSpec.configure do |config|
   end
 
   config.after do
+    VerifiedDouble.registry.current_double = nil
     VerifiedDouble.doubles_in_current_test.clear
   end
 

data/lib/verified_double/rspec_mocks_syntax_overrides.rb

@@ -1,20 +1,22 @@
 module VerifiedDouble
   module RSpecMocksSyntaxOverrides
     def allow(*args)
-      if VerifiedDouble.doubles_in_current_test.include?(args[0])
-        VerifiedDouble.registry.current_double = args[0]
-      else
-        VerifiedDouble.registry.current_double = nil
-      end
+      VerifiedDouble.registry.update_current_double args[0]
+      super(*args)
+    end
+
+    def allow_any_instance_of(*args)
+      VerifiedDouble.registry.update_current_double nil
       super(*args)
     end
 
     def expect(*args)
-      if VerifiedDouble.doubles_in_current_test.include?(args[0])
-        VerifiedDouble.registry.current_double = args[0]
-      else
-        VerifiedDouble.registry.current_double = nil
-      end
+      VerifiedDouble.registry.update_current_double args[0]
+      super(*args)
+    end
+
+    def expect_any_instance_of(*args)
+      VerifiedDouble.registry.update_current_double nil
       super(*args)
     end
 
@@ -22,7 +24,6 @@ module VerifiedDouble
       if VerifiedDouble.registry.current_double
         VerifiedDouble.registry.add_method_signature_with_current_double(args[0])
         super(*args).tap do |result|
-          VerifiedDouble.doubles_in_current_test << result
           result.extend(VerifiedDouble::CanRecordInteractions)
         end
       else

data/lib/verified_double/version.rb

@@ -1,3 +1,3 @@
 module VerifiedDouble
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/verified_double/can_record_interactions_spec.rb

@@ -14,13 +14,25 @@ describe VerifiedDouble::CanRecordInteractions do
       expect(VerifiedDouble.registry.last.method).to eq('mocked_fake_to_s')
       a_double.mocked_fake_to_s
     end
+
+    it 'does not add the result to the current test doubles' do
+      a_double.should_receive(:mocked_fake_to_s)
+      expect(VerifiedDouble.doubles_in_current_test).to eq([a_double])
+      a_double.mocked_fake_to_s
+    end
   end
 
   describe "#stub(method)" do
     it "appends a new method signature with the method to the registry", verifies_contract: 'Object#stubbed_fake_to_s()' do
-      allow(a_double).to receive(:stubbed_fake_to_s)
+      a_double.stub(:stubbed_fake_to_s)
       expect(VerifiedDouble.registry.last.method).to eq('stubbed_fake_to_s')
     end
+
+    it 'does not add the result to the current test doubles' do
+      a_double.stub(:mocked_fake_to_s)
+      expect(VerifiedDouble.doubles_in_current_test).to eq([a_double])
+      a_double.mocked_fake_to_s
+    end
   end
 
   describe "#with(*args)" do

data/spec/verified_double/method_signatures_report_spec.rb

@@ -15,8 +15,13 @@ describe VerifiedDouble::MethodSignaturesReport do
     let(:method_signature_2) {
       VerifiedDouble::MethodSignature.new(class_name: 'Object', method_operator: '#', method: 'inspect') }
 
-    let(:registry){
-      double(:registry, 'current_double' => nil, 'current_double=' => nil) }
+    let(:registry) do
+      double(:registry,
+        'current_double' => nil,
+        'current_double=' => nil,
+        'update_current_double' => nil
+      )
+    end
 
     let(:verified_double_module){
       stub_const('VerifiedDouble', Class.new, transfer_nested_constants: true) }
@@ -174,8 +179,13 @@ describe VerifiedDouble::MethodSignaturesReport do
 
     let(:method_signature) { VerifiedDouble::MethodSignature.new }
 
-    let(:registry){
-      double(:registry, 'current_double' => nil, 'current_double=' => nil) }
+    let(:registry) do
+      double(:registry,
+        'current_double' => nil,
+        'current_double=' => nil,
+        'update_current_double' => nil
+      )
+    end
 
     it "works" do
       verified_double_module.stub(:doubles_in_current_test).and_return([])

data/spec/verified_double/rspec_mocks_syntax_overrides_spec.rb

@@ -62,6 +62,13 @@ describe VerifiedDouble::RSpecMocksSyntaxOverrides do
 
         a_double.fake_to_s
       end
+
+      it 'should not add the result to the current test doubles' do
+        expect(a_double).to receive(some_method).and_return(some_result)
+        expect(VerifiedDouble.doubles_in_current_test).to eq([a_double])
+
+        a_double.fake_to_s
+      end
     end
 
     context "where the current double is not recording VerifiedDouble interactions" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verified_double
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport