Merge branch 'myronmarston-test_double_module'

.travis.yml

@@ -10,3 +10,4 @@ rvm:
 gemfile:
   - spec/gemfiles/rspec25
   - spec/gemfiles/rspec-latest
+  - spec/gemfiles/rspec-master

lib/rspec/fire.rb

@@ -193,8 +193,20 @@ def self.build(doubled_class, stubs = {})
           @__checked_methods = :public_methods
           @__method_finder   = :method
 
-          stubs.each do |message, response|
-            stub(message).and_return(response)
+          # TestDouble was added after rspec 2.9.0, and allows proper mocking
+          # of public methods that have clashing private methods. See spec for
+          # details.
+          if defined?(::RSpec::Mocks::TestDouble)
+            ::RSpec::Mocks::TestDouble.extend_onto self,
+              doubled_class, stubs.merge(:__declared_as => "FireClassDouble")
+          else
+            stubs.each do |message, response|
+              stub(message).and_return(response)
+            end
+
+            def self.method_missing(name, *args)
+              __mock_proxy.raise_unexpected_message_error(name, *args)
+            end
           end
 
           def self.as_replaced_constant(options = {})
@@ -214,10 +226,6 @@ def self.inspect
           def self.name
             @__doubled_class_name
           end
-
-          def self.method_missing(name, *args)
-            __mock_proxy.raise_unexpected_message_error(name, *args)
-          end
         end
       end
 

spec/fire_double_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+def use; end
+private :use
+
 TOP_LEVEL_VALUE_CONST = 7
 
 RSpec::Mocks::Space.class_eval do
@@ -34,6 +37,10 @@ class Nested
     class NestedEvenMore
     end
   end
+
+  def self.use
+    raise "Y U NO MOCK?"
+  end
 end
 
 shared_examples_for 'a fire-enhanced double method' do
@@ -178,6 +185,16 @@ def fail_for_arguments(expected, actual)
     double.a.should eq(5)
     double.b.should eq(8)
   end
+
+  it 'allows private methods to be stubbed, just like on a normal test double (but unlike a partial mock)' do
+    mod = Module.new
+    mod.stub(:use)
+    expect { mod.use }.to raise_error(/private method `use' called/)
+
+    fire_double = fire_class_double("TestClass")
+    fire_double.stub(:use)
+    fire_double.use # should not raise an error
+  end if defined?(::RSpec::Mocks::TestDouble)
 end
 
 def reset_rspec_mocks

spec/gemfiles/rspec-master

@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'rspec'
+gem 'rspec-mocks', :git => 'git://github.com/rspec/rspec-mocks.git'
+
+gemspec :path => '../../'