rspec-mocks 2.0.0.beta.6 → 2.0.0.beta.7

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.6
+2.0.0.beta.7

data/lib/rspec/mocks/method_double.rb

@@ -57,8 +57,10 @@ module Rspec
       def configure_method
         $rspec_mocks.add(@object) if $rspec_mocks
         warn_if_nil_class
-        stash_original_method
-        define_proxy_method
+        unless @stashed
+          stash_original_method
+          define_proxy_method
+        end
       end
 
       def stash_original_method

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.6"
+  s.version = "2.0.0.beta.7"
 
   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-04-12}
+  s.date = %q{2010-04-17}
   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 = [
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/passing_argument_matchers_spec.rb",
      "spec/rspec/mocks/precise_counts_spec.rb",
      "spec/rspec/mocks/record_messages_spec.rb",
+     "spec/rspec/mocks/stash_spec.rb",
      "spec/rspec/mocks/stub_chain_spec.rb",
      "spec/rspec/mocks/stub_implementation_spec.rb",
      "spec/rspec/mocks/stub_spec.rb",
@@ -97,7 +98,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.6
+  Thank you for installing rspec-mocks-2.0.0.beta.7
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -109,7 +110,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.6}
+  s.summary = %q{rspec-mocks-2.0.0.beta.7}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -146,6 +147,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/passing_argument_matchers_spec.rb",
      "spec/rspec/mocks/precise_counts_spec.rb",
      "spec/rspec/mocks/record_messages_spec.rb",
+     "spec/rspec/mocks/stash_spec.rb",
      "spec/rspec/mocks/stub_chain_spec.rb",
      "spec/rspec/mocks/stub_implementation_spec.rb",
      "spec/rspec/mocks/stub_spec.rb",
@@ -160,15 +162,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.6"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.6"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.7"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.7"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.6"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.6"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.7"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.7"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.6"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.6"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.7"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.7"])
   end
 end
 

data/spec/rspec/mocks/stash_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module Rspec
+  module Mocks
+
+    describe "only stashing the original method" do
+      let(:klass) do
+        Class.new do
+          def self.foo(arg)
+            :original_value
+          end
+        end
+      end
+      it "should keep the original method intact after multiple expectations are added on the same method" do
+        klass.should_receive(:foo).with(:fizbaz).and_return(:wowwow)
+        klass.should_receive(:foo).with(:bazbar).and_return(:okay)
+
+        klass.foo(:fizbaz)
+        klass.foo(:bazbar)
+        klass.rspec_verify
+
+        klass.rspec_reset
+        klass.foo(:yeah).should equal(:original_value)
+      end
+    end
+  end
+end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 6
-  version: 2.0.0.beta.6
+  - 7
+  version: 2.0.0.beta.7
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -05:00
+date: 2010-04-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 7
+        version: 2.0.0.beta.7
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 7
+        version: 2.0.0.beta.7
   type: :development
   version_requirements: *id002
 description: Rspec's 'test double' framework, with support for stubbing and mocking
@@ -130,6 +130,7 @@ files:
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
+- spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
@@ -145,7 +146,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-mocks-2.0.0.beta.6
+    Thank you for installing rspec-mocks-2.0.0.beta.7
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -179,7 +180,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.6
+summary: rspec-mocks-2.0.0.beta.7
 test_files: 
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
@@ -216,6 +217,7 @@ test_files:
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
+- spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb