mocha 1.6.0 → 1.7.0

data/lib/mocha/stubbing_error.rb

@@ -1,10 +1,8 @@
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha
-
   # Exception raised when stubbing a particular method is not allowed.
   #
   # @see Configuration.prevent
   class StubbingError < ErrorWithFilteredBacktrace; end
-
 end

data/lib/mocha/test_unit.rb

@@ -1,3 +1,3 @@
-require "mocha/integration/test_unit"
+require 'mocha/integration/test_unit'
 
 Mocha::Integration::TestUnit.activate

data/lib/mocha/thrower.rb

@@ -1,15 +1,12 @@
 module Mocha
-
   class Thrower
-
     def initialize(tag, object = nil)
-      @tag, @object = tag, object
+      @tag = tag
+      @object = object
     end
 
     def evaluate
       throw @tag, @object
     end
-
   end
-
 end

data/lib/mocha/unexpected_invocation.rb

@@ -1,11 +1,11 @@
 module Mocha
-
   # Exception raised when an unexpected method is invoked
   class UnexpectedInvocation
-
     # @private
     def initialize(mock, symbol, *arguments)
-      @mock, @symbol, @arguments = mock, symbol, arguments
+      @mock = mock
+      @symbol = symbol
+      @arguments = arguments
     end
 
     # @private
@@ -20,7 +20,5 @@ module Mocha
     def short_description
       "unexpected invocation: #{@symbol}(#{@arguments.join(', ')})"
     end
-
   end
-
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.6.0"
+  VERSION = '1.7.0'.freeze
 end

data/lib/mocha/yield_parameters.rb

@@ -3,18 +3,16 @@ require 'mocha/single_yield'
 require 'mocha/multiple_yields'
 
 module Mocha
-
   class YieldParameters
-
     def initialize
       @parameter_groups = []
     end
 
     def next_invocation
       case @parameter_groups.length
-        when 0 then NoYields.new
-        when 1 then @parameter_groups.first
-        else @parameter_groups.shift
+      when 0 then NoYields.new
+      when 1 then @parameter_groups.first
+      else @parameter_groups.shift
       end
     end
 
@@ -25,7 +23,5 @@ module Mocha
     def multiple_add(*parameter_groups)
       @parameter_groups << MultipleYields.new(*parameter_groups)
     end
-
   end
-
 end

data/mocha.gemspec

@@ -1,76 +1,52 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-require "mocha/version"
+require 'mocha/version'
 
 Gem::Specification.new do |s|
-  s.name = "mocha"
+  s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
   s.required_ruby_version = '>= 1.8.7'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["James Mead"]
-  s.description = "Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes."
-  s.email = "mocha-developer@googlegroups.com"
+  s.authors = ['James Mead']
+  s.description = 'Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.'
+  s.email = 'mocha-developer@googlegroups.com'
 
   s.files = `git ls-files`.split("\n")
-  s.files.delete(".travis.yml")
-  s.files.delete(".gitignore")
+  s.files.delete('.travis.yml')
+  s.files.delete('.gitignore')
 
-  s.homepage = "http://gofreerange.com/mocha/docs"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "mocha"
-  s.summary = "Mocking and stubbing library"
-  s.has_rdoc = "yard"
+  s.homepage = 'http://gofreerange.com/mocha/docs'
+  s.require_paths = ['lib']
+  s.summary = 'Mocking and stubbing library'
+  s.has_rdoc = 'yard'
 
-  s.add_dependency("metaclass", "~> 0.0.1")
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency('metaclass', '~> 0.0.1')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      if RUBY_VERSION >= '1.9.3'
-        s.add_development_dependency("rake", ">= 0")
-      else
-        s.add_development_dependency("rake", "~> 10.0")
-      end
-      s.add_development_dependency("introspection", "~> 0.0.1")
-      if RUBY_VERSION >= '2.2.0'
-        s.add_development_dependency("minitest")
-      end
-      if ENV["MOCHA_GENERATE_DOCS"]
-        s.add_development_dependency("yard")
-        s.add_development_dependency("redcarpet")
-      end
-    else
-      if RUBY_VERSION >= '1.9.3'
-        s.add_development_dependency("rake", ">= 0")
-      else
-        s.add_development_dependency("rake", "~> 10.0")
-      end
-      s.add_dependency("introspection", "~> 0.0.1")
-      if RUBY_VERSION >= '2.2.0'
-        s.add_dependency("minitest")
-      end
-      if ENV["MOCHA_GENERATE_DOCS"]
-        s.add_dependency("yard")
-        s.add_dependency("redcarpet")
+  unless s.respond_to?(:add_development_dependency)
+    class << s
+      def add_development_dependency(*args)
+        add_dependency(*args)
       end
     end
+  end
+
+  if RUBY_VERSION >= '1.9.3'
+    s.add_development_dependency('rake')
   else
-    if RUBY_VERSION >= '1.9.3'
-      s.add_development_dependency("rake", ">= 0")
-    else
-      s.add_development_dependency("rake", "~> 10.0")
-    end
-    s.add_dependency("introspection", "~> 0.0.1")
-    if RUBY_VERSION >= '2.2.0'
-      s.add_dependency("minitest")
-    end
-    if ENV["MOCHA_GENERATE_DOCS"]
-      s.add_dependency("yard")
-      s.add_dependency("redcarpet")
-    end
+    # Rake >= v11 does not support Ruby < v1.9.3 so use
+    s.add_development_dependency('rake', '~> 10.0')
+  end
+  s.add_development_dependency('introspection', '~> 0.0.1')
+  if RUBY_VERSION >= '2.2.0'
+    # No test libraries in standard library
+    s.add_development_dependency('minitest')
+  end
+  if RUBY_VERSION >= '1.9.2'
+    s.add_development_dependency('rubocop')
+  end
+  if ENV['MOCHA_GENERATE_DOCS']
+    s.add_development_dependency('redcarpet')
+    s.add_development_dependency('yard')
   end
 end

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
@@ -35,5 +32,4 @@ module AcceptanceTest
   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