Deprecate stub mock

lib/rspec/mocks/example_methods.rb

@@ -31,13 +31,15 @@ def double(*args)
         declare_double('Double', *args)
       end
 
-      # Effectively an alias for [double](#double-instance_method).
+      # Deprecated: Use [double](#double-instance_method).
       def mock(*args)
+        RSpec::Mocks.warn_deprecation "\nDEPRECATION: use #double instead of #mock. #{caller(0)[1]}\n"
         declare_double('Mock', *args)
       end
 
-      # Effectively an alias for [double](#double-instance_method).
+      # Deprecated: Use [double](#double-instance_method).
       def stub(*args)
+        RSpec::Mocks.warn_deprecation "\nDEPRECATION: use #double instead of #stub. #{caller(0)[1]}\n"
         declare_double('Stub', *args)
       end
 

spec/rspec/mocks/double_spec.rb

@@ -4,9 +4,21 @@
   it "is an alias for stub and mock" do
     expect(double()).to be_a(RSpec::Mocks::Mock)
   end
-  
+
   it "uses 'Double' in failure messages" do
     double = double('name')
     expect {double.foo}.to raise_error(/Double "name" received/)
   end
+
+  describe "deprecated aliases" do
+    it "warns if #stub is used" do
+      RSpec::Mocks.should_receive(:warn_deprecation).with(/DEPRECATION: use #double instead of #stub/)
+      stub("TestDouble")
+    end
+
+    it "warns if #mock is used" do
+      RSpec::Mocks.should_receive(:warn_deprecation).with(/DEPRECATION: use #double instead of #mock/)
+      mock("TestDouble")
+    end
+  end
 end

spec/rspec/mocks/partial_mock_spec.rb

@@ -135,7 +135,7 @@ def method_missing(*a)
 
     describe "Partially mocking an object that defines ==, after another mock has been defined" do
       before(:each) do
-        stub("existing mock", :foo => :foo)
+        double("existing mock", :foo => :foo)
       end
 
       let(:klass) do

spec/rspec/mocks/stub_implementation_spec.rb

@@ -5,23 +5,23 @@ module Mocks
     describe "stub implementation" do
       describe "with no args" do
         it "execs the block when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) { :bar }
           expect(obj.foo).to eq :bar
         end
       end
 
       describe "with one arg" do
         it "execs the block with that arg when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) {|given| given}
           expect(obj.foo(:bar)).to eq :bar
         end
       end
 
       describe "with variable args" do
         it "execs the block when called" do
-          obj = stub()
+          obj = double()
           obj.stub(:foo) {|*given| given.first}
           expect(obj.foo(:bar)).to eq :bar
         end