mocha 1.6.0 → 1.7.0

data/test/acceptance/stub_everything_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubEverythingTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +14,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 +51,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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +14,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 +27,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 +40,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 +53,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 +66,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 +79,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

@@ -2,7 +2,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

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

data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_module_test.rb

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

data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnObjectClassTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +12,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 +72,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

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

data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb

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

data/test/acceptance/stub_module_method_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubModuleMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,6 +12,7 @@ class StubModuleMethodTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_stub_method_within_test
     mod = Module.new do
       def self.my_module_method
@@ -38,7 +38,7 @@ class StubModuleMethodTest < Mocha::TestCase
     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
 
@@ -57,7 +57,7 @@ class StubModuleMethodTest < Mocha::TestCase
     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
 
@@ -73,7 +73,7 @@ class StubModuleMethodTest < Mocha::TestCase
     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
 
@@ -103,15 +103,15 @@ class StubModuleMethodTest < Mocha::TestCase
       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
@@ -126,7 +126,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
@@ -141,7 +141,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
@@ -156,7 +156,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
@@ -171,7 +171,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
@@ -186,7 +186,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
@@ -197,5 +197,5 @@ class StubModuleMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stub_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +14,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 +47,4 @@ class StubTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubba_example_test.rb

@@ -2,35 +2,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 +86,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

@@ -3,7 +3,6 @@ require 'mocha/setup'
 require 'execution_point'
 
 class StubbaTestResultTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -17,8 +16,7 @@ class StubbaTestResultTest < Mocha::TestCase
   def test_should_include_expectation_verification_in_assertion_count
     test_result = run_as_test do
       object = Class.new do
-        def message
-        end
+        def message; end
       end.new
       object.expects(:message)
       object.message
@@ -36,8 +34,7 @@ class StubbaTestResultTest < Mocha::TestCase
   def test_should_not_include_stubbing_expectation_verification_in_assertion_count
     test_result = run_as_test do
       object = Class.new do
-        def message
-        end
+        def message; end
       end.new
       object.stubs(:message)
       object.message
@@ -48,8 +45,7 @@ class StubbaTestResultTest < Mocha::TestCase
   def test_should_include_expectation_verification_failure_in_failure_count
     test_result = run_as_test do
       object = Class.new do
-        def message
-        end
+        def message; end
       end.new
       object.expects(:message)
     end
@@ -63,6 +59,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
@@ -71,5 +68,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

@@ -3,7 +3,6 @@ require 'mocha/setup'
 require 'execution_point'
 
 class StubbingErrorBacktraceTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,6 +13,7 @@ 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
@@ -60,5 +60,5 @@ class StubbingErrorBacktraceTest < 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_frozen_object_test.rb

@@ -3,7 +3,6 @@ require 'mocha/setup'
 require 'execution_point'
 
 class StubbingFrozenObjectTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,6 +13,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 +85,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

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,34 +14,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