test/integration/shared_tests.rb in mocha-1.6.0 vs test/integration/shared_tests.rb in mocha-1.7.0

- old
+ new

@@ -9,10 +9,11 @@ assert true end assert_passed(test_result) end + # rubocop:disable Style/Semicolon def test_assertion_unsatisfied execution_point = nil test_result = run_as_test do execution_point = ExecutionPoint.current; flunk end @@ -22,105 +23,105 @@ end def test_mock_object_unexpected_invocation execution_point = nil test_result = run_as_test do - mock = mock("not expecting invocation") + mock = mock('not expecting invocation') execution_point = ExecutionPoint.current; mock.unexpected end assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) - assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines + assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines end def test_mock_object_explicitly_unexpected_invocation execution_point = nil test_result = run_as_test do - mock = mock("not expecting invocation") + mock = mock('not expecting invocation') mock.expects(:unexpected).never execution_point = ExecutionPoint.current; mock.unexpected end assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) assert_equal [ - "unexpected invocation: #<Mock:not expecting invocation>.unexpected()", - "unsatisfied expectations:", - "- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)" + 'unexpected invocation: #<Mock:not expecting invocation>.unexpected()', + 'unsatisfied expectations:', + '- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)' ], test_result.failure_message_lines end def test_mock_object_unsatisfied_expectation execution_point = nil test_result = run_as_test do - mock = mock("expecting invocation") + mock = mock('expecting invocation') execution_point = ExecutionPoint.current; mock.expects(:expected) end assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) assert_equal [ - "not all expectations were satisfied", - "unsatisfied expectations:", - "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)" + 'not all expectations were satisfied', + 'unsatisfied expectations:', + '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)' ], test_result.failure_message_lines end def test_mock_object_unexpected_invocation_in_setup execution_point = nil test_result = run_as_tests( :setup => lambda { - mock = mock("not expecting invocation") + mock = mock('not expecting invocation') execution_point = ExecutionPoint.current; mock.unexpected }, :test_me => lambda { assert true } ) assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) - assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines + assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines end def test_mock_object_unsatisfied_expectation_in_setup execution_point = nil test_result = run_as_tests( :setup => lambda { - mock = mock("expecting invocation") + mock = mock('expecting invocation') execution_point = ExecutionPoint.current; mock.expects(:expected) }, :test_me => lambda { assert true } ) assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) assert_equal [ - "not all expectations were satisfied", - "unsatisfied expectations:", - "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)" + 'not all expectations were satisfied', + 'unsatisfied expectations:', + '- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)' ], test_result.failure_message_lines end def test_mock_object_unexpected_invocation_in_teardown execution_point = nil test_result = run_as_tests( :test_me => lambda { assert true }, :teardown => lambda { - mock = mock("not expecting invocation") + mock = mock('not expecting invocation') execution_point = ExecutionPoint.current; mock.unexpected } ) assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) - assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines + assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines end def test_real_object_explicitly_unexpected_invocation execution_point = nil object = Object.new @@ -131,11 +132,11 @@ assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) assert_equal [ "unexpected invocation: #{object.mocha_inspect}.unexpected()", - "unsatisfied expectations:", + 'unsatisfied expectations:', "- expected never, invoked once: #{object.mocha_inspect}.unexpected(any_parameters)" ], test_result.failure_message_lines end def test_real_object_unsatisfied_expectation @@ -146,12 +147,12 @@ end assert_failed(test_result) failure = test_result.failures.first assert_equal execution_point, ExecutionPoint.new(failure.location) assert_equal [ - "not all expectations were satisfied", - "unsatisfied expectations:", + 'not all expectations were satisfied', + 'unsatisfied expectations:', "- expected exactly once, not yet invoked: #{object.mocha_inspect}.expected(any_parameters)" ], test_result.failure_message_lines end def test_real_object_expectation_does_not_leak_into_subsequent_test @@ -167,8 +168,9 @@ } ) assert_failed(test_result) exception = test_result.errors.first.exception assert_equal execution_point, ExecutionPoint.new(exception.backtrace) - assert_match %r{undefined method `foo'}, exception.message + assert_match(/undefined method `foo'/, exception.message) end + # rubocop:enable Style/Semicolon end