mocha 1.6.0 → 1.10.1

data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'mocha/not_initialized_error'
 
 class PreventUseOfMochaOutsideTestTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -75,5 +73,4 @@ class PreventUseOfMochaOutsideTestTest < Mocha::TestCase
     klass = Class.new
     assert_raises(Mocha::NotInitializedError) { klass.any_instance.unstub(:expected_method) }
   end
-
 end

data/test/acceptance/raise_exception_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class RaiseExceptionTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -17,9 +15,9 @@ class RaiseExceptionTest < Mocha::TestCase
     exception_class = Class.new(StandardError)
     test_result = run_as_test do
       foo = stub('foo')
-      foo.stubs(:bar).raises(exception_class, "my-message")
+      foo.stubs(:bar).raises(exception_class, 'my-message')
       exception = assert_raises(exception_class) { foo.bar }
-      assert_equal "my-message", exception.message
+      assert_equal 'my-message', exception.message
     end
     assert_passed(test_result)
   end
@@ -35,5 +33,4 @@ class RaiseExceptionTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/return_value_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ReturnValueTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -48,5 +46,4 @@ class ReturnValueTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/sequence_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class SequenceTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -73,8 +71,8 @@ class SequenceTest < Mocha::TestCase
 
   def test_should_constrain_invocations_to_occur_in_expected_order_even_if_expected_on_partial_mocks
     test_result = run_as_test do
-      partial_mock_one = "1"
-      partial_mock_two = "2"
+      partial_mock_one = '1'
+      partial_mock_two = '2'
       sequence = sequence('one')
 
       partial_mock_one.expects(:first).in_sequence(sequence)
@@ -88,8 +86,8 @@ class SequenceTest < Mocha::TestCase
 
   def test_should_allow_invocations_in_sequence_even_if_expected_on_partial_mocks
     test_result = run_as_test do
-      partial_mock_one = "1"
-      partial_mock_two = "2"
+      partial_mock_one = '1'
+      partial_mock_two = '2'
       sequence = sequence('one')
 
       partial_mock_one.expects(:first).in_sequence(sequence)
@@ -148,7 +146,7 @@ class SequenceTest < Mocha::TestCase
       mock.first
     end
     assert_failed(test_result)
-    assert_match Regexp.new(%{in sequence "one"}), test_result.failures.first.message
+    assert_match Regexp.new(%(in sequence "one")), test_result.failures.first.message
   end
 
   def test_should_allow_expectations_to_be_in_more_than_one_sequence
@@ -166,8 +164,8 @@ class SequenceTest < Mocha::TestCase
       mock.second
     end
     assert_failed(test_result)
-    assert_match Regexp.new(%{in sequence "one"}), test_result.failures.first.message
-    assert_match Regexp.new(%{in sequence "two"}), test_result.failures.first.message
+    assert_match Regexp.new(%(in sequence "one")), test_result.failures.first.message
+    assert_match Regexp.new(%(in sequence "two")), test_result.failures.first.message
   end
 
   def test_should_have_shortcut_for_expectations_to_be_in_more_than_one_sequence
@@ -185,8 +183,7 @@ class SequenceTest < Mocha::TestCase
       mock.second
     end
     assert_failed(test_result)
-    assert_match Regexp.new(%{in sequence "one"}), test_result.failures.first.message
-    assert_match Regexp.new(%{in sequence "two"}), test_result.failures.first.message
+    assert_match Regexp.new(%(in sequence "one")), test_result.failures.first.message
+    assert_match Regexp.new(%(in sequence "two")), test_result.failures.first.message
   end
-
 end

data/test/acceptance/states_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StatesTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -58,13 +56,16 @@ class StatesTest < Mocha::TestCase
       mock = mock()
       readiness = states('readiness')
 
-      mock.expects(:first).raises().then(readiness.is('ready'))
+      mock.expects(:first).raises.then(readiness.is('ready'))
       mock.expects(:second).when(readiness.is('ready'))
 
-      mock.first rescue nil
+      begin
+        mock.first
+      rescue StandardError
+        nil
+      end
       mock.second
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -37,12 +35,14 @@ class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
       def self.inspect
         'superklass'
       end
+
       def my_instance_method; end
     end
     klass = Class.new(superklass) do
       def self.inspect
         'klass'
       end
+
       def my_instance_method; end
     end
     test_result = run_as_tests(
@@ -56,9 +56,9 @@ class StubAnyInstanceMethodDefinedOnSuperclassTest < Mocha::TestCase
     )
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<AnyInstance:superklass>.my_instance_method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly once, invoked never: #<AnyInstance:superklass>.my_instance_method(any_parameters)'
     ], test_result.failure_message_lines
   end
 end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubAnyInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -40,10 +38,30 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
     end
-    assert instance.public_methods(false).any? { |m| m.to_s == 'my_instance_method' }
+    assert(instance.public_methods(false).any? { |m| m.to_s == 'my_instance_method' })
     assert_equal :original_return_value, instance.my_instance_method
   end
 
+  def test_should_leave_stubbed_public_method_unchanged_after_test_when_it_was_originally_private_in_owning_module
+    module_with_private_method = Module.new do
+      def my_included_method
+        :original_return_value
+      end
+      private :my_included_method
+    end
+    klass = Class.new do
+      include module_with_private_method
+      public :my_included_method
+    end
+    instance = klass.new
+    test_result = run_as_test do
+      klass.any_instance.stubs(:my_included_method).returns(:new_return_value)
+      assert_equal :new_return_value, instance.my_included_method
+    end
+    assert_passed(test_result)
+    assert_equal :original_return_value, instance.my_included_method
+  end
+
   def test_should_leave_stubbed_protected_method_unchanged_after_test
     klass = Class.new do
       def my_instance_method
@@ -51,6 +69,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
       end
       protected :my_instance_method
       def self.protected(*args); end
+
       def my_unprotected_instance_method
         my_instance_method
       end
@@ -59,7 +78,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
     end
-    assert instance.protected_methods(false).any? { |m| m.to_s == 'my_instance_method' }
+    assert(instance.protected_methods(false).any? { |m| m.to_s == 'my_instance_method' })
     assert_equal :original_return_value, instance.my_unprotected_instance_method
   end
 
@@ -70,6 +89,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
       end
       protected :my_instance_method
       def self.protected(*args); end
+
       def my_unprotected_instance_method
         my_instance_method
       end
@@ -94,7 +114,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
     end
-    assert instance.private_methods(false).any? { |m| m.to_s == 'my_instance_method' }
+    assert(instance.private_methods(false).any? { |m| m.to_s == 'my_instance_method' })
     assert_equal :original_return_value, instance.send(:my_instance_method)
   end
 
@@ -142,8 +162,8 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
       assert_equal :new_return_value, instance.my_superclass_method
     end
     assert_passed(test_result)
-    assert instance.public_methods(true).any? { |m| m.to_s == 'my_superclass_method' }
-    assert !klass.public_methods(false).any? { |m| m.to_s == 'my_superclass_method' }
+    assert(instance.public_methods(true).any? { |m| m.to_s == 'my_superclass_method' })
+    assert(klass.public_methods(false).none? { |m| m.to_s == 'my_superclass_method' })
     assert_equal :original_return_value, instance.my_superclass_method
   end
 
@@ -162,8 +182,8 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
       assert_equal :new_return_value, instance.send(:my_superclass_method)
     end
     assert_passed(test_result)
-    assert instance.protected_methods(true).any? { |m| m.to_s == 'my_superclass_method' }
-    assert !klass.protected_methods(false).any? { |m| m.to_s == 'my_superclass_method' }
+    assert(instance.protected_methods(true).any? { |m| m.to_s == 'my_superclass_method' })
+    assert(klass.protected_methods(false).none? { |m| m.to_s == 'my_superclass_method' })
     assert_equal :original_return_value, instance.send(:my_superclass_method)
   end
 
@@ -182,15 +202,16 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
       assert_equal :new_return_value, instance.send(:my_superclass_method)
     end
     assert_passed(test_result)
-    assert instance.private_methods(true).any? { |m| m.to_s == 'my_superclass_method' }
-    assert !klass.private_methods(false).any? { |m| m.to_s == 'my_superclass_method' }
+    assert(instance.private_methods(true).any? { |m| m.to_s == 'my_superclass_method' })
+    assert(klass.private_methods(false).none? { |m| m.to_s == 'my_superclass_method' })
     assert_equal :original_return_value, instance.send(:my_superclass_method)
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_be_able_to_stub_method_if_ruby18_public_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def public_instance_methods(include_superclass = true)
+        def public_instance_methods(_include_superclass = true)
           ['my_instance_method']
         end
       end
@@ -205,7 +226,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_public_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def public_instance_methods(include_superclass = true)
+        def public_instance_methods(_include_superclass = true)
           [:my_instance_method]
         end
       end
@@ -220,7 +241,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby18_protected_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def protected_instance_methods(include_superclass = true)
+        def protected_instance_methods(_include_superclass = true)
           ['my_instance_method']
         end
       end
@@ -235,7 +256,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_protected_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def protected_instance_methods(include_superclass = true)
+        def protected_instance_methods(_include_superclass = true)
           [:my_instance_method]
         end
       end
@@ -250,7 +271,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby18_private_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def private_instance_methods(include_superclass = true)
+        def private_instance_methods(_include_superclass = true)
           ['my_instance_method']
         end
       end
@@ -265,7 +286,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_private_instance_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def private_instance_methods(include_superclass = true)
+        def private_instance_methods(_include_superclass = true)
           [:my_instance_method]
         end
       end
@@ -276,5 +297,5 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,10 +11,11 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_be_able_to_stub_method_if_ruby18_public_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def public_methods(include_superclass = true)
+        def public_methods(_include_superclass = true)
           ['my_class_method']
         end
       end
@@ -31,7 +30,7 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_public_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def public_methods(include_superclass = true)
+        def public_methods(_include_superclass = true)
           [:my_class_method]
         end
       end
@@ -46,7 +45,7 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby18_protected_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def protected_methods(include_superclass = true)
+        def protected_methods(_include_superclass = true)
           ['my_class_method']
         end
       end
@@ -61,7 +60,7 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_protected_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def protected_methods(include_superclass = true)
+        def protected_methods(_include_superclass = true)
           [:my_class_method]
         end
       end
@@ -76,7 +75,7 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby18_private_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_klass = Class.new do
       class << self
-        def private_methods(include_superclass = true)
+        def private_methods(_include_superclass = true)
           ['my_class_method']
         end
       end
@@ -91,7 +90,7 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby19_private_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby19_klass = Class.new do
       class << self
-        def private_methods(include_superclass = true)
+        def private_methods(_include_superclass = true)
           [:my_class_method]
         end
       end
@@ -102,5 +101,5 @@ class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_class_method_defined_on_class_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubClassMethodDefinedOnClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +11,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_stub_public_method_and_leave_it_unchanged_after_test
     klass = Class.new do
       class << self
@@ -75,4 +74,5 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     end
     assert_equal :original_return_value, klass.send(:my_class_method)
   end
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_class_method_defined_on_module_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubClassMethodDefinedOnModuleTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup