mocha 1.4.0 → 1.7.0

data/test/acceptance/acceptance_test_helper.rb

@@ -4,9 +4,7 @@ require 'mocha/configuration'
 require 'introspection'
 
 module AcceptanceTest
-
   class FakeLogger
-
     attr_reader :warnings
 
     def initialize
@@ -16,7 +14,6 @@ module AcceptanceTest
     def warn(message)
       @warnings << message
     end
-
   end
 
   attr_reader :logger
@@ -27,15 +24,12 @@ module AcceptanceTest
     Mocha::Configuration.reset_configuration
     @logger = FakeLogger.new
     mockery = Mocha::Mockery.instance
-    @original_logger = mockery.logger
     mockery.logger = @logger
   end
 
   def teardown_acceptance_test
     Mocha::Configuration.reset_configuration
-    Mocha::Mockery.instance.logger = @original_logger
   end
 
   include Introspection::Assertions
-
 end

data/test/acceptance/bug_18914_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class Bug18914Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,30 +13,26 @@ class Bug18914Test < Mocha::TestCase
   end
 
   class AlwaysEql
-
     def my_method
       true
     end
 
-    def ==(o)
+    def ==(_other)
       true
     end
 
-    def eql?(o)
+    def eql?(_other)
       true
     end
-
   end
 
   def test_should_not_allow_stubbing_of_non_mock_instance_disrupted_by_legitimate_overriding_of_eql_method
+    always_eql1 = AlwaysEql.new
+    always_eql1.stubs(:my_method).returns(false)
 
-    always_eql_1 = AlwaysEql.new
-    always_eql_1.stubs(:my_method).returns(false)
+    always_eql2 = AlwaysEql.new
+    always_eql2.stubs(:my_method).returns(false)
 
-    always_eql_2 = AlwaysEql.new
-    always_eql_2.stubs(:my_method).returns(false)
-
-    assert_equal false, always_eql_2.my_method
+    assert_equal false, always_eql2.my_method
   end
-
 end

data/test/acceptance/bug_21465_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class Bug21465Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -30,5 +29,4 @@ class Bug21465Test < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/bug_21563_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class Bug21563Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -21,5 +20,4 @@ class Bug21563Test < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/exception_rescue_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class ExceptionRescueTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -18,12 +17,12 @@ class ExceptionRescueTest < Mocha::TestCase
       mock = mock('mock')
       begin
         mock.some_method
-      rescue => e
+      rescue StandardError => e
         flunk "should not rescue #{e.class}"
       end
     end
     assert_failed(test_result)
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
+    assert_equal 'unexpected invocation: #<Mock:mock>.some_method()', test_result.failure_message_lines[0]
   end
 
   def test_invocation_never_expected_exception_is_not_caught_by_standard_rescue
@@ -32,12 +31,12 @@ class ExceptionRescueTest < Mocha::TestCase
       mock.expects(:some_method).never
       begin
         mock.some_method
-      rescue => e
+      rescue StandardError => e
         flunk "should not rescue #{e.class}"
       end
     end
     assert_failed(test_result)
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
+    assert_equal 'unexpected invocation: #<Mock:mock>.some_method()', test_result.failure_message_lines[0]
   end
 
   def test_unsatisfied_expectation_exception_is_not_caught_by_standard_rescue
@@ -47,9 +46,9 @@ class ExceptionRescueTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:mock>.some_method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly once, not yet invoked: #<Mock:mock>.some_method(any_parameters)'
     ], test_result.failure_message_lines
   end
 end

data/test/acceptance/expectations_on_multiple_methods_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -18,6 +17,7 @@ class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
       def my_instance_method_1
         :original_return_value_1
       end
+
       def my_instance_method_2
         :original_return_value_2
       end
@@ -38,6 +38,7 @@ class ExpectationsOnMultipleMethodsTest < Mocha::TestCase
       def my_instance_method_1
         :original_return_value_1
       end
+
       def my_instance_method_2
         :original_return_value_2
       end

data/test/acceptance/expected_invocation_count_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class ExpectedInvocationCountTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -30,9 +29,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected never, invoked once: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected never, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -53,9 +52,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly twice, invoked once: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly twice, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -67,9 +66,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected exactly twice, invoked 3 times: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected exactly twice, invoked 3 times: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -108,9 +107,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected between 2 and 4 times, invoked once: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected between 2 and 4 times, invoked once: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -122,9 +121,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected between 2 and 4 times, invoked 5 times: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected between 2 and 4 times, invoked 5 times: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -154,9 +153,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -186,9 +185,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected at most once, invoked twice: #<Mock:mock>.method(any_parameters)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected at most once, invoked twice: #<Mock:mock>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -209,9 +208,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:stub>.method()",
-      "unsatisfied expectations:",
-      "- expected never, invoked once: #<Mock:stub>.method(any_parameters)"
+      'unexpected invocation: #<Mock:stub>.method()',
+      'unsatisfied expectations:',
+      '- expected never, invoked once: #<Mock:stub>.method(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -223,10 +222,9 @@ class ExpectedInvocationCountTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method()",
-      "unsatisfied expectations:",
-      "- expected exactly once, not yet invoked: #<Mock:mock>.method(1)"
+      'unexpected invocation: #<Mock:mock>.method()',
+      'unsatisfied expectations:',
+      '- expected exactly once, not yet invoked: #<Mock:mock>.method(1)'
     ], test_result.failure_message_lines
   end
-
 end

data/test/acceptance/failure_messages_test.rb

@@ -2,8 +2,7 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class FailureMessagesTest < Mocha::TestCase
-
-  OBJECT_ADDRESS_PATTERN = '0x[0-9A-Fa-f]{1,12}'
+  OBJECT_ADDRESS_PATTERN = '0x[0-9A-Fa-f]{1,12}'.freeze
 
   include AcceptanceTest
 
@@ -48,7 +47,7 @@ class FailureMessagesTest < Mocha::TestCase
 
   def test_should_display_mock_address_when_expectation_was_on_unnamed_mock
     test_result = run_as_test do
-      foo = mock()
+      foo = mock
       foo.expects(:bar)
     end
     assert_match Regexp.new("#<Mock:#{OBJECT_ADDRESS_PATTERN}>"), test_result.failures[0].message
@@ -58,7 +57,6 @@ class FailureMessagesTest < Mocha::TestCase
     test_result = run_as_test do
       'Foo'.expects(:bar)
     end
-    assert_match Regexp.new(%{"Foo"}), test_result.failures[0].message
+    assert_match Regexp.new(%("Foo")), test_result.failures[0].message
   end
-
 end

data/test/acceptance/issue_272_test.rb

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

data/test/acceptance/issue_65_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class Issue65Test < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,48 +15,51 @@ class Issue65Test < Mocha::TestCase
   def test_expectations_on_class_methods_on_same_class_should_be_verified_in_consecutive_tests
     klass = Class.new do
       def self.foo; end
+
       def self.bar; end
     end
-    test_1 = run_as_test do
+    test1 = run_as_test do
       klass.expects(:foo)
       klass.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       klass.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 
   def test_expectations_on_any_instance_methods_on_same_class_should_be_verified_in_consecutive_tests
     klass = Class.new do
       def foo; end
+
       def bar; end
     end
-    test_1 = run_as_test do
+    test1 = run_as_test do
       klass.any_instance.expects(:foo)
       klass.new.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       klass.any_instance.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 
   def test_expectations_on_instance_methods_on_same_object_should_be_verified_in_consecutive_tests
     instance = Class.new do
       def foo; end
+
       def bar; end
     end.new
-    test_1 = run_as_test do
+    test1 = run_as_test do
       instance.expects(:foo)
       instance.foo
     end
-    assert_passed(test_1)
-    test_2 = run_as_test do
+    assert_passed(test1)
+    test2 = run_as_test do
       instance.expects(:bar)
     end
-    assert_failed(test_2)
+    assert_failed(test2)
   end
 end

data/test/acceptance/issue_70_test.rb

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

data/test/acceptance/mocha_example_test.rb

@@ -2,11 +2,12 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/setup'
 
 class MochaExampleTest < Mocha::TestCase
-
   class Rover
-
     def initialize(left_track, right_track, steps_per_metre, steps_per_degree)
-      @left_track, @right_track, @steps_per_metre, @steps_per_degree = left_track, right_track, steps_per_metre, steps_per_degree
+      @left_track = left_track
+      @right_track = right_track
+      @steps_per_metre = steps_per_metre
+      @steps_per_degree = steps_per_degree
     end
 
     def forward(metres)
@@ -30,9 +31,8 @@ class MochaExampleTest < Mocha::TestCase
     end
 
     def wait
-      while (@left_track.moving? or @right_track.moving?); end
+      while @left_track.moving? || @right_track.moving?; end
     end
-
   end
 
   def test_should_step_both_tracks_forward_ten_steps
@@ -94,5 +94,4 @@ class MochaExampleTest < Mocha::TestCase
 
     rover.left(90)
   end
-
 end

data/test/acceptance/mocha_test_result_test.rb

@@ -3,7 +3,6 @@ require 'mocha/setup'
 require 'execution_point'
 
 class MochaTestResultTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,7 +15,7 @@ class MochaTestResultTest < Mocha::TestCase
 
   def test_should_include_expectation_verification_in_assertion_count
     test_result = run_as_test do
-      object = mock()
+      object = mock
       object.expects(:message)
       object.message
     end
@@ -32,7 +31,7 @@ class MochaTestResultTest < Mocha::TestCase
 
   def test_should_not_include_stubbing_expectation_verification_in_assertion_count
     test_result = run_as_test do
-      object = mock()
+      object = mock
       object.stubs(:message)
       object.message
     end
@@ -41,7 +40,7 @@ class MochaTestResultTest < Mocha::TestCase
 
   def test_should_include_expectation_verification_failure_in_failure_count
     test_result = run_as_test do
-      object = mock()
+      object = mock
       object.expects(:message)
     end
     assert_equal 1, test_result.failure_count
@@ -49,7 +48,7 @@ class MochaTestResultTest < Mocha::TestCase
 
   def test_should_include_unexpected_verification_failure_in_failure_count
     test_result = run_as_test do
-      object = mock()
+      object = mock
       object.message
     end
     assert_equal 1, test_result.failure_count
@@ -62,10 +61,11 @@ class MochaTestResultTest < Mocha::TestCase
     assert_equal 1, test_result.failure_count
   end
 
+  # rubocop:disable Style/Semicolon
   def test_should_display_backtrace_indicating_line_number_where_unexpected_method_was_called
     execution_point = nil
     test_result = run_as_test do
-      object = mock()
+      object = mock
       execution_point = ExecutionPoint.current; object.message
     end
     assert_equal 1, test_result.failure_count
@@ -80,5 +80,5 @@ class MochaTestResultTest < 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/mock_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class MockTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +14,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_build_mock_and_explicitly_add_an_expectation_which_is_satisfied
     test_result = run_as_test do
-      foo = mock()
+      foo = mock
       foo.expects(:bar)
       foo.bar
     end
@@ -24,7 +23,7 @@ class MockTest < Mocha::TestCase
 
   def test_should_build_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
     test_result = run_as_test do
-      foo = mock()
+      foo = mock
       foo.expects(:bar)
     end
     assert_failed(test_result)
@@ -96,5 +95,4 @@ class MockTest < Mocha::TestCase
     end
     assert_failed(test_result)
   end
-
 end

data/test/acceptance/mock_with_initializer_block_test.rb

@@ -3,7 +3,6 @@ require 'mocha/setup'
 require 'deprecation_disabler'
 
 class MockWithInitializerBlockTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -54,5 +53,4 @@ class MockWithInitializerBlockTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/mocked_methods_dispatch_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class MockedMethodDispatchTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -74,5 +73,4 @@ class MockedMethodDispatchTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/multiple_expectations_failure_message_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class FailureMessageTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -21,10 +20,10 @@ class FailureMessageTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "unexpected invocation: #<Mock:mock>.method_one()",
-      "unsatisfied expectations:",
-      "- expected exactly once, invoked twice: #<Mock:mock>.method_one(any_parameters)"
-     ], test_result.failure_message_lines
+      'unexpected invocation: #<Mock:mock>.method_one()',
+      'unsatisfied expectations:',
+      '- expected exactly once, invoked twice: #<Mock:mock>.method_one(any_parameters)'
+    ], test_result.failure_message_lines
   end
 
   def test_should_report_satisfied_expectations_as_well_as_unsatisfied_expectations
@@ -37,11 +36,11 @@ class FailureMessageTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-       "unsatisfied expectations:",
-       "- expected exactly twice, invoked once: #<Mock:mock>.method_two(any_parameters)",
-       "satisfied expectations:",
-       "- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)"
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly twice, invoked once: #<Mock:mock>.method_two(any_parameters)',
+      'satisfied expectations:',
+      '- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)'
     ], test_result.failure_message_lines
   end
 
@@ -57,12 +56,12 @@ class FailureMessageTest < Mocha::TestCase
     end
     assert_failed(test_result)
     assert_equal [
-      "not all expectations were satisfied",
-      "unsatisfied expectations:",
-      "- expected exactly 3 times, invoked twice: #<Mock:mock>.method_three(any_parameters)",
-      "satisfied expectations:",
-      "- expected exactly twice, invoked twice: #<Mock:mock>.method_two(any_parameters)",
-      "- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)"
-     ], test_result.failure_message_lines
+      'not all expectations were satisfied',
+      'unsatisfied expectations:',
+      '- expected exactly 3 times, invoked twice: #<Mock:mock>.method_three(any_parameters)',
+      'satisfied expectations:',
+      '- expected exactly twice, invoked twice: #<Mock:mock>.method_two(any_parameters)',
+      '- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)'
+    ], test_result.failure_message_lines
   end
 end

data/test/acceptance/optional_parameters_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
 class OptionalParameterMatcherTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -66,5 +65,4 @@ class OptionalParameterMatcherTest < Mocha::TestCase
     end
     assert_failed(test_result)
   end
-
 end