mocha 1.6.0 → 1.10.1

data/test/acceptance/issue_70_test.rb

@@ -1,8 +1,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

@@ -1,12 +1,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 +30,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 +93,4 @@ class MochaExampleTest < Mocha::TestCase
 
     rover.left(90)
   end
-
 end

data/test/acceptance/mocha_test_result_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'execution_point'
 
 class MochaTestResultTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -16,7 +14,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 +30,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 +39,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 +47,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 +60,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 +79,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

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class MockTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,7 +13,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,13 +22,13 @@ 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)
   end
 
-  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
+  def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
@@ -39,7 +37,16 @@ class MockTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
-  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+  def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
+    test_result = run_as_test do
+      foo = mock(:foo)
+      foo.expects(:bar)
+      foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
     test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
@@ -47,6 +54,14 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
+  def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+    test_result = run_as_test do
+      foo = mock(:foo)
+      foo.expects(:bar)
+    end
+    assert_failed(test_result)
+  end
+
   def test_should_build_mock_incorporating_two_expectations_which_are_satisifed
     test_result = run_as_test do
       foo = mock(:bar => 'bar', :baz => 'baz')
@@ -72,7 +87,7 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_which_are_satisifed
+  def test_should_build_string_named_mock_incorporating_two_expectations_which_are_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
@@ -81,7 +96,16 @@ class MockTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_which_are_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.bar
+      foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_string_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.baz
@@ -89,7 +113,15 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
-  def test_should_build_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.baz
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_string_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
     test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
@@ -97,4 +129,11 @@ class MockTest < Mocha::TestCase
     assert_failed(test_result)
   end
 
+  def test_should_build_symbol_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+    test_result = run_as_test do
+      foo = mock(:foo, :bar => 'bar', :baz => 'baz')
+      foo.bar
+    end
+    assert_failed(test_result)
+  end
 end

data/test/acceptance/mocked_methods_dispatch_test.rb

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

data/test/acceptance/multiple_expectations_failure_message_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class FailureMessageTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -21,10 +19,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 +35,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 +55,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

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

data/test/acceptance/parameter_matcher_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class ParameterMatcherTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -264,7 +262,7 @@ class ParameterMatcherTest < Mocha::TestCase
   def test_should_match_parameter_when_value_is_divisible_by_four
     test_result = run_as_test do
       mock = mock()
-      mock.expects(:method).with { |actual_value| actual_value % 4 == 0 }
+      mock.expects(:method).with { |actual_value| (actual_value % 4).zero? }
       mock.method(8)
     end
     assert_passed(test_result)
@@ -273,7 +271,7 @@ class ParameterMatcherTest < Mocha::TestCase
   def test_should_not_match_parameter_when_value_is_not_divisible_by_four
     test_result = run_as_test do
       mock = mock()
-      mock.expects(:method).with { |actual_value| actual_value % 4 == 0 }
+      mock.expects(:method).with { |actual_value| (actual_value % 4).zero? }
       mock.method(9)
     end
     assert_failed(test_result)

data/test/acceptance/partial_mocks_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 
 class PartialMockTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -15,8 +13,8 @@ class PartialMockTest < Mocha::TestCase
 
   def test_should_pass_if_all_expectations_are_satisfied
     test_result = run_as_test do
-      partial_mock_one = "partial_mock_one"
-      partial_mock_two = "partial_mock_two"
+      partial_mock_one = 'partial_mock_one'
+      partial_mock_two = 'partial_mock_two'
 
       partial_mock_one.expects(:first)
       partial_mock_one.expects(:second)
@@ -31,8 +29,8 @@ class PartialMockTest < Mocha::TestCase
 
   def test_should_fail_if_all_expectations_are_not_satisfied
     test_result = run_as_test do
-      partial_mock_one = "partial_mock_one"
-      partial_mock_two = "partial_mock_two"
+      partial_mock_one = 'partial_mock_one'
+      partial_mock_two = 'partial_mock_two'
 
       partial_mock_one.expects(:first)
       partial_mock_one.expects(:second)
@@ -43,5 +41,4 @@ class PartialMockTest < Mocha::TestCase
     end
     assert_failed(test_result)
   end
-
 end

data/test/acceptance/prepend_test.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
 require 'mocha/ruby_version'
 
 class PrependTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -18,13 +16,13 @@ class PrependTest < Mocha::TestCase
 
     module Mod1
       def my_method
-        super + " World"
+        super + ' World'
       end
     end
 
     module Mod2
       def my_method
-        super + " Wide"
+        super + ' Wide'
       end
     end
 
@@ -33,7 +31,7 @@ class PrependTest < Mocha::TestCase
       prepend Mod2
 
       def my_method
-        "Hello"
+        'Hello'
       end
     end
 
@@ -43,7 +41,7 @@ class PrependTest < Mocha::TestCase
         prepend Mod2
 
         def my_method
-          "Hello"
+          'Hello'
         end
       end
     end
@@ -51,12 +49,12 @@ class PrependTest < Mocha::TestCase
     def test_stubbing_any_instance_with_multiple_prepended_methods
       assert_snapshot_unchanged(Klass1) do
         test_result = run_as_test do
-          Klass1.any_instance.stubs(:my_method).returns("Bye World")
-          assert_equal "Bye World", Klass1.new.my_method
+          Klass1.any_instance.stubs(:my_method).returns('Bye World')
+          assert_equal 'Bye World', Klass1.new.my_method
         end
         assert_passed(test_result)
       end
-      assert_equal "Hello World Wide", Klass1.new.my_method
+      assert_equal 'Hello World Wide', Klass1.new.my_method
     end
 
     def test_stubbing_instance_with_multiple_prepended_methods
@@ -64,26 +62,25 @@ class PrependTest < Mocha::TestCase
 
       assert_snapshot_unchanged(object) do
         test_result = run_as_test do
-          object.stubs(:my_method).returns("Bye World")
-          assert_equal "Bye World", object.my_method
-          assert_equal "Hello World Wide", Klass1.new.my_method
+          object.stubs(:my_method).returns('Bye World')
+          assert_equal 'Bye World', object.my_method
+          assert_equal 'Hello World Wide', Klass1.new.my_method
         end
         assert_passed(test_result)
       end
-      assert_equal "Hello World Wide", object.my_method
+      assert_equal 'Hello World Wide', object.my_method
     end
 
     def test_stubbing_a_prepended_class_method
       assert_snapshot_unchanged(Klass2) do
         test_result = run_as_test do
-          Klass2.stubs(:my_method).returns("Bye World")
-          assert_equal "Bye World", Klass2.my_method
+          Klass2.stubs(:my_method).returns('Bye World')
+          assert_equal 'Bye World', Klass2.my_method
         end
         assert_passed(test_result)
       end
-      assert_equal "Hello World Wide", Klass2.my_method
+      assert_equal 'Hello World Wide', Klass2.my_method
     end
 
   end
-
 end