mocha 1.6.0 → 1.7.0

data/test/unit/hash_inspect_test.rb

@@ -2,15 +2,13 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
 class HashInspectTest < Mocha::TestCase
-
   def test_should_keep_spacing_between_key_value
-    hash = {:a => true}
+    hash = { :a => true }
     assert_equal '{:a => true}', hash.mocha_inspect
   end
 
   def test_should_use_mocha_inspect_on_each_item
-    hash = {:a => 'mocha'}
-    assert_equal %{{:a => "mocha"}}, hash.mocha_inspect
+    hash = { :a => 'mocha' }
+    assert_equal %({:a => "mocha"}), hash.mocha_inspect
   end
-
 end

data/test/unit/hooks_test.rb

@@ -3,18 +3,19 @@ require 'mocha/hooks'
 require 'mocha/mockery'
 
 class HooksTest < Mocha::TestCase
+  # rubocop:disable Style/ClassAndModuleChildren
   class Mocha::Mockery
     class << self
       attr_writer :instances
     end
   end
+  # rubocop:enable Style/ClassAndModuleChildren
 
   class FakeMockery
-    def verify(*args)
-    end
+    def verify(*args); end
 
     def teardown
-      raise "exception within Mockery#teardown"
+      raise 'exception within Mockery#teardown'
     end
   end
 
@@ -23,7 +24,11 @@ class HooksTest < Mocha::TestCase
     mockery = FakeMockery.new
     Mocha::Mockery.instances = [mockery]
 
-    fake_test_case.mocha_teardown rescue nil
+    begin
+      fake_test_case.mocha_teardown
+    rescue StandardError
+      nil
+    end
 
     assert_kind_of Mocha::Mockery::Null, Mocha::Mockery.instance
   end

data/test/unit/in_state_ordering_constraint_test.rb

@@ -3,11 +3,9 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/in_state_ordering_constraint'
 
 class InStateOrderingConstraintTest < Mocha::TestCase
-
   include Mocha
 
   class FakeStatePredicate
-
     attr_writer :active, :description
 
     def active?
@@ -17,7 +15,6 @@ class InStateOrderingConstraintTest < Mocha::TestCase
     def mocha_inspect
       @description
     end
-
   end
 
   def test_should_allow_invocation_when_state_is_active
@@ -39,5 +36,4 @@ class InStateOrderingConstraintTest < Mocha::TestCase
 
     assert_equal 'when the-state-predicate', ordering_constraint.mocha_inspect
   end
-
 end

data/test/unit/method_matcher_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/method_matcher'
 
 class MethodMatcherTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_match_if_actual_method_name_is_same_as_expected_method_name
@@ -22,7 +21,6 @@ class MethodMatcherTest < Mocha::TestCase
 
   def test_should_describe_what_method_is_expected
     method_matcher = MethodMatcher.new(:method_name)
-    assert_equal "method_name", method_matcher.mocha_inspect
+    assert_equal 'method_name', method_matcher.mocha_inspect
   end
-
 end

data/test/unit/mock_test.rb

@@ -6,22 +6,21 @@ require 'set'
 require 'simple_counter'
 
 class MockTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_set_single_expectation
-   mock = build_mock
-   mock.expects(:method1).returns(1)
-   assert_nothing_raised(ExpectationErrorFactory.exception_class) do
-     assert_equal 1, mock.method1
-   end
+    mock = build_mock
+    mock.expects(:method1).returns(1)
+    assert_nothing_raised(ExpectationErrorFactory.exception_class) do
+      assert_equal 1, mock.method1
+    end
   end
 
   def test_should_build_and_store_expectations
-   mock = build_mock
-   expectation = mock.expects(:method1)
-   assert_not_nil expectation
-   assert_equal [expectation], mock.__expectations__.to_a
+    mock = build_mock
+    expectation = mock.expects(:method1)
+    assert_not_nil expectation
+    assert_equal [expectation], mock.__expectations__.to_a
   end
 
   def test_should_not_stub_everything_by_default
@@ -45,10 +44,24 @@ class MockTest < Mocha::TestCase
     assert_equal true, mock.eql?(mock)
   end
 
-  if PRE_RUBY_V19
-    OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject { |m| m =~ /^__.*__$/ || ["method_missing", "singleton_method_undefined", "initialize"].include?(m)}
-  else
-    OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject { |m| m =~ /^__.*__$/ || [:object_id, :method_missing, :singleton_method_undefined, :initialize, :String, :singleton_method_added].include?(m) }
+  EXCLUDED_METHODS = {
+    true => %w[
+      method_missing
+      singleton_method_undefined
+      initialize
+    ],
+    false => [
+      :object_id,
+      :method_missing,
+      :singleton_method_undefined,
+      :initialize,
+      :String,
+      :singleton_method_added
+    ]
+  }.freeze
+
+  OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject do |m|
+    m =~ /^__.*__$/ || EXCLUDED_METHODS[PRE_RUBY_V19].include?(m)
   end
 
   def test_should_be_able_to_mock_standard_object_methods
@@ -149,7 +162,7 @@ class MockTest < Mocha::TestCase
     parameters_for_yield = [1, 2, 3]
     mock.expects(:method1).yields(*parameters_for_yield)
     yielded_parameters = nil
-    mock.method1() { |*parameters| yielded_parameters = parameters }
+    mock.method1 { |*parameters| yielded_parameters = parameters }
     assert_equal parameters_for_yield, yielded_parameters
   end
 
@@ -228,7 +241,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_respond_to_methods_which_the_responder_does_responds_to
     instance = Class.new do
-      define_method(:respond_to?) { |symbol| true }
+      define_method(:respond_to?) { |_symbol| true }
     end.new
     mock = build_mock
     mock.responds_like(instance)
@@ -237,7 +250,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_not_respond_to_methods_which_the_responder_does_not_responds_to
     instance = Class.new do
-      define_method(:respond_to?) { |symbol| false }
+      define_method(:respond_to?) { |_symbol| false }
     end.new
     mock = build_mock
     mock.responds_like(instance)
@@ -246,7 +259,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_respond_to_methods_which_the_responder_instance_does_responds_to
     klass = Class.new do
-      define_method(:respond_to?) { |symbol| true }
+      define_method(:respond_to?) { |_symbol| true }
     end
     mock = build_mock
     mock.responds_like_instance_of(klass)
@@ -255,7 +268,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_not_respond_to_methods_which_the_responder_instance_does_not_responds_to
     klass = Class.new do
-      define_method(:respond_to?) { |symbol| false }
+      define_method(:respond_to?) { |_symbol| false }
     end
     mock = build_mock
     mock.responds_like_instance_of(klass)
@@ -280,7 +293,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_not_raise_no_method_error_if_responder_does_respond_to_invoked_method
     instance = Class.new do
-      define_method(:respond_to?) { |symbol| true }
+      define_method(:respond_to?) { |_symbol| true }
     end.new
     mock = build_mock
     mock.responds_like(instance)
@@ -290,7 +303,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_raise_no_method_error_if_responder_does_not_respond_to_invoked_method
     instance = Class.new do
-      define_method(:respond_to?) { |symbol| false }
+      define_method(:respond_to?) { |_symbol| false }
       define_method(:mocha_inspect) { 'mocha_inspect' }
     end.new
     mock = build_mock
@@ -301,7 +314,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_raise_no_method_error_with_message_indicating_that_mock_is_constrained_to_respond_like_responder
     instance = Class.new do
-      define_method(:respond_to?) { |symbol| false }
+      define_method(:respond_to?) { |_symbol| false }
       define_method(:mocha_inspect) { 'mocha_inspect' }
     end.new
     mock = build_mock

data/test/unit/mockery_test.rb

@@ -5,7 +5,6 @@ require 'mocha/expectation_error_factory'
 require 'deprecation_disabler'
 
 class MockeryTest < Mocha::TestCase
-
   include Mocha
   include DeprecationDisabler
 
@@ -31,25 +30,25 @@ class MockeryTest < Mocha::TestCase
   end
 
   def test_should_cache_instance_of_mockery
-    mockery_1 = Mockery.instance
-    mockery_2 = Mockery.instance
-    assert_same mockery_1, mockery_2
+    mockery1 = Mockery.instance
+    mockery2 = Mockery.instance
+    assert_same mockery1, mockery2
   end
 
   def test_should_expire_mockery_instance_cache
-    mockery_1 = Mockery.instance
+    mockery1 = Mockery.instance
     Mockery.teardown
-    mockery_2 = Mockery.instance
-    assert_not_same mockery_1, mockery_2
+    mockery2 = Mockery.instance
+    assert_not_same mockery1, mockery2
   end
 
   def test_should_raise_expectation_error_because_not_all_expectations_are_satisfied
     mockery = Mockery.new
     disable_deprecations do
-      mock_1 = mockery.named_mock('mock-1') { expects(:method_1) }
-      mock_2 = mockery.named_mock('mock-2') { expects(:method_2) }
-      1.times { mock_1.method_1 }
-      0.times { mock_2.method_2 }
+      mock1 = mockery.named_mock('mock-1') { expects(:method_1) }
+      mock2 = mockery.named_mock('mock-2') { expects(:method_2) }
+      1.times { mock1.method_1 }
+      0.times { mock2.method_2 }
     end
     assert_raises(ExpectationErrorFactory.exception_class) { mockery.verify }
   end
@@ -71,10 +70,10 @@ class MockeryTest < Mocha::TestCase
 
   def test_should_build_new_instance_of_stubba_on_teardown
     mockery = Mockery.new
-    stubba_1 = mockery.stubba
+    stubba1 = mockery.stubba
     mockery.teardown
-    stubba_2 = mockery.stubba
-    assert_not_same stubba_1, stubba_2
+    stubba2 = mockery.stubba
+    assert_not_same stubba1, stubba2
   end
 
   def test_should_build_and_store_new_state_machine
@@ -93,8 +92,12 @@ class MockeryTest < Mocha::TestCase
 
   class FakeMethod
     def stub; end
+
     def unstub; end
-    def matches?(other); true; end
+
+    def matches?(_other)
+      true
+    end
   end
 
   def test_should_unstub_all_methods_on_teardown
@@ -108,51 +111,51 @@ class MockeryTest < Mocha::TestCase
   def test_should_display_object_id_for_mocha_inspect_if_mock_has_no_name
     mockery = Mockery.new
     mock = mockery.unnamed_mock
-    assert_match Regexp.new("^#<Mock:0x[0-9A-Fa-f]{1,12}>$"), mock.mocha_inspect
+    assert_match Regexp.new('^#<Mock:0x[0-9A-Fa-f]{1,12}>$'), mock.mocha_inspect
   end
 
   def test_should_display_object_id_for_inspect_if_mock_has_no_name
     mockery = Mockery.new
     mock = mockery.unnamed_mock
-    assert_match Regexp.new("^#<Mock:0x[0-9A-Fa-f]{1,12}>$"), mock.inspect
+    assert_match Regexp.new('^#<Mock:0x[0-9A-Fa-f]{1,12}>$'), mock.inspect
   end
 
   def test_should_display_name_for_mocha_inspect_if_mock_has_string_name
     mockery = Mockery.new
     mock = mockery.named_mock('named_mock')
-    assert_equal "#<Mock:named_mock>", mock.mocha_inspect
+    assert_equal '#<Mock:named_mock>', mock.mocha_inspect
   end
 
   def test_should_display_name_for_mocha_inspect_if_mock_has_symbol_name
     mockery = Mockery.new
     mock = mockery.named_mock(:named_mock)
-    assert_equal "#<Mock:named_mock>", mock.mocha_inspect
+    assert_equal '#<Mock:named_mock>', mock.mocha_inspect
   end
 
   def test_should_display_name_for_inspect_if_mock_has_string_name
     mockery = Mockery.new
     mock = mockery.named_mock('named_mock')
-    assert_equal "#<Mock:named_mock>", mock.inspect
+    assert_equal '#<Mock:named_mock>', mock.inspect
   end
 
   def test_should_display_name_for_inspect_if_mock_has_symbol_name
     mockery = Mockery.new
     mock = mockery.named_mock(:named_mock)
-    assert_equal "#<Mock:named_mock>", mock.inspect
+    assert_equal '#<Mock:named_mock>', mock.inspect
   end
 
   def test_should_display_impersonated_object_for_mocha_inspect
     mockery = Mockery.new
     instance = Object.new
     mock = mockery.mock_impersonating(instance)
-    assert_equal "#{instance.mocha_inspect}", mock.mocha_inspect
+    assert_equal instance.mocha_inspect.to_s, mock.mocha_inspect
   end
 
   def test_should_display_impersonated_object_for_inspect
     mockery = Mockery.new
     instance = Object.new
     mock = mockery.mock_impersonating(instance)
-    assert_equal "#{instance.mocha_inspect}", mock.inspect
+    assert_equal instance.mocha_inspect.to_s, mock.inspect
   end
 
   class FakeClass; end
@@ -160,13 +163,12 @@ class MockeryTest < Mocha::TestCase
   def test_should_display_any_instance_prefix_followed_by_class_whose_instances_are_being_impersonated_for_mocha_inspect
     mockery = Mockery.new
     mock = mockery.mock_impersonating_any_instance_of(FakeClass)
-    assert_equal "#<AnyInstance:MockeryTest::FakeClass>", mock.mocha_inspect
+    assert_equal '#<AnyInstance:MockeryTest::FakeClass>', mock.mocha_inspect
   end
 
   def test_should_display_any_instance_prefix_followed_by_class_whose_instances_are_being_impersonated_for_inspect
     mockery = Mockery.new
     mock = mockery.mock_impersonating_any_instance_of(FakeClass)
-    assert_equal "#<AnyInstance:MockeryTest::FakeClass>", mock.inspect
+    assert_equal '#<AnyInstance:MockeryTest::FakeClass>', mock.inspect
   end
-
 end

data/test/unit/module_methods_test.rb

@@ -3,7 +3,6 @@ require 'mocha/module_methods'
 require 'mocha/object_methods'
 
 class ModuleMethodsTest < Mocha::TestCase
-
   def setup
     @module = Module.new.extend(Mocha::ModuleMethods, Mocha::ObjectMethods)
   end
@@ -15,5 +14,4 @@ class ModuleMethodsTest < Mocha::TestCase
   def test_should_stub_self_for_module
     assert_equal @module, @module.stubba_object
   end
-
 end

data/test/unit/multiple_yields_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/multiple_yields'
 
 class MultipleYieldsTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_provide_parameters_for_multiple_yields_in_single_invocation
@@ -14,5 +13,4 @@ class MultipleYieldsTest < Mocha::TestCase
     end
     assert_equal [[1, 2, 3], [4, 5]], parameter_groups
   end
-
 end

data/test/unit/no_yields_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/no_yields'
 
 class NoYieldsTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_provide_parameters_for_no_yields_in_single_invocation
@@ -14,5 +13,4 @@ class NoYieldsTest < Mocha::TestCase
     end
     assert_equal [], parameter_groups
   end
-
 end

data/test/unit/object_inspect_test.rb

@@ -4,14 +4,13 @@ require 'mocha/inspect'
 require 'method_definer'
 
 class ObjectInspectTest < Mocha::TestCase
-
   def test_should_return_default_string_representation_of_object_not_including_instance_variables
     object = Object.new
     class << object
       attr_accessor :attribute
     end
     object.attribute = 'instance_variable'
-    assert_match Regexp.new("^#<Object:0x[0-9A-Fa-f]{1,8}.*>$"), object.mocha_inspect
+    assert_match Regexp.new('^#<Object:0x[0-9A-Fa-f]{1,8}.*>$'), object.mocha_inspect
     assert_no_match(/instance_variable/, object.mocha_inspect)
   end
 
@@ -26,14 +25,24 @@ class ObjectInspectTest < Mocha::TestCase
   def test_should_use_underscored_id_instead_of_object_id_or_id_so_that_they_can_be_stubbed
     calls = []
     object = Object.new
-    object.replace_instance_method(:id) { calls << :id; return 1 } if Mocha::PRE_RUBY_V19
-    object.replace_instance_method(:object_id) { calls << :object_id; return 1 }
-    object.replace_instance_method(:__id__) { calls << :__id__; return 1 }
-    object.replace_instance_method(:inspect) { "object-description" }
+    if Mocha::PRE_RUBY_V19
+      object.replace_instance_method(:id) do
+        calls << :id
+        return 1
+      end
+    end
+    object.replace_instance_method(:object_id) do
+      calls << :object_id
+      return 1
+    end
+    object.replace_instance_method(:__id__) do
+      calls << :__id__
+      return 1
+    end
+    object.replace_instance_method(:inspect) { 'object-description' }
 
     object.mocha_inspect
 
     assert_equal [:__id__], calls.uniq
   end
-
 end