mocha 1.0.0.alpha → 1.10.0.alpha

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
@@ -26,7 +25,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
-        assert_method_visiblity klass, :my_class_method, :public
+        assert_method_visibility klass, :my_class_method, :public
         assert_equal :new_return_value, klass.my_class_method
       end
       assert_passed(test_result)
@@ -47,7 +46,7 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
-        assert_method_visiblity klass, :my_class_method, :protected
+        assert_method_visibility klass, :my_class_method, :protected
         assert_equal :new_return_value, klass.send(:my_class_method)
       end
       assert_passed(test_result)
@@ -68,11 +67,12 @@ class StubClassMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(klass) do
       test_result = run_as_test do
         klass.stubs(:my_class_method).returns(:new_return_value)
-        assert_method_visiblity klass, :my_class_method, :private
+        assert_method_visibility klass, :my_class_method, :private
         assert_equal :new_return_value, klass.send(:my_class_method)
       end
       assert_passed(test_result)
     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

data/test/acceptance/stub_class_method_defined_on_superclass_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +11,7 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_stub_public_method_on_child_class_and_leave_it_unchanged_after_test
     superklass = Class.new do
       class << self
@@ -109,4 +108,37 @@ class StubClassMethodDefinedOnSuperclassTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
+
+  def test_expect_method_on_superclass_even_if_preceded_by_test_expecting_method_on_subclass
+    superklass = Class.new do
+      def self.inspect
+        'superklass'
+      end
+
+      def self.my_class_method; end
+    end
+    klass = Class.new(superklass) do
+      def self.inspect
+        'klass'
+      end
+
+      def self.my_class_method; end
+    end
+    test_result = run_as_tests(
+      :test_1 => lambda {
+        klass.expects(:my_class_method)
+        klass.my_class_method
+      },
+      :test_2 => lambda {
+        superklass.expects(:my_class_method)
+      }
+    )
+    assert_failed(test_result)
+    assert_equal [
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly once, invoked never: superklass.my_class_method(any_parameters)'
+    ], test_result.failure_message_lines
+  end
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_everything_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubEverythingTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +13,7 @@ class StubEverythingTest < Mocha::TestCase
 
   def test_should_build_stub_and_explicitly_add_an_expectation
     test_result = run_as_test do
-      foo = stub_everything()
+      foo = stub_everything
       foo.stubs(:bar)
       foo.bar
       foo.unexpected_invocation
@@ -52,5 +50,4 @@ class StubEverythingTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stub_instance_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 StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +13,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby18_public_methods_include_method_but_method_does_not_exist
     ruby18_instance = Class.new do
-      def public_methods(include_superclass = true)
+      def public_methods(_include_superclass = true)
         ['my_instance_method']
       end
     end.new
@@ -28,7 +26,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby19_public_methods_include_method_but_method_does_not_exist
     ruby19_instance = Class.new do
-      def public_methods(include_superclass = true)
+      def public_methods(_include_superclass = true)
         [:my_instance_method]
       end
     end.new
@@ -41,7 +39,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby18_protected_methods_include_method_but_method_does_not_exist
     ruby18_instance = Class.new do
-      def protected_methods(include_superclass = true)
+      def protected_methods(_include_superclass = true)
         ['my_instance_method']
       end
     end.new
@@ -54,7 +52,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby19_protected_methods_include_method_but_method_does_not_exist
     ruby19_instance = Class.new do
-      def protected_methods(include_superclass = true)
+      def protected_methods(_include_superclass = true)
         [:my_instance_method]
       end
     end.new
@@ -67,7 +65,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby18_private_methods_include_method_but_method_does_not_exist
     ruby18_instance = Class.new do
-      def private_methods(include_superclass = true)
+      def private_methods(_include_superclass = true)
         ['my_instance_method']
       end
     end.new
@@ -80,7 +78,7 @@ class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestC
 
   def test_should_be_able_to_stub_method_if_ruby19_private_methods_include_method_but_method_does_not_exist
     ruby19_instance = Class.new do
-      def private_methods(include_superclass = true)
+      def private_methods(_include_superclass = true)
         [:my_instance_method]
       end
     end.new

data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_class_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -23,7 +21,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
-        assert_method_visiblity instance, :my_instance_method, :public
+        assert_method_visibility instance, :my_instance_method, :public
         assert_equal :new_return_value, instance.my_instance_method
       end
       assert_passed(test_result)
@@ -41,7 +39,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
-        assert_method_visiblity instance, :my_instance_method, :protected
+        assert_method_visibility instance, :my_instance_method, :protected
         assert_equal :new_return_value, instance.send(:my_instance_method)
       end
       assert_passed(test_result)
@@ -59,7 +57,7 @@ class StubInstanceMethodDefinedOnClassTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_instance_method).returns(:new_return_value)
-        assert_method_visiblity instance, :my_instance_method, :private
+        assert_method_visibility instance, :my_instance_method, :private
         assert_equal :new_return_value, instance.send(:my_instance_method)
       end
       assert_passed(test_result)

data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnKernelModuleTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -72,4 +70,67 @@ class StubInstanceMethodDefinedOnKernelModuleTest < Mocha::TestCase
   ensure
     Kernel.module_eval { remove_method :my_instance_method }
   end
+
+  def test_should_stub_public_module_method_and_leave_it_unchanged_after_test
+    Kernel.module_eval do
+      def my_instance_method
+        :original_return_value
+      end
+      public :my_instance_method
+    end
+    mod = Module.new
+    assert_snapshot_unchanged(mod) do
+      test_result = run_as_test do
+        mod.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visibility mod, :my_instance_method, :public
+        assert_equal :new_return_value, mod.my_instance_method
+      end
+      assert_passed(test_result)
+    end
+    assert_equal :original_return_value, mod.my_instance_method
+  ensure
+    Kernel.module_eval { remove_method :my_instance_method }
+  end
+
+  def test_should_stub_protected_module_method_and_leave_it_unchanged_after_test
+    Kernel.module_eval do
+      def my_instance_method
+        :original_return_value
+      end
+      protected :my_instance_method
+    end
+    mod = Module.new
+    assert_snapshot_unchanged(mod) do
+      test_result = run_as_test do
+        mod.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visibility mod, :my_instance_method, :protected
+        assert_equal :new_return_value, mod.send(:my_instance_method)
+      end
+      assert_passed(test_result)
+    end
+    assert_equal :original_return_value, mod.send(:my_instance_method)
+  ensure
+    Kernel.module_eval { remove_method :my_instance_method }
+  end
+
+  def test_should_stub_private_module_method_and_leave_it_unchanged_after_test
+    Kernel.module_eval do
+      def my_instance_method
+        :original_return_value
+      end
+      private :my_instance_method
+    end
+    mod = Module.new
+    assert_snapshot_unchanged(mod) do
+      test_result = run_as_test do
+        mod.stubs(:my_instance_method).returns(:new_return_value)
+        assert_method_visibility mod, :my_instance_method, :private
+        assert_equal :new_return_value, mod.send(:my_instance_method)
+      end
+      assert_passed(test_result)
+    end
+    assert_equal :original_return_value, mod.send(:my_instance_method)
+  ensure
+    Kernel.module_eval { remove_method :my_instance_method }
+  end
 end

data/test/acceptance/stub_instance_method_defined_on_module_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnModuleTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -26,6 +24,7 @@ class StubInstanceMethodDefinedOnModuleTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_module_method).returns(:new_return_value)
+        assert_method_visibility instance, :my_module_method, :public
         assert_equal :new_return_value, instance.my_module_method
       end
       assert_passed(test_result)
@@ -46,6 +45,7 @@ class StubInstanceMethodDefinedOnModuleTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_module_method).returns(:new_return_value)
+        assert_method_visibility instance, :my_module_method, :protected
         assert_equal :new_return_value, instance.send(:my_module_method)
       end
       assert_passed(test_result)
@@ -66,6 +66,7 @@ class StubInstanceMethodDefinedOnModuleTest < Mocha::TestCase
     assert_snapshot_unchanged(instance) do
       test_result = run_as_test do
         instance.stubs(:my_module_method).returns(:new_return_value)
+        assert_method_visibility instance, :my_module_method, :private
         assert_equal :new_return_value, instance.send(:my_module_method)
       end
       assert_passed(test_result)

data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnObjectClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +11,7 @@ class StubInstanceMethodDefinedOnObjectClassTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_stub_public_method_and_leave_it_unchanged_after_test
     Object.class_eval do
       def my_instance_method
@@ -72,4 +71,5 @@ class StubInstanceMethodDefinedOnObjectClassTest < Mocha::TestCase
   ensure
     Object.class_eval { remove_method :my_instance_method }
   end
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnSingletonClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -66,5 +64,4 @@ class StubInstanceMethodDefinedOnSingletonClassTest < Mocha::TestCase
     end
     assert_equal :original_return_value, instance.send(:my_singleton_method)
   end
-
 end