verified_double 0.3.0 → 0.4.0

data/CHANGELOG.markdown

@@ -1,4 +1,21 @@
+0.4.0 - 2013-07-28
+------------------
+
+[#7] Pass: I should be able to use the RSpec's new expect syntax with
+  VerifiedDouble.
+
+[#7] Require verified_double/rspec_configuration in order to integrate
+  verified_double with rspec.
+
+[#18] Fix Scenario: stubbed doubles using hash syntax are no longer being
+  recorded after 0.3.0.
+
+[#19] Ensure: if `VerifiedDouble.of_instance(class_name, method_stubs={})` is
+  used a argument or return value value of an expectation, then it should
+  not interfere with the method signature recording of the expectation.
+
 0.3.0 - 2013-07-19
+------------------
 
 * [#17] Major refactor: extend RSpec doubles with VerifiedDouble recording
   functionality. No more need for RecordingDouble.

data/README.md

@@ -7,7 +7,7 @@ VerifiedDouble is a gem for verifying rspec mocks. The gem works similar to [rsp
 For example, let's say I mocked the created_at method of a model like this:
 
     item = VerifiedDouble.of_instance(Item)
-    item.should_receive(:created_at).and_return(Time.now)
+    expect(item).to receive(:created_at).and_return(Time.now)
 
 When running the tests, the gem looks for a "contract test" tagged with the method's signature. This test should ensure that calling #created_at on Item will return a Time object.
 
@@ -19,13 +19,26 @@ If this test does not exist, the gem will complain that the mock is not verified
 
 I got the idea from http://www.infoq.com/presentations/integration-tests-scam, an old (2009) talk that still has some fresh insights on dealing with API changes in your mocked tests.
 
+Usage
+-----
+
+Require `verified_double/rspec_configuration` in your spec_helper.rb to integrate VerifiedDouble with rspec. If you want verified_double to be run only as needed, create a separate verified_spec_helper.rb:
+
+    # spec/verified_spec_helper.rb
+    require 'spec_helper'
+    require 'verified_double/rspec_configuration'
+
+And require it when running rspec:
+
+    rspec -r ./spec/verified_spec_helper.rb
+
 You can learn more about using the gem at https://www.relishapp.com/gsmendoza/verified-double.
 
 Actively tested against
 -----------------------
 
 * Ruby 1.9.3
-* RSpec 2.13
+* RSpec 2.14
 
 
 Alternatives
@@ -36,13 +49,11 @@ Alternatives
 Caveats
 -------
 
-VerifiedDouble is still in its infancy, but I hope it's usable for the most common cases.
-
-* If you check the RelishApp doc, the gem only supports a subset of rspec-mock's API. Please post an issue at http://github.com/gsmendoza/verified_double if you need support for any particular rspec-mock API.
+* With 0.3.0, doubles created with VerifiedDouble.of_instance() and VerifiedDouble.of_class() are now VerifiedDouble-extended RSpec doubles. As a result, they should function like regular RSpec doubles. However, VerifiedDouble still doesn't have support for [RSpec mock argument matchers](https://github.com/rspec/rspec-mocks#argument-matchers). Please post an issue at http://github.com/gsmendoza/verified_double if you need support for any particular rspec-mock API.
 
 * The [method documentation](http://rubydoc.info/gems/verified_double) is pretty empty at this point :p I'm planning to use yard-spec to document the methods but that gem doesn't support rspec context blocks. I'll try to work on that soon.
 
 Special thanks
 --------------
 
-To [Thomas Sinclair](https://twitter.com/anathematic) and [Inner Core Designs](http://icdesign.com.au) for sponsoring this gem :)
+To [Thomas Sinclair](https://twitter.com/anathematic) of [Inner Core Designs](http://icdesign.com.au) for sponsoring this gem :)

data/features/CHANGELOG.markdown

@@ -1,4 +1,21 @@
+0.4.0 - 2013-07-28
+------------------
+
+[#7] Pass: I should be able to use the RSpec's new expect syntax with
+  VerifiedDouble.
+
+[#7] Require verified_double/rspec_configuration in order to integrate
+  verified_double with rspec.
+
+[#18] Fix Scenario: stubbed doubles using hash syntax are no longer being
+  recorded after 0.3.0.
+
+[#19] Ensure: if `VerifiedDouble.of_instance(class_name, method_stubs={})` is
+  used a argument or return value value of an expectation, then it should
+  not interfere with the method signature recording of the expectation.
+
 0.3.0 - 2013-07-19
+------------------
 
 * [#17] Major refactor: extend RSpec doubles with VerifiedDouble recording
   functionality. No more need for RecordingDouble.

data/features/accessor_method_contracts.feature

@@ -19,18 +19,11 @@ Feature: 05. Accessor method contracts
       end
       """
 
-    And the test suite includes VerifiedDouble to verify doubles with accessor methods:
+    And the test suite is configured to use VerifiedDouble:
       """
       require 'verified_double'
+      require 'verified_double/rspec_configuration'
       require 'main'
-
-      RSpec.configure do |config|
-        config.include VerifiedDouble::Matchers
-
-        config.after :suite do
-          VerifiedDouble.report_unverified_signatures(self)
-        end
-      end
       """
 
   Scenario: Verifying mocks for accessors

data/features/customizing_arguments_and_return_values.feature

@@ -17,16 +17,11 @@ Feature: 04. Customizing arguments and return values
       end
       """
 
-    And the test suite has an after(:suite) callback asking VerifiedDouble to report unverified doubles:
+    And the test suite is configured to use VerifiedDouble:
       """
       require 'verified_double'
+      require 'verified_double/rspec_configuration'
       require 'main'
-
-      RSpec.configure do |config|
-        config.after :suite do
-          VerifiedDouble.report_unverified_signatures(self)
-        end
-      end
       """
 
     And a test that uses VerifiedDouble to mock an object:
@@ -38,7 +33,7 @@ Feature: 04. Customizing arguments and return values
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end

data/features/readme.md

@@ -7,7 +7,7 @@ VerifiedDouble is a gem for verifying rspec mocks. The gem works similar to [rsp
 For example, let's say I mocked the created_at method of a model like this:
 
     item = VerifiedDouble.of_instance(Item)
-    item.should_receive(:created_at).and_return(Time.now)
+    expect(item).to receive(:created_at).and_return(Time.now)
 
 When running the tests, the gem looks for a "contract test" tagged with the method's signature. This test should ensure that calling #created_at on Item will return a Time object.
 
@@ -19,13 +19,26 @@ If this test does not exist, the gem will complain that the mock is not verified
 
 I got the idea from http://www.infoq.com/presentations/integration-tests-scam, an old (2009) talk that still has some fresh insights on dealing with API changes in your mocked tests.
 
+Usage
+-----
+
+Require `verified_double/rspec_configuration` in your spec_helper.rb to integrate VerifiedDouble with rspec. If you want verified_double to be run only as needed, create a separate verified_spec_helper.rb:
+
+    # spec/verified_spec_helper.rb
+    require 'spec_helper'
+    require 'verified_double/rspec_configuration'
+
+And require it when running rspec:
+
+    rspec -r ./spec/verified_spec_helper.rb
+
 You can learn more about using the gem at https://www.relishapp.com/gsmendoza/verified-double.
 
 Actively tested against
 -----------------------
 
 * Ruby 1.9.3
-* RSpec 2.13
+* RSpec 2.14
 
 
 Alternatives
@@ -36,13 +49,11 @@ Alternatives
 Caveats
 -------
 
-VerifiedDouble is still in its infancy, but I hope it's usable for the most common cases.
-
-* If you check the RelishApp doc, the gem only supports a subset of rspec-mock's API. Please post an issue at http://github.com/gsmendoza/verified_double if you need support for any particular rspec-mock API.
+* With 0.3.0, doubles created with VerifiedDouble.of_instance() and VerifiedDouble.of_class() are now VerifiedDouble-extended RSpec doubles. As a result, they should function like regular RSpec doubles. However, VerifiedDouble still doesn't have support for [RSpec mock argument matchers](https://github.com/rspec/rspec-mocks#argument-matchers). Please post an issue at http://github.com/gsmendoza/verified_double if you need support for any particular rspec-mock API.
 
 * The [method documentation](http://rubydoc.info/gems/verified_double) is pretty empty at this point :p I'm planning to use yard-spec to document the methods but that gem doesn't support rspec context blocks. I'll try to work on that soon.
 
 Special thanks
 --------------
 
-To [Thomas Sinclair](https://twitter.com/anathematic) and [Inner Core Designs](http://icdesign.com.au) for sponsoring this gem :)
+To [Thomas Sinclair](https://twitter.com/anathematic) of [Inner Core Designs](http://icdesign.com.au) for sponsoring this gem :)

data/features/rspec_mock_compatibility.feature

@@ -31,27 +31,11 @@ Feature: 03. Rspec Mock compatibility
       end
       """
 
-    And the test suite has a contract test for the mock:
-      """
-      require 'spec_helper'
-
-      describe 'Collaborator' do
-        it "tests something", verifies_contract: 'Collaborator#some_method(SomeInput)=>SomeOutput' do
-          # do nothing
-        end
-      end
-      """
-
-    And the test suite has an after(:suite) callback asking VerifiedDouble to report unverified doubles:
+    And the test suite is configured to use VerifiedDouble:
       """
       require 'verified_double'
+      require 'verified_double/rspec_configuration'
       require 'main'
-
-      RSpec.configure do |config|
-        config.after :suite do
-          VerifiedDouble.report_unverified_signatures(self)
-        end
-      end
       """
 
   Scenario: once
@@ -64,14 +48,20 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).once.and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).once.and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
       """
 
     When I run the test suite
-    Then I should not see any output saying the stub is unverified
+
+    Then I should be informed that the mock is unverified:
+      """
+      The following mocks are not verified:
+
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
+      """
 
   Scenario: twice
     Given a test that uses VerifiedDouble to mock an object:
@@ -83,14 +73,20 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).twice.and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).twice.and_return(output)
           ObjectUnderTest.new.do_something_twice(instance_double, input)
         end
       end
       """
 
     When I run the test suite
-    Then I should not see any output saying the stub is unverified
+
+    Then I should be informed that the mock is unverified:
+      """
+      The following mocks are not verified:
+
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
+      """
 
   Scenario: exactly
     Given a test that uses VerifiedDouble to mock an object:
@@ -102,14 +98,19 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).exactly(1).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).exactly(1).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
       """
 
     When I run the test suite
-    Then I should not see any output saying the stub is unverified
+    Then I should be informed that the mock is unverified:
+      """
+      The following mocks are not verified:
+
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
+      """
 
   Scenario: at_least
     Given a test that uses VerifiedDouble to mock an object:
@@ -121,14 +122,19 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).at_least(:once).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).at_least(:once).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
       """
 
     When I run the test suite
-    Then I should not see any output saying the stub is unverified
+    Then I should be informed that the mock is unverified:
+      """
+      The following mocks are not verified:
+
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
+      """
 
   Scenario: at_most
     Given a test that uses VerifiedDouble to mock an object:
@@ -140,34 +146,20 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).at_most(:once).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).at_most(:once).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
       """
 
     When I run the test suite
-    Then I should not see any output saying the stub is unverified
-
-  Scenario: any_number_of_times
-    Given a test that uses VerifiedDouble to mock an object:
+    Then I should be informed that the mock is unverified:
       """
-      require 'spec_helper'
-      describe ObjectUnderTest do
-        let(:input) { SomeInput.new }
-        let(:output) { SomeOutput.new }
-        let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
+      The following mocks are not verified:
 
-        it "tests something" do
-          instance_double.should_receive(:some_method).with(input).any_number_of_times.and_return(output)
-          ObjectUnderTest.new.do_something(instance_double, input)
-        end
-      end
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
       """
 
-    When I run the test suite
-    Then I should not see any output saying the stub is unverified
-
   Scenario: and_raise
     Given a test that uses VerifiedDouble to mock an object:
       """
@@ -179,25 +171,20 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).and_raise(error)
+          expect(instance_double).to receive(:some_method).with(input).and_raise(error)
           expect { ObjectUnderTest.new.do_something(instance_double, input) }.to raise_error(error)
         end
       end
       """
 
-    And the test suite has a contract test for the mock:
+    When I run the test suite
+    Then I should be informed that the mock is unverified:
       """
-      require 'spec_helper'
+      The following mocks are not verified:
 
-      describe 'Collaborator' do
-        it "tests something", verifies_contract: 'Collaborator#some_method(SomeInput)' do
-          # do nothing
-        end
-      end
+      1. Collaborator#some_method(SomeInput)
       """
 
-    When I run the test suite
-    Then I should not see any output saying the stub is unverified
   Scenario: and_throw
     Given a test that uses VerifiedDouble to mock an object:
       """
@@ -209,22 +196,16 @@ Feature: 03. Rspec Mock compatibility
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).and_throw(error_symbol)
+          expect(instance_double).to receive(:some_method).with(input).and_throw(error_symbol)
           expect { ObjectUnderTest.new.do_something(instance_double, input) }.to throw_symbol(error_symbol)
         end
       end
       """
 
-    And the test suite has a contract test for the mock:
+    When I run the test suite
+    Then I should be informed that the mock is unverified:
       """
-      require 'spec_helper'
+      The following mocks are not verified:
 
-      describe 'Collaborator' do
-        it "tests something", verifies_contract: 'Collaborator#some_method(SomeInput)' do
-          # do nothing
-        end
-      end
+      1. Collaborator#some_method(SomeInput)
       """
-
-    When I run the test suite
-    Then I should not see any output saying the stub is unverified

data/features/step_definitions/verified_double_steps.rb

@@ -2,14 +2,6 @@ Given /^the following classes:$/ do |string|
   write_file 'lib/main.rb', string
 end
 
-Given /^the test suite includes VerifiedDouble to verify doubles with accessor methods:$/ do |string|
-  write_file 'spec/spec_helper.rb', string
-end
-
-Given /^the test suite has an after\(:suite\) callback asking VerifiedDouble to report unverified doubles:$/ do |string|
-  write_file 'spec/spec_helper.rb', string
-end
-
 Given /^a test that uses VerifiedDouble to mock an object:$/ do |string|
   write_file 'spec/main_spec.rb', string
 end
@@ -30,6 +22,10 @@ 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|
+  write_file 'spec/spec_helper.rb', string
+end
+
 Given /^the test suite does not have a contract test for the mock$/ do
   # do nothing
 end

data/features/verified_mocks.feature

@@ -30,16 +30,11 @@ Feature: 01. Verified mocks
       end
       """
 
-    And the test suite has an after(:suite) callback asking VerifiedDouble to report unverified doubles:
+    And the test suite is configured to use VerifiedDouble:
       """
       require 'verified_double'
+      require 'verified_double/rspec_configuration'
       require 'main'
-
-      RSpec.configure do |config|
-        config.after :suite do
-          VerifiedDouble.report_unverified_signatures(self)
-        end
-      end
       """
 
   Scenario: Verified instance doubles
@@ -52,7 +47,7 @@ Feature: 01. Verified mocks
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
@@ -82,7 +77,7 @@ Feature: 01. Verified mocks
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.should_receive(:some_method).with(input).and_return(output)
+          expect(instance_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
@@ -107,7 +102,7 @@ Feature: 01. Verified mocks
         let(:class_double) { VerifiedDouble.of_class('Collaborator') }
 
         it "tests something" do
-          class_double.should_receive(:some_method).with(input).and_return(output)
+          expect(class_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.do_something(input)
         end
       end
@@ -137,7 +132,7 @@ Feature: 01. Verified mocks
         let(:class_double) { VerifiedDouble.of_class('Collaborator') }
 
         it "tests something" do
-          class_double.should_receive(:some_method).with(input).and_return(output)
+          expect(class_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.new.do_something(class_double, input)
         end
       end

data/features/verified_stubs.feature

@@ -23,17 +23,13 @@ Feature: 02. Verified stubs
       end
       """
 
-    And the test suite has an after(:suite) callback asking VerifiedDouble to report unverified doubles:
+    And the test suite is configured to use VerifiedDouble:
       """
       require 'verified_double'
+      require 'verified_double/rspec_configuration'
       require 'main'
-
-      RSpec.configure do |config|
-        config.after :suite do
-          VerifiedDouble.report_unverified_signatures(self)
-        end
-      end
       """
+
   Scenario: Stubbed doubles
     Given a test that uses VerifiedDouble to stub an object:
       """
@@ -44,26 +40,20 @@ Feature: 02. Verified stubs
         let(:instance_double) { VerifiedDouble.of_instance('Collaborator') }
 
         it "tests something" do
-          instance_double.stub(:some_method).with(input).and_return(output)
+          allow(instance_double).to receive(:some_method).with(input).and_return(output)
           ObjectUnderTest.new.do_something(instance_double, input)
         end
       end
       """
 
-    And the test suite has a contract test for the stub:
+    When I run the test suite
+    Then I should be informed that the mock is unverified:
       """
-      require 'spec_helper'
+      The following mocks are not verified:
 
-      describe 'Collaborator' do
-        it "tests something", verifies_contract: 'Collaborator#some_method(SomeInput)=>SomeOutput' do
-          # do nothing
-        end
-      end
+      1. Collaborator#some_method(SomeInput)=>SomeOutput
       """
 
-    When I run the test suite
-    Then I should not see any output saying the stub is unverified
-
   Scenario: Stubbed doubles using hash syntax
     Given a test that uses VerifiedDouble to stub an object:
       """
@@ -79,16 +69,10 @@ Feature: 02. Verified stubs
       end
       """
 
-    And the test suite has a contract test for the stub:
+    When I run the test suite
+    Then I should be informed that the mock is unverified:
       """
-      require 'spec_helper'
+      The following mocks are not verified:
 
-      describe 'Collaborator' do
-        it "tests something", verifies_contract: 'Collaborator#some_method=>SomeOutput' do
-          # do nothing
-        end
-      end
+      1. Collaborator#some_method()=>SomeOutput
       """
-
-    When I run the test suite
-    Then I should not see any output saying the stub is unverified

data/lib/verified_double.rb

@@ -12,6 +12,7 @@ require 'verified_double/method_signature/class_value'
 require 'verified_double/method_signature/rspec_double_value'
 require 'verified_double/method_signatures_report'
 require 'verified_double/parse_method_signature'
+require 'verified_double/rspec_mocks_syntax_overrides'
 require 'verified_double/recorded_method_signature'
 require 'verified_double/recorded_method_signature_registry'
 require 'verified_double/simple_double'
@@ -26,7 +27,17 @@ module VerifiedDouble
   end
 
   def self.of_instance(*args)
-    VerifiedDouble.record(double(*args))
+    d = double(*args)
+    simple_double = SimpleDouble.new(d)
+
+    if args[1]
+      args[1].each do |method, return_value|
+        method_signature = simple_double.build_recorded_method_signature(method)
+        method_signature.return_values = [MethodSignature::Value.from(return_value)]
+        VerifiedDouble.registry.insert 0, method_signature
+      end
+    end
+    VerifiedDouble.record(d)
   end
 
   def self.record(a_double)

data/lib/verified_double/recorded_method_signature.rb

@@ -1,6 +1,11 @@
 module VerifiedDouble
   class RecordedMethodSignature < MethodSignature
-    attr_accessor :stack_frame
+    attr_reader :stack_frame
+
+    def initialize(*args)
+      @stack_frame = StackFrame.new(caller(0).detect{|line| line =~ /_spec\.rb/ })
+      super(*args)
+    end
 
     def to_s
       "#{super}\n  # #{stack_frame}"

data/lib/verified_double/recorded_method_signature_registry.rb

@@ -1,13 +1,14 @@
 module VerifiedDouble
   class RecordedMethodSignatureRegistry < Array
+    attr_accessor :current_double
+
     def add_method_signature(a_double, method)
       simple_double = SimpleDouble.new(a_double)
+      self << simple_double.build_recorded_method_signature(method)
+    end
 
-      self << RecordedMethodSignature.new(
-        class_name: simple_double.class_name,
-        method_operator: simple_double.method_operator,
-        method: method.to_s,
-        stack_frame: StackFrame.new(caller(0).detect{|line| line =~ /_spec\.rb/ }))
+    def add_method_signature_with_current_double(method)
+      add_method_signature(current_double, method)
     end
   end
 end

data/lib/verified_double/rspec_configuration.rb

@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+  config.include VerifiedDouble::Matchers
+
+  config.before do
+    self.extend VerifiedDouble::RSpecMocksSyntaxOverrides
+  end
+  
+  config.after :suite do
+    VerifiedDouble.report_unverified_signatures(self)
+  end
+end

data/lib/verified_double/rspec_mocks_syntax_overrides.rb

@@ -0,0 +1,30 @@
+module VerifiedDouble
+  module RSpecMocksSyntaxOverrides
+    def allow(*args)
+      if args[0].is_a?(VerifiedDouble::CanRecordInteractions)
+        VerifiedDouble.registry.current_double = args[0]
+      else
+        VerifiedDouble.registry.current_double = nil
+      end
+      super(*args)
+    end
+
+    def expect(*args)
+      if args[0].is_a?(VerifiedDouble::CanRecordInteractions)
+        VerifiedDouble.registry.current_double = args[0]
+      else
+        VerifiedDouble.registry.current_double = nil
+      end
+      super(*args)
+    end
+
+    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) }
+      else
+        super(*args)
+      end
+    end
+  end
+end

data/lib/verified_double/simple_double.rb

@@ -6,6 +6,14 @@ module VerifiedDouble
       @internal = internal
     end
 
+    def build_recorded_method_signature(method)
+      RecordedMethodSignature.new(
+        class_name: class_name,
+        method_operator: method_operator,
+        method: method.to_s)
+    end
+
+
     def class_name
       class_double? ? internal.name : internal.instance_variable_get('@name')
     end

data/lib/verified_double/version.rb

@@ -1,3 +1,3 @@
 module VerifiedDouble
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'pry'
 require 'verified_double'
+require 'verified_double/rspec_configuration'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -17,8 +18,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
-  config.after :suite do
-    VerifiedDouble.report_unverified_signatures(self)
-  end
 end

data/spec/verified_double/can_record_interactions_spec.rb

@@ -17,14 +17,14 @@ describe VerifiedDouble::CanRecordInteractions do
 
   describe "#stub(method)" do
     it "appends a new method signature with the method to the registry", verifies_contract: 'Object#stubbed_fake_to_s()' do
-      a_double.stub(:stubbed_fake_to_s)
+      allow(a_double).to receive(:stubbed_fake_to_s)
       expect(VerifiedDouble.registry.last.method).to eq('stubbed_fake_to_s')
     end
   end
 
   describe "#with(*args)" do
     it "sets the args of the last method signature", verifies_contract: 'Object#fake_to_s(Symbol, Symbol)' do
-      a_double.should_receive(:fake_to_s).with(:arg_1, :arg_2)
+      expect(a_double).to receive(:fake_to_s).with(:arg_1, :arg_2)
 
       expect(VerifiedDouble.registry.last.args).to be_all{|arg| arg.is_a?(VerifiedDouble::MethodSignature::Value) }
       expect(VerifiedDouble.registry.last.args.map(&:content)).to eq([:arg_1, :arg_2])
@@ -35,7 +35,7 @@ describe VerifiedDouble::CanRecordInteractions do
 
   describe "#and_return(return_value)" do
     it "sets the return value of the last method signature", verifies_contract: 'Object#fake_to_s(Symbol, Symbol)=>Symbol' do
-      a_double.should_receive(:fake_to_s).with(:arg_1, :arg_2).and_return(:return_value)
+      expect(a_double).to receive(:fake_to_s).with(:arg_1, :arg_2).and_return(:return_value)
 
       expect(VerifiedDouble.registry.last.return_values).to have(1).return_value
       expect(VerifiedDouble.registry.last.return_values.first).to be_a(VerifiedDouble::MethodSignature::Value)

data/spec/verified_double/method_signatures_report_spec.rb

@@ -15,28 +15,21 @@ 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(:verified_double_module){
       stub_const('VerifiedDouble', Class.new, transfer_nested_constants: true) }
 
-    context "with multiple signatures in the registry" do
-      it "sets the signatures from the registry" do
-        verified_double_module
-          .should_receive(:registry)
-          .and_return([method_signature_1, method_signature_2])
-
-        expect(subject.set_registered_signatures.registered_signatures.to_a).to eq(
-          [method_signature_1, method_signature_2])
-      end
-    end
+    it "sets distinct signatures from the registry" do
+      verified_double_module
+        .should_receive(:registry)
+        .at_least(:once)
+        .and_return(registry)
 
-    context "with duplicate signatures" do
-      it "returns distinct method signatures" do
-        verified_double_module
-          .should_receive(:registry)
-          .and_return([method_signature_1, method_signature_1])
+      expect(registry).to receive(:uniq).and_return(registry)
 
-        expect(subject.set_registered_signatures.registered_signatures).to eq([method_signature_1])
-      end
+      expect(subject.set_registered_signatures.registered_signatures).to eq(registry)
     end
   end
 
@@ -66,13 +59,13 @@ describe VerifiedDouble::MethodSignaturesReport do
         .stub_chain(:class, :descendant_filtered_examples)
         .and_return([example_with_verified_contract_tag, example_without_verified_contract_tag])
 
-      parse_method_signature_service_class
-        .should_receive(:new)
+      expect(parse_method_signature_service_class)
+        .to receive(:new)
         .with(example_with_verified_contract_tag.metadata[:verifies_contract])
         .and_return(parse_method_signature_service)
 
-      parse_method_signature_service
-        .should_receive(:execute)
+      expect(parse_method_signature_service)
+        .to receive(:execute)
         .and_return(method_signature)
 
       expect(subject.verified_signatures_from_tags).to eq([method_signature])
@@ -83,14 +76,14 @@ describe VerifiedDouble::MethodSignaturesReport do
         .stub_chain(:class, :descendant_filtered_examples)
         .and_return([example_with_verified_contract_tag, example_with_verified_contract_tag])
 
-      parse_method_signature_service_class
-        .should_receive(:new)
+      expect(parse_method_signature_service_class)
+        .to receive(:new)
         .with(example_with_verified_contract_tag.metadata[:verifies_contract])
         .at_least(:once)
         .and_return(parse_method_signature_service)
 
-      parse_method_signature_service
-        .should_receive(:execute)
+      expect(parse_method_signature_service)
+        .to receive(:execute)
         .and_return(method_signature)
 
       expect(subject.verified_signatures_from_tags).to eq([method_signature])
@@ -168,7 +161,7 @@ describe VerifiedDouble::MethodSignaturesReport do
           "2. #{unverified_signatures[1].recommended_verified_signature}",
           "For more info, check out https://www.relishapp.com/gsmendoza/verified-double." ]
 
-        subject.should_receive(:puts).with(lines.join("\n\n"))
+        expect(subject).to receive(:puts).with(lines.join("\n\n"))
         subject.output_unverified_signatures
       end
     end
@@ -180,9 +173,17 @@ describe VerifiedDouble::MethodSignaturesReport do
 
     let(:method_signature) { VerifiedDouble::MethodSignature.new }
 
+    let(:registry){
+      double(:registry, 'current_double' => nil, 'current_double=' => nil) }
+
     it "works" do
       verified_double_module
-        .should_receive(:verified_signatures_from_matchers)
+        .should_receive(:registry)
+        .at_least(:once)
+        .and_return(registry)
+    
+      expect(verified_double_module)
+        .to receive(:verified_signatures_from_matchers)
         .and_return([method_signature])
 
       expect(subject.set_verified_signatures_from_matchers.verified_signatures_from_matchers)

data/spec/verified_double/recorded_method_signature_registry_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe VerifiedDouble::RecordedMethodSignatureRegistry do
+  let(:class_name){ 'Object' }
+  let(:a_double){ double(class_name) }
+  let(:method){ :fake_to_s }
+
   describe "#add_method_signature(a_double, method)" do
-    let(:class_name){ 'Object' }
-    let(:a_double){ double(class_name) }
-    let(:method){ :fake_to_s }
-    
-    it "adds a method signture matching the method to itself" do
+    it "adds a method signature for the method of the double" do
       expect(subject).to be_empty
       
       subject.add_method_signature(a_double, method)
@@ -17,11 +17,21 @@ describe VerifiedDouble::RecordedMethodSignatureRegistry do
       expect(method_signature.method_operator).to eq('#')
       expect(method_signature.method).to eq(method.to_s)
     end
+  end
 
-    it "records the stack frames of the double's caller" do
-      subject.add_method_signature(a_double, method)
-      expect(subject.first.stack_frame.to_s)
-        .to include("./spec/verified_double/recorded_method_signature_registry_spec.rb")
+  describe "#add_method_signature_with_current_double(method)" do
+    it "adds a method signature for the method of the current double" do
+      subject.current_double = a_double
+      
+      expect(subject).to be_empty
+      
+      subject.add_method_signature_with_current_double(method)
+
+      expect(subject).to have(1).method_signature
+      method_signature = subject[0]
+      expect(method_signature.class_name).to eq(class_name)
+      expect(method_signature.method_operator).to eq('#')
+      expect(method_signature.method).to eq(method.to_s)
     end
   end
 end

data/spec/verified_double/recorded_method_signature_spec.rb

@@ -4,12 +4,9 @@ describe VerifiedDouble::RecordedMethodSignature do
   class Dummy
   end
 
-  let(:stack_frame_string){ "./lib/verified_double/method_signature.rb:7:in `block in initialize'" }
-
   let(:attributes){
     { class_name:  'Dummy',
-      method_operator: '#',
-      stack_frame: VerifiedDouble::StackFrame.new(stack_frame_string) } }
+      method_operator: '#' } }
 
   subject {
     described_class.new(attributes).tap {|method_signature|
@@ -17,7 +14,14 @@ describe VerifiedDouble::RecordedMethodSignature do
 
   describe "#to_s" do
     it "includes the stack frame" do
-      expect(subject.to_s).to include(stack_frame_string)
+      expect(subject.to_s).to include(subject.stack_frame.to_s)
+    end
+  end
+
+  describe "#initialize" do
+    it "set the stack frame of the signature's caller" do
+      expect(subject.stack_frame.to_s)
+        .to include("./spec/verified_double/recorded_method_signature_spec.rb")
     end
   end
 end

data/spec/verified_double/rspec_mocks_syntax_overrides_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe VerifiedDouble::RSpecMocksSyntaxOverrides do
+  let(:some_method){ 'fake_to_s' }
+  let(:some_result){ 'result' }
+
+  describe "#expect(*args)" do
+    context "where the double arg records VerifiedDouble interactions" do
+      let(:a_double) { VerifiedDouble.of_instance('Object') }
+
+      it "sets the registry's current_double to the first arg", verifies_contract: 'Object#fake_to_s()=>String' do
+        expect(VerifiedDouble.registry.current_double).to_not eq(a_double)
+        expect(a_double)
+        VerifiedDouble.registry.current_double.should eq(a_double)
+      end
+    end
+
+    context "where the double arg does not record VerifiedDouble interactions" do
+      let(:a_double) { double('Object') }
+
+      it "doesn't set the registry's current_double" do
+        expect(VerifiedDouble.registry.current_double).to_not equal(a_double)
+        expect(a_double)
+        expect(VerifiedDouble.registry.current_double).to be_nil
+      end
+    end
+  end
+
+  describe "#allow(*args)" do
+    context "where the double arg records VerifiedDouble interactions" do
+      let(:a_double) { VerifiedDouble.of_instance('Object') }
+
+      it "sets the registry's current_double to the first arg", verifies_contract: 'Object#fake_to_s()=>String' do
+        expect(VerifiedDouble.registry.last).to_not eq(a_double)
+        allow(a_double)
+        VerifiedDouble.registry.current_double.should eq(a_double)
+      end
+    end
+
+    context "where the double arg does not record VerifiedDouble interactions" do
+      let(:a_double) { double('Object') }
+
+      it "clears registry's current_double" do
+        expect(VerifiedDouble.registry.current_double).to_not equal(a_double)
+        allow(a_double)
+        expect(VerifiedDouble.registry.current_double).to be_nil
+      end
+    end
+  end
+
+  describe "#receive(*args)" do
+    context "where the current double is recording VerifiedDouble interactions" do
+      let(:a_double) { VerifiedDouble.of_instance('Object') }
+
+      it "adds the first arg as a method signature for the current double" do
+        expect(a_double).to receive(some_method).and_return(some_result)
+
+        method_signature = VerifiedDouble.registry.last
+        expect(method_signature).to be_a(VerifiedDouble::MethodSignature)
+        expect(method_signature.method).to eq(some_method)
+        expect(method_signature.return_values.map(&:content)).to eq([some_result])
+
+        a_double.fake_to_s
+      end
+    end
+
+    context "where the current double is not recording VerifiedDouble interactions" do
+      let(:a_double) { double('Object') }
+
+      it "doesn't add a method signature for the method" do
+        registry_size = VerifiedDouble.registry.size
+        expect(a_double).to receive(some_method).and_return(some_result)
+
+        expect(VerifiedDouble.registry.size).to eq(registry_size)
+        a_double.fake_to_s
+      end
+    end
+  end
+end

data/spec/verified_double/simple_double_spec.rb

@@ -54,4 +54,16 @@ describe VerifiedDouble::SimpleDouble do
       end
     end
   end
+
+  describe "#build_record_method_signature(method)" do
+    let(:method){ :fake_to_s }
+    subject { simple_instance_double.build_recorded_method_signature(method) }
+
+    it "returns a method signature for the method of the double" do
+      expect(subject).to be_a(VerifiedDouble::RecordedMethodSignature)
+      expect(subject.class_name).to eq(class_name)
+      expect(subject.method_operator).to eq('#')
+      expect(subject.method).to eq(method.to_s)
+    end
+  end
 end

data/spec/verified_double_spec.rb

@@ -48,6 +48,33 @@ describe VerifiedDouble do
       it "stubs the methods of the instance" do
         expect(subject.send(stubbed_method)).to eq(assumed_output)
       end
+
+      it "inserts a new method signature with the method as the FIRST item of the registry" do
+        # so that it doesn't interfere with the current VerifiedDouble.registry.last
+        subject
+        expect(VerifiedDouble.registry.first).to be_a(VerifiedDouble::RecordedMethodSignature)
+        expect(VerifiedDouble.registry.first.method).to eq(stubbed_method.to_s)
+      end
+
+      context "where the double is an value of an expectation" do
+        let(:parent){ VerifiedDouble.of_instance('Object') }
+        let(:parent_method){ :parent_method }
+        let(:parent_output){ :parent_output }
+        
+        it "should not interfere with the method signature recording of the expectation", verifies_contract: 'Object#parent_method(Object)=>Symbol' do
+          expect(parent).to receive(parent_method).with(subject).and_return(parent_output)
+
+          parent_method_signature =
+            VerifiedDouble.registry
+              .select{|s|
+                s.args[0].try(:content) == subject &&
+                s.return_values[0].try(:content) == parent_output }
+
+          expect(parent_method_signature).to be_present
+
+          parent.send(:parent_method, subject)
+        end
+      end
     end
   end
 
@@ -79,7 +106,7 @@ describe VerifiedDouble do
         .stub_chain(:class, :descendant_filtered_examples)
         .and_return([])
 
-      method_signatures_report_class.should_receive(:new).and_return(method_signatures_report)
+      expect(method_signatures_report_class).to receive(:new).and_return(method_signatures_report)
 
       actions = [
         :set_registered_signatures,
@@ -90,8 +117,8 @@ describe VerifiedDouble do
         :output_unverified_signatures]
 
       actions.each do |action|
-        method_signatures_report
-          .should_receive(action)
+        expect(method_signatures_report)
+          .to receive(action)
           .and_return(method_signatures_report)
       end
 

metadata

@@ -2,14 +2,14 @@
 name: verified_double
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -128,6 +128,8 @@ files:
 - lib/verified_double/parse_method_signature.rb
 - lib/verified_double/recorded_method_signature.rb
 - lib/verified_double/recorded_method_signature_registry.rb
+- lib/verified_double/rspec_configuration.rb
+- lib/verified_double/rspec_mocks_syntax_overrides.rb
 - lib/verified_double/simple_double.rb
 - lib/verified_double/stack_frame.rb
 - lib/verified_double/version.rb
@@ -144,6 +146,7 @@ files:
 - spec/verified_double/parse_method_signature_spec.rb
 - spec/verified_double/recorded_method_signature_registry_spec.rb
 - spec/verified_double/recorded_method_signature_spec.rb
+- spec/verified_double/rspec_mocks_syntax_overrides_spec.rb
 - spec/verified_double/simple_double_spec.rb
 - spec/verified_double/stack_frame_spec.rb
 - spec/verified_double_spec.rb
@@ -196,6 +199,7 @@ test_files:
 - spec/verified_double/parse_method_signature_spec.rb
 - spec/verified_double/recorded_method_signature_registry_spec.rb
 - spec/verified_double/recorded_method_signature_spec.rb
+- spec/verified_double/rspec_mocks_syntax_overrides_spec.rb
 - spec/verified_double/simple_double_spec.rb
 - spec/verified_double/stack_frame_spec.rb
 - spec/verified_double_spec.rb