rspec-mocks 2.0.0.beta.12 → 2.0.0.beta.13

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 doc
 tmp
 rerun.txt
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,9 @@
+gem "rake"
+gem "jeweler"
+gem "cucumber"
+gem "aruba"
+gem "autotest"
+gem "rspec-mocks", :path => "."
+gem "rspec-core", :path => "../rspec-core"
+gem "rspec-expectations", :path => "../rspec-expectations"
+gem "ruby-debug"

data/Rakefile

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "bundler"
+Bundler.setup
+
 require 'rake'
 require 'rspec/mocks/version'
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.12
+2.0.0.beta.13

data/features/support/env.rb

@@ -1,2 +1,21 @@
+require 'bundler'
+Bundler.setup
+
 require 'aruba'
 require 'rspec/expectations'
+
+module ArubaOverrides
+  def detect_ruby_script(cmd)
+    if cmd =~ /^rspec /
+      "bundle exec ../../../rspec-core/bin/#{cmd}"
+    elsif cmd =~ /^ruby /
+      "bundle exec #{cmd}"
+    else
+      super(cmd)
+    end
+  end
+end
+
+World(ArubaOverrides)
+
+

data/lib/rspec/mocks/argument_expectation.rb

@@ -6,7 +6,7 @@ module RSpec
       
       def initialize(args, &block)
         @args = args
-        @matchers_block = block
+        @matchers_block = block if args.empty?
         @match_any_args = false
         @matchers = nil
         

data/lib/rspec/mocks/method_double.rb

@@ -68,7 +68,7 @@ module RSpec
           stashed = stashed_method_name
           orig = @method_name
           object_singleton_class.class_eval do
-            alias_method(stashed, orig) if method_defined?(orig)
+            alias_method(stashed, orig) if method_defined?(orig) || private_method_defined?(orig)
           end
           @stashed = true
         end
@@ -91,7 +91,7 @@ module RSpec
           stashed_method_name = self.stashed_method_name
           object_singleton_class.instance_eval do
             remove_method method_name
-            if method_defined?(stashed_method_name)
+            if method_defined?(stashed_method_name) || private_method_defined?(stashed_method_name)
               alias_method method_name, stashed_method_name
               remove_method stashed_method_name
             end
@@ -139,6 +139,11 @@ module RSpec
         stubs.unshift stub
         stub
       end
+      
+      def remove_stub
+        raise_method_not_stubbed_error if stubs.empty?
+        expectations.empty? ? reset : stubs.clear
+      end
 
       def proxy_for_nil_class?
         @object.nil?
@@ -149,6 +154,10 @@ module RSpec
           Kernel.warn("An expectation of :#{@method_name} was set on nil. Called from #{caller[4]}. Use allow_message_expectations_on_nil to disable warnings.")
         end
       end
+      
+      def raise_method_not_stubbed_error
+        raise MockExpectationError, "The method `#{method_name}` was not stubbed or was already unstubbed" 
+      end
 
       def reset_nil_expectations_warning
         RSpec::Mocks::Proxy.warn_about_expectations_on_nil = true if proxy_for_nil_class?

data/lib/rspec/mocks/methods.rb

@@ -17,7 +17,12 @@ module RSpec
         end
       end
       
+      def unstub(sym)
+        __mock_proxy.remove_stub(sym)
+      end
+      
       alias_method :stub!, :stub
+      alias_method :unstub!, :unstub
 
       def stub_chain(*methods)
         if methods.length > 1

data/lib/rspec/mocks/proxy.rb

@@ -65,6 +65,10 @@ module RSpec
         method_double[method_name].add_stub @error_generator, @expectation_ordering, location, opts, &implementation
       end
       
+      def remove_stub(method_name)
+        method_double[method_name].remove_stub
+      end
+      
       def verify #:nodoc:
         method_doubles.each {|d| d.verify}
       ensure

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.12"
+  s.version = "2.0.0.beta.13"
 
   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-14}
+  s.date = %q{2010-06-23}
   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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     ".autotest",
      ".document",
      ".gitignore",
+     "Gemfile",
      "License.txt",
      "README.markdown",
      "Rakefile",
@@ -98,7 +99,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.12
+  Thank you for installing rspec-mocks-2.0.0.beta.13
   
 **************************************************
 }
@@ -106,7 +107,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-mocks-2.0.0.beta.12}
+  s.summary = %q{rspec-mocks-2.0.0.beta.13}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -158,15 +159,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.12"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.13"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.13"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.12"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.13"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.13"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.12"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.13"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.13"])
   end
 end
 

data/spec/rspec/mocks/mock_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe Mock do
-      treats_method_missing_as_private :subject => RSpec::Mocks::Mock.new, :noop => false
-      
       before(:each) do
         @mock = double("test double")
       end
 
+      treats_method_missing_as_private :subject => RSpec::Mocks::Mock.new, :noop => false
+      
       after(:each) do
         @mock.rspec_reset
       end
@@ -597,5 +597,47 @@ module RSpec
         second == first
       end
     end
+
+    describe "with" do
+      before { @mock = double('double') }
+      context "with args" do
+        context "with matching args" do
+          it "passes" do
+            @mock.should_receive(:foo).with('bar')
+            @mock.foo('bar')
+          end
+        end
+
+        context "with non-matching args" do
+          it "fails" do
+            @mock.should_receive(:foo).with('bar')
+            expect do
+              @mock.foo('baz')
+            end.to raise_error
+            @mock.rspec_reset
+          end
+        end
+      end
+
+      context "with a block" do
+        context "with matching args" do
+          it "returns the result of the block" do
+            @mock.should_receive(:foo).with('bar') { 'baz' }
+            @mock.foo('bar').should eq('baz')
+          end
+        end
+
+        context "with non-matching args" do
+          it "fails" do
+            @mock.should_receive(:foo).with('bar') { 'baz' }
+            expect do
+              @mock.foo('wrong').should eq('baz')
+            end.to raise_error(/received :foo with unexpected arguments/)
+            @mock.rspec_reset
+          end
+        end
+      end
+    end
+
   end
 end

data/spec/rspec/mocks/stub_implementation_spec.rb

@@ -24,7 +24,44 @@ module RSpec
           obj = stub()
           obj.stub(:foo) {|*given| given.first}
           obj.foo(:bar).should == :bar
-        end
+        end        
+      end
+    end
+
+  
+    describe "unstub implementation" do      
+      it "should replace the stubbed method with the original method" do
+        obj = Object.new
+        def obj.foo; :original; end
+        obj.stub(:foo)
+        obj.unstub(:foo)
+        obj.foo.should == :original
+      end
+    
+      it "should remove all stubs with the supplied method name" do
+        obj = Object.new
+        def obj.foo; :original; end
+        obj.stub(:foo).with(1)
+        obj.stub(:foo).with(2)
+        obj.unstub(:foo)
+        obj.foo.should == :original
+      end
+    
+      it "should not remove any expectations with the same method name" do
+        obj = Object.new
+        def obj.foo; :original; end
+        obj.should_receive(:foo).with(3).and_return(:three)
+        obj.stub(:foo).with(1)
+        obj.stub(:foo).with(2)
+        obj.unstub(:foo)
+        obj.foo(3).should == :three
+      end
+    
+      it "should raise a MockExpectationError if the method has not been stubbed" do
+        obj = Object.new
+        lambda do
+          obj.unstub(:foo)
+        end.should raise_error(MockExpectationError)
       end
     end
   end

data/spec/rspec/mocks/stub_spec.rb

@@ -5,11 +5,23 @@ module RSpec
     describe "A method stub" do
       before(:each) do
         @class = Class.new do
-          def self.existing_class_method
-            :original_value
+          class << self
+            def existing_class_method
+              existing_private_class_method
+            end
+
+            private
+            def existing_private_class_method
+              :original_value
+            end
           end
 
           def existing_instance_method
+            existing_private_instance_method
+          end
+
+          private
+          def existing_private_instance_method
             :original_value
           end
         end
@@ -90,7 +102,15 @@ module RSpec
         @instance.rspec_verify
         @instance.existing_instance_method.should equal(:original_value)
       end
-      
+
+      it "should revert to original private instance method if there is one" do
+        @instance.existing_instance_method.should equal(:original_value)
+        @instance.stub(:existing_private_instance_method).and_return(:mock_value)
+        @instance.existing_instance_method.should equal(:mock_value)
+        @instance.rspec_verify
+        @instance.existing_instance_method.should equal(:original_value)
+      end
+
       it "should revert to original class method if there is one" do
         @class.existing_class_method.should equal(:original_value)
         @class.stub(:existing_class_method).and_return(:mock_value)
@@ -99,6 +119,14 @@ module RSpec
         @class.existing_class_method.should equal(:original_value)
       end
 
+      it "should revert to original private class method if there is one" do
+        @class.existing_class_method.should equal(:original_value)
+        @class.stub(:existing_private_class_method).and_return(:mock_value)
+        @class.existing_class_method.should equal(:mock_value)
+        @class.rspec_verify
+        @class.existing_class_method.should equal(:original_value)
+      end
+
       it "should yield a specified object" do
         @instance.stub(:method_that_yields).and_yield(:yielded_obj)
         current_value = :value_before

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-$LOAD_PATH << File.expand_path('../../../rspec-core/lib', __FILE__)
-$LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
+require 'bundler'
+Bundler.setup
+
 require 'rspec/core'
 require 'rspec/mocks'
 require 'rspec/expectations'

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 12
-  version: 2.0.0.beta.12
+  - 13
+  version: 2.0.0.beta.13
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,13 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -05:00
+date: 2010-06-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -32,14 +32,14 @@ dependencies:
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
-  type: :development
-  version_requirements: *id001
+        - 13
+        version: 2.0.0.beta.13
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec-expectations
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -48,10 +48,10 @@ dependencies:
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
-  type: :development
-  version_requirements: *id002
+        - 13
+        version: 2.0.0.beta.13
+  requirement: *id002
+  prerelease: false
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -64,6 +64,7 @@ files:
 - .autotest
 - .document
 - .gitignore
+- Gemfile
 - License.txt
 - README.markdown
 - Rakefile
@@ -146,7 +147,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-mocks-2.0.0.beta.12
+    Thank you for installing rspec-mocks-2.0.0.beta.13
     
   **************************************************
 
@@ -176,7 +177,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.12
+summary: rspec-mocks-2.0.0.beta.13
 test_files: 
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb