rspec-mocks 2.0.0.beta.15 → 2.0.0.beta.16

data/Gemfile

@@ -1,7 +1,7 @@
 gem "rake"
 gem "jeweler"
 gem "cucumber"
-gem "aruba"
+gem "aruba", :git => "git://github.com/dchelimsky/aruba.git", :branch => "add-gemspec"
 gem "autotest"
 gem "rspec-mocks", :path => "."
 gem "rspec-core", :path => "../rspec-core"

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.15
+2.0.0.beta.16

data/cucumber.yml

@@ -1,7 +1,2 @@
-<%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --require features --format rerun --out rerun.txt --strict --tags ~@wip"
-%>
-default: <%= std_opts %>
-wip: --tags @wip:3 --wip features
+default: --require features --tags ~@wip features
+wip: --require features --tags @wip:3 --wip features

data/features/README.markdown

@@ -0,0 +1,12 @@
+# Cucumber features
+
+RSpec is specified using both RSpec and
+[Cucumber](http://github.com/aslakhellesoy/cucumber). Cucumber provides
+_executable documentation_.  This means that the _.feature_ files below this
+directory serve as specification, documentation _and_ regression tests of the
+behaviour.
+
+## Issues
+
+If you find this documentation incomplete or confusing, please [submit an
+issue](http://github.com/rspec/rspec-mocks/issues).

data/features/configuration.feature

@@ -0,0 +1,82 @@
+Feature: configure a test frawework to use rspec-mocks
+
+  Test frameworks that want to use rspec-mocks can use
+  RSpec::Mocks::setup(self) to hook into rspec-mocks. Doing so adds the
+  following:
+
+    To the object passed to setup:
+
+      double # creates a test double
+      mock   # creates a test double
+      stub   # creates a test double
+
+    To every object in the system:
+
+      should_receive
+      should_not_receive
+      stub
+      
+  In order to give control to the consuming framework, none of these facilities
+  are added until RSpec::Mocks::setup(self) is called. Simply requiring
+  'rspec/mocks' is not sufficient. 
+
+  NOTICE: the stub() method that is added to the object passed to setup is not
+  the same stub() method that is added to every other object.
+
+  Scenario: RSpec::Mocks::setup(object) adds double, mock, and stub methods to the submitted object
+    Given a file named "foo.rb" with:
+      """
+      require 'rspec/mocks'
+
+      class CodeExample
+        def init
+          RSpec::Mocks::setup(self)
+        end
+      end
+
+      example = CodeExample.new
+      example.init
+
+      puts example.respond_to?(:double)
+      puts example.respond_to?(:mock)
+      puts example.respond_to?(:stub)
+      """
+
+    When I run "ruby foo.rb"
+    Then the output should contain "true"
+    But  the output should not contain "false"
+
+  Scenario: RSpec::Mocks::setup(anything) adds methods to Object
+    Given a file named "foo.rb" with:
+      """
+      require 'rspec/mocks'
+
+      RSpec::Mocks::setup(Object.new)
+
+      obj = Object.new
+
+      puts obj.respond_to?(:should_receive)
+      puts obj.respond_to?(:should_not_receive)
+      puts obj.respond_to?(:stub)
+      """
+
+    When I run "ruby foo.rb"
+    Then the output should contain "true"
+    But  the output should not contain "false"
+
+  Scenario: require "rspec/mocks" does not add methods to Object
+    Given a file named "foo.rb" with:
+      """
+      require 'rspec/mocks'
+
+      obj = Object.new
+
+      puts obj.respond_to?(:should_receive)
+      puts obj.respond_to?(:should_not_receive)
+      puts obj.respond_to?(:stub)
+      """
+
+    When I run "ruby foo.rb"
+    Then the output should contain "false"
+    But  the output should not contain "true"
+

data/features/mocks/block_local_expectations.feature

@@ -30,7 +30,7 @@ Feature: block local expectations
       end
       """
     When I run "rspec ./spec/account_passing_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
     
   Scenario: failing example
     
@@ -51,4 +51,4 @@ Feature: block local expectations
       """
 
     When I run "rspec ./spec/account_failing_spec.rb"
-    Then I should see "1 example, 1 failure"
+    Then the output should contain "1 example, 1 failure"

data/features/mocks/warn_when_expectation_is_set_on_nil.feature

@@ -12,7 +12,7 @@ Feature: warn when expectation is set on nil
       end
       """
     When I run "rspec ./example_spec.rb"
-    Then I should see "An expectation of :foo was set on nil"
+    Then the output should contain "An expectation of :foo was set on nil"
 
   Scenario: allow
     Given a file named "example_spec.rb" with:
@@ -27,7 +27,7 @@ Feature: warn when expectation is set on nil
       end
       """
     When I run "rspec ./example_spec.rb"
-    Then I should not see "An expectation"
+    Then the output should not contain "An expectation"
 
   Scenario: allow in one example, but not on another
     Given a file named "example_spec.rb" with:
@@ -46,5 +46,5 @@ Feature: warn when expectation is set on nil
       end
       """
     When I run "rspec ./example_spec.rb"
-    Then I should see "An expectation of :bar"
-    And  I should not see "An expectation of :foo"
+    Then the output should contain "An expectation of :bar"
+    And  the output should not contain "An expectation of :foo"

data/features/stubs/stub_implementation.feature

@@ -27,4 +27,4 @@ Feature: stub implementation
       end
       """
     When I run "rspec ./stub_implementation_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/lib/rspec/mocks.rb

@@ -1,5 +1,4 @@
 require 'rspec/mocks/framework'
-require 'rspec/mocks/extensions/object'
 require 'rspec/mocks/version'
 
 module RSpec
@@ -19,7 +18,7 @@ module RSpec
   #   double.stub(:title) { "The RSpec Book" }
   #   double.title => "The RSpec Book"
   #
-  # When we declare a stub, we way we "stubbing" a method.
+  # When we declare a stub, we say we are "stubbing" a method.
   #
   # == Message Expectations
   #
@@ -32,7 +31,7 @@ module RSpec
   #   zipcode = Zipcode.new("02134", validator)
   #   zipcode.valid?
   #   
-  # When we declare a message expectation, we way we "mocking" a method.
+  # When we declare a message expectation, we say we are "mocking" a method.
   #
   # == Mock Objects and Test Stubs
   #
@@ -173,5 +172,25 @@ module RSpec
   # * Test Double Patterns: http://xunitpatterns.com/Test%20Double%20Patterns.html
   # * Mocks aren't stubs: http://www.martinfowler.com/articles/mocksArentStubs.html
   module Mocks
+    class << self
+      attr_accessor :space
+
+      def setup(includer)
+        require 'rspec/mocks/extensions/object'
+        require 'rspec/mocks/spec_methods'
+        (class << includer; self; end).class_eval do
+          include RSpec::Mocks::ExampleMethods
+        end
+        self.space ||= RSpec::Mocks::Space.new
+      end
+
+      def verify
+        space.verify_all
+      end
+
+      def teardown
+        space.reset_all
+      end
+    end
   end
 end

data/lib/rspec/mocks/extensions.rb

@@ -1 +0,0 @@
-require 'rspec/mocks/extensions/object'

data/lib/rspec/mocks/framework.rb

@@ -2,10 +2,10 @@
 # supports wrapping rspec's mocking functionality without invading every
 # object in the system.
 
+require 'rspec/mocks/extensions/instance_exec'
 require 'rspec/mocks/method_double'
 require 'rspec/mocks/methods'
 require 'rspec/mocks/argument_matchers'
-require 'rspec/mocks/spec_methods'
 require 'rspec/mocks/proxy'
 require 'rspec/mocks/mock'
 require 'rspec/mocks/argument_expectation'

data/lib/rspec/mocks/message_expectation.rb

@@ -88,7 +88,6 @@ module RSpec
         end
         
         if block
-          require 'rspec/mocks/extensions/instance_exec'
           @eval_context = Object.new
           @eval_context.extend RSpec::Mocks::InstanceExec
           yield @eval_context

data/lib/rspec/mocks/method_double.rb

@@ -55,7 +55,7 @@ module RSpec
       end
 
       def configure_method
-        $rspec_mocks.add(@object) if $rspec_mocks
+        RSpec::Mocks::space.add(@object) if RSpec::Mocks::space
         warn_if_nil_class
         unless @stashed
           stash_original_method
@@ -64,14 +64,12 @@ module RSpec
       end
 
       def stash_original_method
-        if object_responds_to?(@method_name)
-          stashed = stashed_method_name
-          orig = @method_name
-          object_singleton_class.class_eval do
-            alias_method(stashed, orig) if method_defined?(orig) || private_method_defined?(orig)
-          end
-          @stashed = true
+        stashed = stashed_method_name
+        orig = @method_name
+        object_singleton_class.class_eval do
+          alias_method(stashed, orig) if method_defined?(orig) || private_method_defined?(orig)
         end
+        @stashed = true
       end
 
       def define_proxy_method

data/lib/rspec/mocks/proxy.rb

@@ -15,7 +15,7 @@ module RSpec
           
           # ensure nil.rspec_verify is called even if an expectation is not set in the example
           # otherwise the allowance would effect subsequent examples
-          $rspec_mocks.add(nil) unless $rspec_mocks.nil?
+          RSpec::Mocks::space.add(nil) unless RSpec::Mocks::space.nil?
         end
 
         def allow_message_expectations_on_nil?

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.15"
+  s.version = "2.0.0.beta.16"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-06}
   s.description = %q{RSpec's 'test double' framework, with support for stubbing and mocking}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "autotest/discover.rb",
      "cucumber.yml",
+     "features/README.markdown",
+     "features/configuration.feature",
      "features/mocks/block_local_expectations.feature",
-     "features/mocks/mix_stubs_and_mocks.feature",
      "features/mocks/warn_when_expectation_is_set_on_nil.feature",
      "features/stubs/stub_implementation.feature",
      "features/support/env.rb",
@@ -92,6 +93,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/stub_spec.rb",
      "spec/rspec/mocks/stubbed_message_expectations_spec.rb",
      "spec/rspec/mocks/twice_counts_spec.rb",
+     "spec/rspec/mocks_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/macros.rb",
      "specs.watchr"
@@ -99,7 +101,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/mocks}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-mocks-2.0.0.beta.15
+  Thank you for installing rspec-mocks-2.0.0.beta.16
   
 **************************************************
 }
@@ -107,7 +109,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-mocks-2.0.0.beta.15}
+  s.summary = %q{rspec-mocks-2.0.0.beta.16}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -150,6 +152,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/stub_spec.rb",
      "spec/rspec/mocks/stubbed_message_expectations_spec.rb",
      "spec/rspec/mocks/twice_counts_spec.rb",
+     "spec/rspec/mocks_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/macros.rb"
   ]
@@ -159,15 +162,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.15"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.15"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.16"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.16"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.15"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.15"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.16"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.16"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.15"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.15"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.16"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.16"])
   end
 end
 

data/spec/rspec/mocks/bug_report_957_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Spec
+module RSpec
   module Mocks
     describe "stubbing a base class class method" do
       before do

data/spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb

@@ -1,66 +1,94 @@
 require 'spec_helper'
 
-module RSpec
-module Mocks
-describe "PartialMockUsingMocksDirectly" do
-    before(:each) do
-      
-        klass=Class.new
-        klass.class_eval do
-          def existing_method
-            :original_value
+module RSpec::Mocks
+  describe "PartialMockUsingMocksDirectly" do
+    let(:klass) do
+      Class.new do
+        module MethodMissing
+          def method_missing(m, *a, &b)
+            if m == :captured_by_method_missing
+              "response generated by method missing"
+            else
+              super(m, *a, &b)
+            end
           end
         end
-        @obj = klass.new
-      
+
+        extend MethodMissing
+        include MethodMissing
+
+        def existing_method
+          :original_value
+        end
+
+      end
     end
-    
+
+    let(:obj) { klass.new }
+
     # See http://rubyforge.org/tracker/index.php?func=detail&aid=10263&group_id=797&atid=3149
     # specify "should clear expectations on verify" do
-    #     @obj.should_receive(:msg)
-    #     @obj.msg
-    #     @obj.rspec_verify
+    #     obj.should_receive(:msg)
+    #     obj.msg
+    #     obj.rspec_verify
     #     lambda do
-    #       @obj.msg
+    #       obj.msg
     #     end.should raise_error(NoMethodError)
     #   
     # end
-    it "should fail when expected message is not received" do
-        @obj.should_receive(:msg)
-        lambda do
-          @obj.rspec_verify
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
-      
+    it "fails when expected message is not received" do
+      obj.should_receive(:msg)
+      lambda do
+        obj.rspec_verify
+      end.should raise_error(RSpec::Mocks::MockExpectationError)
+    end
+
+    it "fails when message is received with incorrect args" do
+      obj.should_receive(:msg).with(:correct_arg)
+      lambda do
+        obj.msg(:incorrect_arg)
+      end.should raise_error(RSpec::Mocks::MockExpectationError)
+      obj.msg(:correct_arg)
     end
-    it "should fail when message is received with incorrect args" do
-        @obj.should_receive(:msg).with(:correct_arg)
-        lambda do
-          @obj.msg(:incorrect_arg)
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
-        @obj.msg(:correct_arg)
-      
+
+    it "passes when expected message is received" do
+      obj.should_receive(:msg)
+      obj.msg
+      obj.rspec_verify
+    end
+
+    it "passes when message is received with correct args" do
+      obj.should_receive(:msg).with(:correct_arg)
+      obj.msg(:correct_arg)
+      obj.rspec_verify
     end
-    it "should pass when expected message is received" do
-        @obj.should_receive(:msg)
-        @obj.msg
-        @obj.rspec_verify
-      
+
+    it "should restore original method if existed" do
+      obj.existing_method.should equal(:original_value)
+      obj.should_receive(:existing_method).and_return(:mock_value)
+      obj.existing_method.should equal(:mock_value)
+      obj.rspec_verify
+      obj.existing_method.should equal(:original_value)
     end
-    it "should pass when message is received with correct args" do
-        @obj.should_receive(:msg).with(:correct_arg)
-        @obj.msg(:correct_arg)
-        @obj.rspec_verify
-      
+
+    context "with an instance method handled by method_missing" do
+      it "restores the original behavior" do
+        obj.captured_by_method_missing.should eq("response generated by method missing")
+        obj.stub(:captured_by_method_missing) { "foo" }
+        obj.captured_by_method_missing.should eq("foo")
+        obj.rspec_reset
+        obj.captured_by_method_missing.should eq("response generated by method missing")
+      end
     end
-    it "should revert to original method if existed" do
-        @obj.existing_method.should equal(:original_value)
-        @obj.should_receive(:existing_method).and_return(:mock_value)
-        @obj.existing_method.should equal(:mock_value)
-        @obj.rspec_verify
-        @obj.existing_method.should equal(:original_value)
-      
+
+    context "with a class method handled by method_missing" do 
+      it "restores the original behavior" do
+        klass.captured_by_method_missing.should eq("response generated by method missing")
+        klass.stub(:captured_by_method_missing) { "foo" }
+        klass.captured_by_method_missing.should eq("foo")
+        klass.rspec_reset
+        klass.captured_by_method_missing.should eq("response generated by method missing")
+      end
     end
-  
-end
-end
+  end
 end

data/spec/rspec/mocks_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe RSpec::Mocks do
+  describe "::setup" do
+    context "with an existing Mock::Space" do
+      before do
+        @orig_space = RSpec::Mocks::space
+      end
+
+      after do
+        RSpec::Mocks::space = @orig_space
+      end
+
+      it "memoizes the space" do
+        RSpec::Mocks::setup(Object.new)
+        space = RSpec::Mocks::space
+        RSpec::Mocks::setup(Object.new)
+        RSpec::Mocks::space.should equal(space)
+      end
+    end
+
+    context "with no pre-existing Mock::Space" do
+      it "initializes a Mock::Space" do
+        RSpec::Mocks::space = nil
+        RSpec::Mocks::setup(Object.new)
+        RSpec::Mocks::space.should_not be_nil
+      end
+    end
+  end
+
+  describe "::verify" do
+    it "delegates to the space" do
+      foo = double
+      foo.should_receive(:bar)
+      expect do
+        RSpec::Mocks::verify
+      end.to raise_error(RSpec::Mocks::MockExpectationError)
+    end
+  end
+
+  describe "::teardown" do
+    it "delegates to the space" do
+      foo = double
+      foo.should_receive(:bar)
+      RSpec::Mocks::teardown
+      expect do
+        foo.bar
+      end.to raise_error(/received unexpected message/)
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 62196477
+  hash: 62196419
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 15
-  version: 2.0.0.beta.15
+  - 16
+  version: 2.0.0.beta.16
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -05:00
+date: 2010-07-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,14 +30,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196477
+        hash: 62196419
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 15
-        version: 2.0.0.beta.15
+        - 16
+        version: 2.0.0.beta.16
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -48,14 +48,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196477
+        hash: 62196419
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 15
-        version: 2.0.0.beta.15
+        - 16
+        version: 2.0.0.beta.16
   requirement: *id002
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -76,8 +76,9 @@ files:
 - VERSION
 - autotest/discover.rb
 - cucumber.yml
+- features/README.markdown
+- features/configuration.feature
 - features/mocks/block_local_expectations.feature
-- features/mocks/mix_stubs_and_mocks.feature
 - features/mocks/warn_when_expectation_is_set_on_nil.feature
 - features/stubs/stub_implementation.feature
 - features/support/env.rb
@@ -142,6 +143,7 @@ files:
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
+- spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros.rb
 - specs.watchr
@@ -152,7 +154,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-mocks-2.0.0.beta.15
+    Thank you for installing rspec-mocks-2.0.0.beta.16
     
   **************************************************
 
@@ -186,7 +188,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.15
+summary: rspec-mocks-2.0.0.beta.16
 test_files: 
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
@@ -229,5 +231,6 @@ test_files:
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
+- spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros.rb

data/features/mocks/mix_stubs_and_mocks.feature

@@ -1,28 +0,0 @@
-Feature: Spec and test together
-
-  As an RSpec user
-  I want to use stubs and mocks together
-
-  Scenario: stub in before
-    Given a file named "stub_and_mocks_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      RSpec.configure do |config|
-        config.mock_framework = :rspec
-      end
-
-      describe "a stub in before" do
-        before(:each) do
-          @messenger = double('messenger').as_null_object
-        end
-
-        it "a" do
-          @messenger.should_receive(:foo).with('first')
-          @messenger.foo('second')
-          @messenger.foo('third')
-        end
-      end
-      """
-    When I run "rspec ./stub_and_mocks_spec.rb -fs"
-    Then I should see "received :foo with unexpected arguments"