mocha 1.1.0 → 1.2.0

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -64,6 +64,19 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  def test_should_allow_stubbing_method_to_which_any_instance_responds
+    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    klass = Class.new do
+      def respond_to?(method, include_private = false)
+        (method == :method_to_which_instance_responds)
+      end
+    end
+    test_result = run_as_test do
+      klass.any_instance.stubs(:method_to_which_instance_responds)
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_allow_stubbing_existing_protected_any_instance_method
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     klass = Class.new do

data/test/assertions.rb

@@ -1,6 +1,8 @@
+require 'mocha/ruby_version'
+
 module Assertions
-  def assert_method_visiblity(object, method_name, visiblity)
-    method_key = RUBY_VERSION < '1.9' ? method_name.to_s : method_name.to_sym
-    assert object.send("#{visiblity}_methods", false).include?(method_key), "#{method_name} is not #{visiblity}"
+  def assert_method_visibility(object, method_name, visiblity)
+    method_key = Mocha::PRE_RUBY_V19 ? method_name.to_s : method_name.to_sym
+    assert object.send("#{visiblity}_methods").include?(method_key), "#{method_name} is not #{visiblity}"
   end
-end
+end

data/test/minitest_result.rb

@@ -20,7 +20,7 @@ class MinitestResult
   end
 
   def failures
-    @tests.map(&:failures).flatten.select { |r| Minitest::Assertion === r }.map { |f| Failure.new(f) }
+    @tests.map(&:failures).flatten.select { |r| r.instance_of?(Minitest::Assertion) }.map { |f| Failure.new(f) }
   end
 
   def failure_count
@@ -32,7 +32,7 @@ class MinitestResult
   end
 
   def errors
-    @tests.map(&:failures).flatten.select { |r| Minitest::UnexpectedError === r }
+    @tests.map(&:failures).flatten.select { |r| r.instance_of?(Minitest::UnexpectedError) }
   end
 
   def error_count

data/test/test_runner.rb

@@ -49,7 +49,7 @@ module TestRunner
 
   def assert_passed(test_result)
     flunk "Test failed unexpectedly with message: #{test_result.failures}" if test_result.failure_count > 0
-    flunk "Test failed unexpectedly with message: #{test_result.errors}" if test_result.error_count > 0
+    flunk "Test failed unexpectedly with message: #{test_result.errors.map(&:exception)}" if test_result.error_count > 0
   end
 
   def assert_failed(test_result)

data/test/unit/any_instance_method_test.rb

@@ -7,6 +7,7 @@ class AnyInstanceMethodTest < Mocha::TestCase
 
   include Mocha
 
+unless RUBY_V2_PLUS
   def test_should_hide_original_method
     klass = Class.new { def method_x; end }
     method = AnyInstanceMethod.new(klass, :method_x)
@@ -15,6 +16,7 @@ class AnyInstanceMethodTest < Mocha::TestCase
 
     assert_equal false, klass.method_defined?(:method_x)
   end
+end
 
   def test_should_not_raise_error_hiding_method_that_isnt_defined
     klass = Class.new

data/test/unit/class_method_test.rb

@@ -8,6 +8,7 @@ class ClassMethodTest < Mocha::TestCase
 
   include Mocha
 
+unless RUBY_V2_PLUS
   def test_should_hide_original_method
     klass = Class.new { def self.method_x; end }
     method = ClassMethod.new(klass, :method_x)
@@ -16,6 +17,7 @@ class ClassMethodTest < Mocha::TestCase
 
     assert_equal false, klass.respond_to?(:method_x)
   end
+end
 
   def test_should_not_raise_error_hiding_method_that_isnt_defined
     klass = Class.new

data/test/unit/mock_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/ruby_version'
 require 'mocha/mock'
 require 'mocha/expectation_error_factory'
 require 'set'
@@ -44,7 +45,7 @@ class MockTest < Mocha::TestCase
     assert_equal true, mock.eql?(mock)
   end
 
-  if RUBY_VERSION < '1.9'
+  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) }

data/test/unit/object_inspect_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/ruby_version'
 require 'mocha/inspect'
 require 'method_definer'
 
@@ -25,7 +26,7 @@ class ObjectInspectTest < Mocha::TestCase
   def test_should_use_underscored_id_instead_of_object_id_or_id_so_that_they_can_be_stubbed
     calls = []
     object = Object.new
-    object.replace_instance_method(:id) { calls << :id; return 1 } if RUBY_VERSION < '1.9'
+    object.replace_instance_method(:id) { calls << :id; return 1 } if Mocha::PRE_RUBY_V19
     object.replace_instance_method(:object_id) { calls << :object_id; return 1 }
     object.replace_instance_method(:__id__) { calls << :__id__; return 1 }
     object.replace_instance_method(:inspect) { "object-description" }

data/test/unit/parameter_matchers/includes_test.rb

@@ -1,6 +1,9 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 require 'mocha/parameter_matchers/includes'
+require 'mocha/parameter_matchers/object'
+require 'mocha/parameter_matchers/has_key'
+require 'mocha/parameter_matchers/regexp_matches'
 require 'mocha/inspect'
 
 class IncludesTest < Mocha::TestCase
@@ -56,4 +59,44 @@ class IncludesTest < Mocha::TestCase
     matcher = includes(:x)
     assert !matcher.matches?([:x])
   end
+
+  def test_should_match_object_including_value_which_matches_nested_matcher
+    matcher = includes(has_key(:key))
+    assert matcher.matches?([[:non_matching_element, {:key => 'value'}]])
+  end
+
+  def test_should_not_match_object_which_doesnt_include_value_that_matches_nested_matcher
+    matcher = includes(has_key(:key))
+    assert !matcher.matches?([[:non_matching_element, {:other_key => 'other-value'}]])
+  end
+
+  def test_should_match_string_argument_containing_substring
+    matcher = includes('bar')
+    assert matcher.matches?(['foobarbaz'])
+  end
+
+  def test_should_not_match_string_argument_without_substring
+    matcher = includes('bar')
+    assert !matcher.matches?(['foobaz'])
+  end
+
+  def test_should_match_hash_argument_containing_given_key
+    matcher = includes(:key)
+    assert matcher.matches?([{:thing => 1, :key => 2}])
+  end
+
+  def test_should_not_match_hash_argument_missing_given_key
+    matcher = includes(:key)
+    assert !matcher.matches?([{:thing => 1, :other => :key}])
+  end
+
+  def test_should_match_hash_when_nested_matcher_matches_key
+    matcher = includes(regexp_matches(/ar/))
+    assert matcher.matches?([{'foo' => 1, 'bar' => 2}])
+  end
+
+  def test_should_not_match_hash_when_nested_matcher_doesn_not_match_key
+    matcher = includes(regexp_matches(/az/))
+    assert !matcher.matches?([{'foo' => 1, 'bar' => 2}])
+  end
 end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -87,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .yardopts
+- ".gemtest"
+- ".yardopts"
 - CONTRIBUTING.md
 - COPYING.md
 - Gemfile
@@ -199,6 +213,7 @@ files:
 - lib/mocha/pretty_parameters.rb
 - lib/mocha/receivers.rb
 - lib/mocha/return_values.rb
+- lib/mocha/ruby_version.rb
 - lib/mocha/sequence.rb
 - lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
@@ -252,6 +267,7 @@ files:
 - test/acceptance/stub_instance_method_defined_on_object_class_test.rb
 - test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb
 - test/acceptance/stub_instance_method_defined_on_superclass_test.rb
+- test/acceptance/stub_method_defined_on_module_and_aliased_test.rb
 - test/acceptance/stub_module_method_test.rb
 - test/acceptance/stub_test.rb
 - test/acceptance/stubba_example_test.rb
@@ -339,7 +355,9 @@ files:
 - yard-templates/default/layout/html/google_analytics.erb
 - yard-templates/default/layout/html/setup.rb
 homepage: http://gofreerange.com/mocha/docs
-licenses: []
+licenses:
+- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -347,19 +365,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mocha
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library
 test_files: []
-has_rdoc: yard