mocha 1.0.0.alpha → 1.10.0.alpha

data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb

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

data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+
+unless Mocha::PRE_RUBY_V19
+  class StubMethodDefinedOnModuleAndAliasedTest < Mocha::TestCase
+    include AcceptanceTest
+
+    def setup
+      setup_acceptance_test
+    end
+
+    def teardown
+      teardown_acceptance_test
+    end
+
+    def test_stubbing_class_method_defined_by_aliasing_module_instance_method
+      mod = Module.new do
+        def module_instance_method
+          'module-instance-method'
+        end
+      end
+
+      klass = Class.new do
+        extend mod
+        class << self
+          alias_method :aliased_module_instance_method, :module_instance_method
+        end
+      end
+
+      assert_snapshot_unchanged(klass) do
+        test_result = run_as_test do
+          klass.stubs(:aliased_module_instance_method).returns('stubbed-aliased-module-instance-method')
+          assert_equal 'stubbed-aliased-module-instance-method', klass.aliased_module_instance_method
+        end
+        assert_passed(test_result)
+      end
+    end
+  end
+end

data/test/acceptance/stub_module_method_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubModuleMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,8 +11,13 @@ class StubModuleMethodTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_stub_method_within_test
-    mod = Module.new { def self.my_module_method; :original_return_value; end }
+    mod = Module.new do
+      def self.my_module_method
+        :original_return_value
+      end
+    end
     test_result = run_as_test do
       mod.stubs(:my_module_method).returns(:new_return_value)
       assert_equal :new_return_value, mod.my_module_method
@@ -23,34 +26,62 @@ class StubModuleMethodTest < Mocha::TestCase
   end
 
   def test_should_leave_stubbed_public_method_unchanged_after_test
-    mod = Module.new { class << self; def my_module_method; :original_return_value; end; public :my_module_method; end }
+    mod = Module.new do
+      class << self
+        def my_module_method
+          :original_return_value
+        end
+        public :my_module_method
+      end
+    end
     run_as_test do
       mod.stubs(:my_module_method).returns(:new_return_value)
     end
-    assert mod.public_methods(false).any? { |m| m.to_s == 'my_module_method' }
+    assert(mod.public_methods(false).any? { |m| m.to_s == 'my_module_method' })
     assert_equal :original_return_value, mod.my_module_method
   end
 
   def test_should_leave_stubbed_protected_method_unchanged_after_test
-    mod = Module.new { class << self; def my_module_method; :original_return_value; end; protected :my_module_method; def my_unprotected_module_method; my_module_method; end; end }
+    mod = Module.new do
+      class << self
+        def my_module_method
+          :original_return_value
+        end
+        protected :my_module_method
+        def my_unprotected_module_method
+          my_module_method
+        end
+      end
+    end
     run_as_test do
       mod.stubs(:my_module_method).returns(:new_return_value)
     end
-    assert mod.protected_methods(false).any? { |m| m.to_s == 'my_module_method' }
+    assert(mod.protected_methods(false).any? { |m| m.to_s == 'my_module_method' })
     assert_equal :original_return_value, mod.my_unprotected_module_method
   end
 
   def test_should_leave_stubbed_private_method_unchanged_after_test
-    mod = Module.new { class << self; def my_module_method; :original_return_value; end; private :my_module_method; end }
+    mod = Module.new do
+      class << self
+        def my_module_method
+          :original_return_value
+        end
+        private :my_module_method
+      end
+    end
     run_as_test do
       mod.stubs(:my_module_method).returns(:new_return_value)
     end
-    assert mod.private_methods(false).any? { |m| m.to_s == 'my_module_method' }
+    assert(mod.private_methods(false).any? { |m| m.to_s == 'my_module_method' })
     assert_equal :original_return_value, mod.send(:my_module_method)
   end
 
   def test_should_reset_expectations_after_test
-    mod = Module.new { def self.my_module_method; :original_return_value; end }
+    mod = Module.new do
+      def self.my_module_method
+        :original_return_value
+      end
+    end
     run_as_test do
       mod.stubs(:my_module_method)
     end
@@ -58,22 +89,28 @@ class StubModuleMethodTest < Mocha::TestCase
   end
 
   def test_should_be_able_to_stub_a_superclass_method
-    supermod = Module.new { def self.my_superclass_method; :original_return_value; end }
-    mod = Module.new { include supermod }
+    supermod = Module.new do
+      def self.my_superclass_method
+        :original_return_value
+      end
+    end
+    mod = Module.new do
+      include supermod
+    end
     test_result = run_as_test do
       mod.stubs(:my_superclass_method).returns(:new_return_value)
       assert_equal :new_return_value, mod.my_superclass_method
     end
     assert_passed(test_result)
-    assert supermod.public_methods.any? { |m| m.to_s == 'my_superclass_method' }
-    assert !mod.public_methods(false).any? { |m| m.to_s == 'my_superclass_method' }
+    assert(supermod.public_methods.any? { |m| m.to_s == 'my_superclass_method' })
+    assert(mod.public_methods(false).none? { |m| m.to_s == 'my_superclass_method' })
     assert_equal :original_return_value, supermod.my_superclass_method
   end
 
   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_mod = Module.new do
       class << self
-        def public_methods(include_superclass = true)
+        def public_methods(_include_superclass = true)
           ['my_module_method']
         end
       end
@@ -88,7 +125,7 @@ class StubModuleMethodTest < 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_mod = Module.new do
       class << self
-        def public_methods(include_superclass = true)
+        def public_methods(_include_superclass = true)
           [:my_module_method]
         end
       end
@@ -103,7 +140,7 @@ class StubModuleMethodTest < Mocha::TestCase
   def test_should_be_able_to_stub_method_if_ruby_18_protected_methods_include_method_but_method_does_not_actually_exist_like_active_record_association_proxy
     ruby18_mod = Module.new do
       class << self
-        def protected_methods(include_superclass = true)
+        def protected_methods(_include_superclass = true)
           ['my_module_method']
         end
       end
@@ -118,7 +155,7 @@ class StubModuleMethodTest < 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_mod = Module.new do
       class << self
-        def protected_methods(include_superclass = true)
+        def protected_methods(_include_superclass = true)
           [:my_module_method]
         end
       end
@@ -133,7 +170,7 @@ class StubModuleMethodTest < 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_mod = Module.new do
       class << self
-        def private_methods(include_superclass = true)
+        def private_methods(_include_superclass = true)
           ['my_module_method']
         end
       end
@@ -148,7 +185,7 @@ class StubModuleMethodTest < 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_mod = Module.new do
       class << self
-        def private_methods(include_superclass = true)
+        def private_methods(_include_superclass = true)
           [:my_module_method]
         end
       end
@@ -159,5 +196,5 @@ class StubModuleMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_test.rb

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

data/test/acceptance/stubba_example_test.rb

@@ -1,36 +1,28 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha/setup'
 
 class Widget
-
   def model
     'original_model'
   end
 
   class << self
-
-    def find(options)
+    def find(_options)
       []
     end
 
-    def create(attributes)
+    def create(_attributes)
       Widget.new
     end
-
   end
-
 end
 
 module Thingy
-
   def self.wotsit
     :hoojamaflip
   end
-
 end
 
 class StubbaExampleTest < Mocha::TestCase
-
   def test_should_stub_instance_method
     widget = Widget.new
     widget.expects(:model).returns('different_model')
@@ -93,10 +85,9 @@ class StubbaExampleTest < Mocha::TestCase
 
   def should_stub_instance_method_on_any_instance_of_a_class
     Widget.any_instance.expects(:model).at_least_once.returns('another_model')
-    widget_1 = Widget.new
-    widget_2 = Widget.new
-    assert_equal 'another_model', widget_1.model
-    assert_equal 'another_model', widget_2.model
+    widget1 = Widget.new
+    widget2 = Widget.new
+    assert_equal 'another_model', widget1.model
+    assert_equal 'another_model', widget2.model
   end
-
 end

data/test/acceptance/stubba_test_result_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbaTestResultTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,7 +14,9 @@ class StubbaTestResultTest < Mocha::TestCase
 
   def test_should_include_expectation_verification_in_assertion_count
     test_result = run_as_test do
-      object = Class.new { def message; end }.new
+      object = Class.new do
+        def message; end
+      end.new
       object.expects(:message)
       object.message
     end
@@ -32,7 +32,9 @@ class StubbaTestResultTest < Mocha::TestCase
 
   def test_should_not_include_stubbing_expectation_verification_in_assertion_count
     test_result = run_as_test do
-      object = Class.new { def message; end }.new
+      object = Class.new do
+        def message; end
+      end.new
       object.stubs(:message)
       object.message
     end
@@ -41,7 +43,9 @@ class StubbaTestResultTest < Mocha::TestCase
 
   def test_should_include_expectation_verification_failure_in_failure_count
     test_result = run_as_test do
-      object = Class.new { def message; end }.new
+      object = Class.new do
+        def message; end
+      end.new
       object.expects(:message)
     end
     assert_equal 1, test_result.failure_count
@@ -54,6 +58,7 @@ class StubbaTestResultTest < Mocha::TestCase
     assert_equal 1, test_result.failure_count
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_display_backtrace_indicating_line_number_where_failing_assertion_was_called
     execution_point = nil
     test_result = run_as_test do
@@ -62,5 +67,5 @@ class StubbaTestResultTest < Mocha::TestCase
     assert_equal 1, test_result.failure_count
     assert_equal execution_point, ExecutionPoint.new(test_result.failures[0].location)
   end
-
+  # rubocop:enable Style/Semicolon
 end

data/test/acceptance/stubbing_error_backtrace_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbingErrorBacktraceTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,10 +12,11 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_display_backtrace_indicating_line_number_where_attempt_to_stub_non_existent_method_was_made
     execution_point = nil
     object = Object.new
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:non_existent_method)
     end
@@ -31,7 +30,7 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
       def non_public_method; end
       private :non_public_method
     end.new
-    Mocha::Configuration.prevent(:stubbing_non_public_method)
+    Mocha.configure { |c| c.stubbing_non_public_method = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:non_public_method)
     end
@@ -42,7 +41,7 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
   def test_should_display_backtrace_indicating_line_number_where_attempt_to_stub_method_on_non_mock_object_was_made
     execution_point = nil
     object = Object.new
-    Mocha::Configuration.prevent(:stubbing_method_on_non_mock_object)
+    Mocha.configure { |c| c.stubbing_method_on_non_mock_object = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:any_method)
     end
@@ -53,12 +52,12 @@ class StubbingErrorBacktraceTest < Mocha::TestCase
   def test_should_display_backtrace_indicating_line_number_where_method_was_unnecessarily_stubbed
     execution_point = nil
     object = Object.new
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       execution_point = ExecutionPoint.current; object.stubs(:unused_method)
     end
     assert_equal 1, test_result.error_count
     assert_equal execution_point, ExecutionPoint.new(test_result.errors[0].exception.backtrace)
   end
-
+  # rubocop:enable Style/Semicolon
 end

data/test/acceptance/stubbing_frozen_object_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class StubbingFrozenObjectTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,6 +12,7 @@ class StubbingFrozenObjectTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_fail_fast_if_attempting_to_stub_method_on_frozen_object
     object = Object.new
     object.freeze
@@ -85,4 +84,5 @@ class StubbingFrozenObjectTest < Mocha::TestCase
     assert_equal 1, test_result.error_count
     assert_equal execution_point, ExecutionPoint.new(test_result.errors[0].exception.backtrace)
   end
+  # rubocop:enable Style/Semicolon
 end

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,34 +13,40 @@ class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
 
   def test_stubbing_class_method_accepting_block_parameter_should_restore_original_method
     klass = Class.new do
-      def self.my_class_method(&block); block.call; end
+      def self.my_class_method(&block)
+        block.call
+      end
     end
     test_result = run_as_test do
       klass.stubs(:my_class_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, klass.my_class_method { :return_value }
+    assert_equal :return_value, (klass.my_class_method { :return_value })
   end
 
   def test_stubbing_instance_method_accepting_block_parameter_should_restore_original_method
     instance = Class.new do
-      def my_instance_method(&block); block.call; end
+      def my_instance_method
+        yield
+      end
     end.new
     test_result = run_as_test do
       instance.stubs(:my_instance_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, instance.my_instance_method { :return_value }
+    assert_equal :return_value, (instance.my_instance_method { :return_value })
   end
 
   def test_stubbing_any_instance_method_accepting_block_parameter_should_restore_original_method
     klass = Class.new do
-      def my_instance_method(&block); block.call; end
+      def my_instance_method
+        yield
+      end
     end
     test_result = run_as_test do
       klass.any_instance.stubs(:my_instance_method)
     end
     assert_passed(test_result)
-    assert_equal :return_value, klass.new.my_instance_method { :return_value }
+    assert_equal :return_value, (klass.new.my_instance_method { :return_value })
   end
 end