rspec-mocks 2.0.0.a5 → 2.0.0.a6

data/lib/rspec/mocks/proxy.rb

@@ -102,6 +102,8 @@ module Rspec
         elsif expectation = find_almost_matching_expectation(sym, *args)
           expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
+        elsif @target.is_a?(Class)
+          @target.superclass.send(sym, *args, &block)
         else
           @target.__send__ :method_missing, sym, *args, &block
         end

data/lib/rspec/mocks/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a5'
+        PRE    = 'a6'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.a5"
+  s.version = "2.0.0.a6"
 
   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-02-07}
+  s.date = %q{2010-02-15}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/bug_report_8165_spec.rb",
      "spec/rspec/mocks/bug_report_8302_spec.rb",
      "spec/rspec/mocks/bug_report_830_spec.rb",
+     "spec/rspec/mocks/bug_report_957_spec.rb",
      "spec/rspec/mocks/failing_argument_matchers_spec.rb",
      "spec/rspec/mocks/hash_including_matcher_spec.rb",
      "spec/rspec/mocks/hash_not_including_matcher_spec.rb",
@@ -101,6 +102,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/bug_report_8165_spec.rb",
      "spec/rspec/mocks/bug_report_8302_spec.rb",
      "spec/rspec/mocks/bug_report_830_spec.rb",
+     "spec/rspec/mocks/bug_report_957_spec.rb",
      "spec/rspec/mocks/failing_argument_matchers_spec.rb",
      "spec/rspec/mocks/hash_including_matcher_spec.rb",
      "spec/rspec/mocks/hash_not_including_matcher_spec.rb",
@@ -131,21 +133,21 @@ 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.a5"])
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a6"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a5"])
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a6"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<flexmock>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a5"])
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a6"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<flexmock>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])

data/spec/rspec/mocks/bug_report_496_spec.rb

@@ -8,10 +8,8 @@ module BugReport496
   end
 
   describe "a message expectation on a base class object" do
-    pending "should correctly pick up message sent to it subclass (awaiting fix for http://rspec.lighthouseapp.com/projects/5645/tickets/496)" do
-      BaseClass.should_receive(:new).once
-      SubClass.new
-    end
+    BaseClass.should_receive(:new).once
+    SubClass.new
   end
 end
 

data/spec/rspec/mocks/bug_report_957_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Spec
+  module Mocks
+    describe "stubbing a base class class method" do
+      before do
+        @base_class     = Class.new
+        @concrete_class = Class.new(@base_class)
+
+        @base_class.stub!(:find).and_return "stubbed_value"
+      end
+
+      it "should return the value for the stub on the base class" do
+        @base_class.find.should == "stubbed_value"
+      end
+
+      it "should return the value for the descendent class" do
+        @concrete_class.find.should == "stubbed_value"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -43,7 +43,7 @@ module Rspec
   end
 end
 
-Rspec::Core.configure do |config|
+Rspec.configure do |config|
   config.mock_with :rspec
   config.color_enabled = true
   config.extend(Macros)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a5
+  version: 2.0.0.a6
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -04:00
+date: 2010-02-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a5
+        version: 2.0.0.a6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-expectations
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a5
+        version: 2.0.0.a6
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -112,6 +112,7 @@ files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_8302_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
+- spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/hash_not_including_matcher_spec.rb
@@ -180,6 +181,7 @@ test_files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_8302_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
+- spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
 - spec/rspec/mocks/hash_not_including_matcher_spec.rb