mocha 1.4.0 → 1.7.0

data/test/unit/configuration_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require "mocha/configuration"
+require 'mocha/configuration'
 
 class ConfigurationTest < Mocha::TestCase
   def test_allow_temporarily_changes_config_when_given_block
@@ -35,4 +35,3 @@ class ConfigurationTest < Mocha::TestCase
     assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
   end
 end
-

data/test/unit/date_time_inspect_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
 class DateTimeInspectTest < Mocha::TestCase
-
   def test_should_use_include_date_in_seconds
     time = Time.now
     assert_equal "#{time.inspect} (#{time.to_f} secs)", time.mocha_inspect
@@ -14,8 +13,7 @@ class DateTimeInspectTest < Mocha::TestCase
   end
 
   def test_should_use_to_s_for_datetime
-    datetime = DateTime.new(2006, 1, 1)
+    datetime = DateTime.new(2006, 1, 1) # rubocop:disable Style/DateTime
     assert_equal datetime.to_s, datetime.mocha_inspect
   end
-
 end

data/test/unit/exception_raiser_test.rb

@@ -4,7 +4,6 @@ require 'mocha/exception_raiser'
 require 'timeout'
 
 class ExceptionRaiserTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_raise_exception_with_specified_class_and_default_message
@@ -38,5 +37,4 @@ class ExceptionRaiserTest < Mocha::TestCase
     raiser = ExceptionRaiser.new(exception_class, nil)
     assert_raises(exception_class) { raiser.evaluate }
   end
-
 end

data/test/unit/expectation_list_test.rb

@@ -5,7 +5,6 @@ require 'set'
 require 'method_definer'
 
 class ExpectationListTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_return_added_expectation
@@ -78,5 +77,4 @@ class ExpectationListTest < Mocha::TestCase
     expectation_list = expectation_list1 + expectation_list2
     assert_equal [expectation1, expectation2], expectation_list.to_a
   end
-
 end

data/test/unit/expectation_test.rb

@@ -6,7 +6,6 @@ require 'execution_point'
 require 'simple_counter'
 
 class ExpectationTest < Mocha::TestCase
-
   include Mocha
 
   def new_expectation
@@ -18,12 +17,12 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_match_calls_to_same_method_with_exactly_zero_parameters
-    expectation = new_expectation.with()
+    expectation = new_expectation.with
     assert expectation.match?(:expected_method)
   end
 
   def test_should_not_match_calls_to_same_method_with_more_than_zero_parameters
-    expectation = new_expectation.with()
+    expectation = new_expectation.with
     assert !expectation.match?(:expected_method, 1, 2, 3)
   end
 
@@ -33,12 +32,12 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_match_calls_to_same_method_with_parameters_constrained_as_expected
-    expectation = new_expectation.with() {|x, y, z| x + y == z}
+    expectation = new_expectation.with { |x, y, z| x + y == z }
     assert expectation.match?(:expected_method, 1, 2, 3)
   end
 
   def test_should_not_match_calls_to_different_method_with_parameters_constrained_as_expected
-    expectation = new_expectation.with() {|x, y, z| x + y == z}
+    expectation = new_expectation.with { |x, y, z| x + y == z }
     assert !expectation.match?(:different_method, 1, 2, 3)
   end
 
@@ -62,7 +61,7 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_not_match_calls_to_same_method_with_parameters_not_constrained_as_expected
-    expectation = new_expectation.with() {|x, y, z| x + y == z}
+    expectation = new_expectation.with { |x, y, z| x + y == z }
     assert !expectation.match?(:expected_method, 1, 0, 3)
   end
 
@@ -99,51 +98,53 @@ class ExpectationTest < Mocha::TestCase
     assert_equal backtrace, expectation.backtrace
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_default_backtrace_to_caller
     execution_point = ExecutionPoint.current; expectation = Expectation.new(nil, :expected_method)
     assert_equal execution_point, ExecutionPoint.new(expectation.backtrace)
   end
+  # rubocop:enable Style/Semicolon
 
   def test_should_not_yield
     yielded = false
-    new_expectation.invoke() { yielded = true }
+    new_expectation.invoke { yielded = true }
     assert_equal false, yielded
   end
 
   def test_should_yield_no_parameters
-    expectation = new_expectation().yields()
+    expectation = new_expectation.yields
     yielded_parameters = nil
-    expectation.invoke() { |*parameters| yielded_parameters = parameters }
-    assert_equal Array.new, yielded_parameters
+    expectation.invoke { |*parameters| yielded_parameters = parameters }
+    assert_equal [], yielded_parameters
   end
 
   def test_should_yield_with_specified_parameters
-    expectation = new_expectation().yields(1, 2, 3)
+    expectation = new_expectation.yields(1, 2, 3)
     yielded_parameters = nil
-    expectation.invoke() { |*parameters| yielded_parameters = parameters }
+    expectation.invoke { |*parameters| yielded_parameters = parameters }
     assert_equal [1, 2, 3], yielded_parameters
   end
 
   def test_should_yield_different_parameters_on_consecutive_invocations
-    expectation = new_expectation().yields(1, 2, 3).yields(4, 5)
+    expectation = new_expectation.yields(1, 2, 3).yields(4, 5)
     yielded_parameters = []
-    expectation.invoke() { |*parameters| yielded_parameters << parameters }
-    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    expectation.invoke { |*parameters| yielded_parameters << parameters }
+    expectation.invoke { |*parameters| yielded_parameters << parameters }
     assert_equal [[1, 2, 3], [4, 5]], yielded_parameters
   end
 
   def test_should_yield_multiple_times_for_single_invocation
-    expectation = new_expectation().multiple_yields([1, 2, 3], [4, 5])
+    expectation = new_expectation.multiple_yields([1, 2, 3], [4, 5])
     yielded_parameters = []
-    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    expectation.invoke { |*parameters| yielded_parameters << parameters }
     assert_equal [[1, 2, 3], [4, 5]], yielded_parameters
   end
 
   def test_should_yield_multiple_times_for_first_invocation_and_once_for_second_invocation
-    expectation = new_expectation().multiple_yields([1, 2, 3], [4, 5]).then.yields(6, 7)
+    expectation = new_expectation.multiple_yields([1, 2, 3], [4, 5]).then.yields(6, 7)
     yielded_parameters = []
-    expectation.invoke() { |*parameters| yielded_parameters << parameters }
-    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    expectation.invoke { |*parameters| yielded_parameters << parameters }
+    expectation.invoke { |*parameters| yielded_parameters << parameters }
     assert_equal [[1, 2, 3], [4, 5], [6, 7]], yielded_parameters
   end
 
@@ -179,7 +180,7 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_return_nil_if_no_value_specified
-    expectation = new_expectation.returns()
+    expectation = new_expectation.returns
     assert_nil expectation.invoke
   end
 
@@ -209,21 +210,21 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_raise_custom_exception_with_message
-    exception_msg = "exception message"
+    exception_msg = 'exception message'
     expectation = new_expectation.raises(Exception, exception_msg)
     exception = assert_raise(Exception) { expectation.invoke }
     assert_equal exception_msg, exception.message
   end
 
   def test_should_return_values_then_raise_exception
-    expectation = new_expectation.returns(1, 2).then.raises()
+    expectation = new_expectation.returns(1, 2).then.raises
     assert_equal 1, expectation.invoke
     assert_equal 2, expectation.invoke
     assert_raise(RuntimeError) { expectation.invoke }
   end
 
   def test_should_raise_exception_then_return_values
-    expectation = new_expectation.raises().then.returns(1, 2)
+    expectation = new_expectation.raises.then.returns(1, 2)
     assert_raise(RuntimeError) { expectation.invoke }
     assert_equal 1, expectation.invoke
     assert_equal 2, expectation.invoke
@@ -276,7 +277,7 @@ class ExpectationTest < Mocha::TestCase
 
   def test_should_verify_successfully_if_expected_call_was_made_at_least_once
     expectation = new_expectation.at_least_once
-    3.times {expectation.invoke}
+    3.times { expectation.invoke }
     assert expectation.verified?
   end
 
@@ -288,20 +289,20 @@ class ExpectationTest < Mocha::TestCase
 
   def test_should_verify_successfully_if_expected_call_was_made_expected_number_of_times
     expectation = new_expectation.times(2)
-    2.times {expectation.invoke}
+    2.times { expectation.invoke }
     assert expectation.verified?
   end
 
   def test_should_not_verify_successfully_if_expected_call_was_made_too_few_times
     expectation = new_expectation.times(2)
-    1.times {expectation.invoke}
+    1.times { expectation.invoke }
     assert !expectation.verified?
     assert_match(/expected exactly twice, invoked once/i, expectation.mocha_inspect)
   end
 
   def test_should_not_verify_successfully_if_expected_call_was_made_too_many_times
     expectation = new_expectation.times(2)
-    3.times {expectation.invoke}
+    3.times { expectation.invoke }
     assert !expectation.verified?
   end
 
@@ -320,13 +321,14 @@ class ExpectationTest < Mocha::TestCase
     assert_equal 0, assertion_counter.count
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_store_backtrace_from_point_where_expectation_was_created
     execution_point = ExecutionPoint.current; expectation = Expectation.new(nil, :expected_method)
     assert_equal execution_point, ExecutionPoint.new(expectation.backtrace)
   end
+  # rubocop:enable Style/Semicolon
 
   class FakeMock
-
     def initialize(name)
       @name = name
     end
@@ -334,20 +336,18 @@ class ExpectationTest < Mocha::TestCase
     def mocha_inspect
       @name
     end
-
   end
 
   def test_should_raise_error_with_message_indicating_which_method_was_expected_to_be_called_on_which_mock_object_with_which_parameters_and_in_what_sequences
     mock = FakeMock.new('mock')
     sequence_one = Sequence.new('one')
     sequence_two = Sequence.new('two')
-    expectation = Expectation.new(mock, :expected_method).with(1, 2, {'a' => true}, {:b => false}, [1, 2, 3]).in_sequence(sequence_one, sequence_two)
+    expectation = Expectation.new(mock, :expected_method).with(1, 2, { 'a' => true }, { :b => false }, [1, 2, 3]).in_sequence(sequence_one, sequence_two)
     assert !expectation.verified?
     assert_match %{mock.expected_method(1, 2, {"a" => true}, {:b => false}, [1, 2, 3]); in sequence "one"; in sequence "two"}, expectation.mocha_inspect
   end
 
   class FakeConstraint
-
     def initialize(allows_invocation_now)
       @allows_invocation_now = allows_invocation_now
     end
@@ -355,12 +355,11 @@ class ExpectationTest < Mocha::TestCase
     def allows_invocation_now?
       @allows_invocation_now
     end
-
   end
 
   def test_should_be_in_correct_order_if_all_ordering_constraints_allow_invocation_now
-    constraint_one = FakeConstraint.new(allows_invocation_now = true)
-    constraint_two = FakeConstraint.new(allows_invocation_now = true)
+    constraint_one = FakeConstraint.new(true)
+    constraint_two = FakeConstraint.new(true)
     expectation = Expectation.new(nil, :method_one)
     expectation.add_ordering_constraint(constraint_one)
     expectation.add_ordering_constraint(constraint_two)
@@ -368,8 +367,8 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_not_be_in_correct_order_if_one_ordering_constraint_does_not_allow_invocation_now
-    constraint_one = FakeConstraint.new(allows_invocation_now = true)
-    constraint_two = FakeConstraint.new(allows_invocation_now = false)
+    constraint_one = FakeConstraint.new(true)
+    constraint_two = FakeConstraint.new(false)
     expectation = Expectation.new(nil, :method_one)
     expectation.add_ordering_constraint(constraint_one)
     expectation.add_ordering_constraint(constraint_two)
@@ -377,8 +376,8 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_match_if_all_ordering_constraints_allow_invocation_now
-    constraint_one = FakeConstraint.new(allows_invocation_now = true)
-    constraint_two = FakeConstraint.new(allows_invocation_now = true)
+    constraint_one = FakeConstraint.new(true)
+    constraint_two = FakeConstraint.new(true)
     expectation = Expectation.new(nil, :method_one)
     expectation.add_ordering_constraint(constraint_one)
     expectation.add_ordering_constraint(constraint_two)
@@ -386,8 +385,8 @@ class ExpectationTest < Mocha::TestCase
   end
 
   def test_should_not_match_if_one_ordering_constraints_does_not_allow_invocation_now
-    constraint_one = FakeConstraint.new(allows_invocation_now = true)
-    constraint_two = FakeConstraint.new(allows_invocation_now = false)
+    constraint_one = FakeConstraint.new(true)
+    constraint_two = FakeConstraint.new(false)
     expectation = Expectation.new(nil, :method_one)
     expectation.add_ordering_constraint(constraint_one)
     expectation.add_ordering_constraint(constraint_two)
@@ -418,7 +417,6 @@ class ExpectationTest < Mocha::TestCase
   end
 
   class FakeSequence
-
     attr_reader :expectations
 
     def initialize
@@ -428,7 +426,6 @@ class ExpectationTest < Mocha::TestCase
     def constrain_as_next_in_sequence(expectation)
       @expectations << expectation
     end
-
   end
 
   def test_should_tell_sequences_to_constrain_expectation_as_next_in_sequence
@@ -441,7 +438,6 @@ class ExpectationTest < Mocha::TestCase
   end
 
   class FakeState
-
     def initialize
       @active = false
     end
@@ -453,7 +449,6 @@ class ExpectationTest < Mocha::TestCase
     def active?
       @active
     end
-
   end
 
   def test_should_change_state_when_expectation_is_invoked
@@ -483,7 +478,7 @@ class ExpectationTest < Mocha::TestCase
       define_method(:inspect) { 'mock' }
     end
     expectation = Expectation.new(object, :method_one)
-    assert_match Regexp.new("^#<Expectation:0x[0-9A-Fa-f]{1,12} .* >$"), expectation.inspect
+    assert_match Regexp.new('^#<Expectation:0x[0-9A-Fa-f]{1,12} .* >$'), expectation.inspect
   end
 
   def test_should_include_output_of_mocha_inspect_in_inspect

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

@@ -1,29 +1,35 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/hooks'
+require 'mocha/mockery'
 
 class HooksTest < Mocha::TestCase
+  # rubocop:disable Style/ClassAndModuleChildren
   class Mocha::Mockery
     class << self
-      attr_writer :instance
+      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
 
   def test_ensure_mockery_instance_is_reset_even_when_an_exception_is_raised_in_mockery_teardown
     fake_test_case = Object.new.extend(Mocha::Hooks)
-    original_mockery = FakeMockery.new
-    Mocha::Mockery.instance = original_mockery
+    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_not_same Mocha::Mockery.instance, original_mockery
+    assert_kind_of Mocha::Mockery::Null, Mocha::Mockery.instance
   end
 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