verified_double 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5aa54bfcb029e5501e4ec6598a02c1a77ec28da
-  data.tar.gz: 590332886ad996a7589834ad01c4fef2f4f8dc3f
+  metadata.gz: 3b7ae16d1fbe0432c903b73550c4da1c0abad46f
+  data.tar.gz: 95596257e58d1597f9ad4294fab12552d12b07f9
 SHA512:
-  metadata.gz: b4804ffcdef59cfba843d866002ee5635b6c0f0611faaeb3c3b7d75a5f3a7fbca80a5240c8d81cc423237be809f6f49d80a3fb508c55ddb2b42a88d0fefce42f
-  data.tar.gz: f4abb8144c06a71798f792ea403d3959c5ae1f82fd8dee1bbd14e6b1e35aa31a146349c877b85ffb7a3d0afcea884272032307c5b2b3ec8e327b9eda40bfd7d1
+  metadata.gz: d7a957cdba5ce4f2339f3c56e15320625d5b4a1610ffbfba4a3377378013130d978067c11887c0c8c99ad8fbbfef9c9780f315e9a0930fb0fbdc2769bb5eb84b
+  data.tar.gz: 401ff433e309a8691d8fc8ec1382807d8bbebd1a286460ed79667066952500a8ee345d9a711908cb9bc7094c249aea1d2897971a0e08861ccbbf39d291421882

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+0.7.0 - 2014-01-22
+------------------
+
+* Fix: `VerifiedDouble.wrap(klass)` doesn't get cleared after the test where it
+  is called. As a result, expectations of `klass` in other tests gets recorded by
+  VerifiedDouble.
+
 0.6.1 - 2013-12-30
 ------------------
 

data/features/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+0.7.0 - 2014-01-22
+------------------
+
+* Fix: `VerifiedDouble.wrap(klass)` doesn't get cleared after the test where it
+  is called. As a result, expectations of `klass` in other tests gets recorded by
+  VerifiedDouble.
+
 0.6.1 - 2013-12-30
 ------------------
 

data/features/partial_mocks.feature

@@ -160,3 +160,59 @@ Feature: 65. Partial mocks
 
       1. ObjectUnderTest.some_method(SomeInput)=>SomeOutput
       """
+
+  Scenario: Class partial mocks should not affect the class in other tests
+    Given the following classes:
+      """
+      class ObjectUnderTest
+        def self.do_something(input)
+          some_method(input)
+          another_method(input)
+        end
+
+        def self.another_method(input)
+          SomeOutput.new
+        end
+
+        def self.some_method(input)
+          SomeOutput.new
+        end
+      end
+
+      class SomeInput
+      end
+
+      class SomeOutput
+      end
+      """
+
+    And a test that uses both rspec-mock and VerifiedDouble to partially mock a class:
+      """
+      require 'spec_helper'
+      describe ObjectUnderTest do
+        let(:input) { SomeInput.new }
+        let(:output) { SomeOutput.new }
+
+        it "tests something with VerifiedDouble partial mock" do
+          expect(VerifiedDouble.wrap(ObjectUnderTest))
+            .to receive(:some_method).with(input).and_return(output)
+
+          ObjectUnderTest.do_something(input)
+        end
+
+        it "tests something with rspec-mock" do
+          expect(ObjectUnderTest)
+            .to receive(:another_method).with(input).and_return(output)
+
+          ObjectUnderTest.do_something(input)
+        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_method(SomeInput)=>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 rspec-mock and VerifiedDouble to partially mock a " +
+  "class:" do |string|
+
+  write_file 'spec/main_spec.rb', string
+end
+
 Given /^a test that uses VerifiedDouble to stub an object:$/ do |string|
   write_file 'spec/main_spec.rb', string
 end
@@ -34,7 +40,11 @@ Given /^the test suite has a contract test for the stub:$/ do |string|
   write_file 'spec/contract_test_for_main_spec.rb', string
 end
 
-Given(/^the test suite is configured to use VerifiedDouble:$/) do |string|
+Given /^the test suite has another test mocking the class with rspec\-mock:$/ do |string|
+  write_file 'spec/another_spec.rb', string
+end
+
+Given /^the test suite is configured to use VerifiedDouble:$/ do |string|
   write_file 'spec/spec_helper.rb', string
 end
 
@@ -60,6 +70,13 @@ Then /^I should be informed that the stub is unverified:$/ do |string|
   assert_success('pass')
 end
 
+Then "I should be informed that only the VerifiedDouble\.wrap mock is " +
+  "unverified:" do |string|
+
+  assert_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.rb

@@ -30,6 +30,10 @@ module VerifiedDouble
     end
   end
 
+  def self.doubles_in_current_test
+    @doubles_in_current_test ||= []
+  end
+
   def self.expect_any_instance_of(klass)
     super(klass).tap do |d|
       VerifiedDouble.registry.current_double = VerifiedDouble.record(d)
@@ -62,6 +66,7 @@ module VerifiedDouble
   end
 
   def self.record(a_double)
+    VerifiedDouble.doubles_in_current_test << a_double
     a_double.extend(VerifiedDouble::CanRecordInteractions)
     a_double
   end

data/lib/verified_double/can_record_interactions.rb

@@ -5,18 +5,20 @@ module VerifiedDouble
       super(*return_values)
     end
 
-    def can_record_interactions?
-      true
-    end
-
     def should_receive(*args)
       VerifiedDouble.registry.add_method_signature(self, args[0])
-      super(*args).tap {|result| result.extend(VerifiedDouble::CanRecordInteractions) }
+      super(*args).tap do |result|
+        VerifiedDouble.doubles_in_current_test << result
+        result.extend(VerifiedDouble::CanRecordInteractions)
+      end
     end
 
     def stub(*args)
       VerifiedDouble.registry.add_method_signature(self, args[0])
-      super(*args).tap {|result| result.extend(VerifiedDouble::CanRecordInteractions) }
+      super(*args).tap do |result|
+        VerifiedDouble.doubles_in_current_test << result
+        result.extend(VerifiedDouble::CanRecordInteractions)
+      end
     end
 
     def with(*args)

data/lib/verified_double/rspec_configuration.rb

@@ -4,7 +4,11 @@ RSpec.configure do |config|
   config.before do
     self.extend VerifiedDouble::RSpecMocksSyntaxOverrides
   end
-  
+
+  config.after do
+    VerifiedDouble.doubles_in_current_test.clear
+  end
+
   config.after :suite do
     VerifiedDouble.report_unverified_signatures(self)
   end

data/lib/verified_double/rspec_mocks_syntax_overrides.rb

@@ -1,7 +1,7 @@
 module VerifiedDouble
   module RSpecMocksSyntaxOverrides
     def allow(*args)
-      if args[0].respond_to?(:can_record_interactions?)
+      if VerifiedDouble.doubles_in_current_test.include?(args[0])
         VerifiedDouble.registry.current_double = args[0]
       else
         VerifiedDouble.registry.current_double = nil
@@ -10,7 +10,7 @@ module VerifiedDouble
     end
 
     def expect(*args)
-      if args[0].respond_to?(:can_record_interactions?)
+      if VerifiedDouble.doubles_in_current_test.include?(args[0])
         VerifiedDouble.registry.current_double = args[0]
       else
         VerifiedDouble.registry.current_double = nil
@@ -21,7 +21,10 @@ module VerifiedDouble
     def receive(*args)
       if VerifiedDouble.registry.current_double
         VerifiedDouble.registry.add_method_signature_with_current_double(args[0])
-        super(*args).tap {|result| result.extend(VerifiedDouble::CanRecordInteractions) }
+        super(*args).tap do |result|
+          VerifiedDouble.doubles_in_current_test << result
+          result.extend(VerifiedDouble::CanRecordInteractions)
+        end
       else
         super(*args)
       end

data/lib/verified_double/version.rb

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

data/spec/verified_double/can_record_interactions_spec.rb

@@ -4,6 +4,7 @@ describe VerifiedDouble::CanRecordInteractions do
   let(:a_double){ double('Object') }
 
   before do
+    VerifiedDouble.doubles_in_current_test << a_double
     a_double.extend(VerifiedDouble::CanRecordInteractions)
   end
 
@@ -13,7 +14,7 @@ describe VerifiedDouble::CanRecordInteractions do
       expect(VerifiedDouble.registry.last.method).to eq('mocked_fake_to_s')
       a_double.mocked_fake_to_s
     end
-  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
@@ -44,4 +45,4 @@ describe VerifiedDouble::CanRecordInteractions do
       a_double.fake_to_s(:arg_1, :arg_2)
     end
   end
-end
+end

data/spec/verified_double/method_signatures_report_spec.rb

@@ -22,6 +22,7 @@ describe VerifiedDouble::MethodSignaturesReport do
       stub_const('VerifiedDouble', Class.new, transfer_nested_constants: true) }
 
     it "sets distinct signatures from the registry" do
+      verified_double_module.stub(:doubles_in_current_test).and_return([])
       verified_double_module
         .should_receive(:registry)
         .at_least(:once)
@@ -177,11 +178,13 @@ describe VerifiedDouble::MethodSignaturesReport do
       double(:registry, 'current_double' => nil, 'current_double=' => nil) }
 
     it "works" do
+      verified_double_module.stub(:doubles_in_current_test).and_return([])
+
       verified_double_module
         .should_receive(:registry)
         .at_least(:once)
         .and_return(registry)
-    
+
       expect(verified_double_module)
         .to receive(:verified_signatures_from_matchers)
         .and_return([method_signature])

metadata

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