mocha 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892227bf10232258f227ef350fcea251d12d38d2
-  data.tar.gz: be2701d3a1ac024a45c95ce68868229958ae9c83
+  metadata.gz: b1a4df2eb13604de6b309bc453307d375c055620
+  data.tar.gz: 9144ebfe812beea562fc8c9ebdfb87326cb5ffa6
 SHA512:
-  metadata.gz: 733fa5b4b62ec68012bbdbe666548f5d213e126fea1f3e2c7c6cfbbea11e10fbfb424b655c0811f39bdca98316b545d81694b6fc02d799a1d2346bfb9cc110dd
-  data.tar.gz: b95a7905ab52b2fcf9d85597b264f1fd31f6cf5a2bc206c7af22b98c28599e46424c903128d1c1bcf4a5b4ea8b3d23d4677111bfc9544342bff0b337053943b7
+  metadata.gz: 1cf5b923bb4a91c6b3a1dac90aca3084229955743ae64c41cbecf561e8fd572f419d09d155ff3c9b6d0616258ca526d70677d79f9861e8987f99ee5b312bbb90
+  data.tar.gz: 9e635e0f0897d0437acffe0cfe4755ecae028da76513445a5b4b56ee48be878ae0070fa24d3fc8bddad02a69d790223909b936fdcdb6f53114feeec8c69cd3c4

data/README.md

@@ -33,7 +33,7 @@ require 'mocha/test_unit'
 require 'rubygems'
 gem 'mocha'
 require 'minitest/unit'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 #### Bundler
@@ -59,7 +59,7 @@ gem "mocha"
 
 # Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
 require "minitest/unit"
-require "mocha/mini_test"
+require "mocha/minitest"
 ```
 
 #### Rails
@@ -73,7 +73,7 @@ If you're loading Mocha using Bundler within a Rails application, you should set
 gem 'mocha'
 
 # At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 ##### RSpec
@@ -104,7 +104,7 @@ Note: As of version 0.9.8, the Mocha plugin is not automatically setup at plugin
 
 ```ruby
 # At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
-require 'mocha/mini_test'
+require 'mocha/minitest'
 ```
 
 #### Known Issues

data/RELEASE.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.4.0
+
+* Fix deprecation warning for `assert_nil` in `ClassMethodTest` (#308 & #309)
+* Display file and line number in deprecation warning - thanks to @chrisarcand (#310, #312 & #313)
+* Rename `mocha/mini_test.rb` to `mocha/minitest.rb` - thanks to @grosser (#320 & #322)
+* Fix warning when delegating to mock in Ruby 2.4 - thanks to @tjvc (#321 & #323)
+* Updates to Travis CI configuration ([73af600..9732726](https://github.com/freerange/mocha/compare/73af600...9732726) & 0426e5e)
+
 ## 1.3.0
 
 * Ensure all tests run individually - thanks to @chrisroos (#267)
@@ -418,7 +426,7 @@ Hash with wrong number of entries.
 
 ## 0.5.0
 
-- Parameter Matchers - I’ve added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
+- Parameter Matchers - I've added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
 
   object = mock()
   object.expects(:method).with(has_key('key_1'))

data/lib/mocha/deprecation.rb

@@ -1,4 +1,4 @@
-require 'mocha/debug'
+require 'mocha/backtrace_filter'
 
 module Mocha
 
@@ -10,13 +10,16 @@ module Mocha
 
       def warning(message)
         @messages << message
-        $stderr.puts "\n*** Mocha deprecation warning: #{message}\n\n" unless mode == :disabled
-        $stderr.puts caller.join("\n  ") if mode == :debug
+        unless mode == :disabled
+          filter = BacktraceFilter.new
+          location = filter.filtered(caller)[0]
+          $stderr.puts "Mocha deprecation warning at #{location}: #{message}"
+        end
       end
 
     end
 
-    self.mode = Debug::OPTIONS['debug'] ? :debug : :enabled
+    self.mode = :enabled
     self.messages = []
 
   end

data/lib/mocha/mini_test.rb

@@ -1,3 +1,5 @@
-require "mocha/integration/mini_test"
+require 'mocha/deprecation'
 
-Mocha::Integration::MiniTest.activate
+Mocha::Deprecation.warning("`require 'mocha/mini_test'` has been deprecated. Please use `require 'mocha/minitest' instead.")
+
+require 'mocha/minitest'

data/lib/mocha/minitest.rb

@@ -0,0 +1,3 @@
+require "mocha/integration/mini_test"
+
+Mocha::Integration::MiniTest.activate

data/lib/mocha/mock.rb

@@ -9,6 +9,7 @@ require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
 require 'mocha/expectation_error_factory'
 require 'mocha/deprecation'
+require 'mocha/ruby_version'
 
 module Mocha
 
@@ -314,7 +315,7 @@ module Mocha
     end
 
     # @private
-    def respond_to?(symbol, include_private = false)
+    def respond_to_missing?(symbol, include_private = false)
       if @responder then
         if @responder.method(:respond_to?).arity > 1
           @responder.respond_to?(symbol, include_private)
@@ -326,6 +327,13 @@ module Mocha
       end
     end
 
+    # @private
+    if PRE_RUBY_V19
+      def respond_to?(symbol, include_private = false)
+        respond_to_missing?(symbol, include_private)
+      end
+    end
+
     # @private
     def __verified__?(assertion_counter = nil)
       @expectations.verified?(assertion_counter)

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/test/integration/mini_test_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "mocha/mini_test"
+require "mocha/minitest"
 require "integration/shared_tests"
 
 class MiniTestTest < Mocha::TestCase

data/test/unit/class_method_test.rb

@@ -179,10 +179,9 @@ end
   def test_should_return_mock_for_stubbee
     mocha = Object.new
     stubbee = Object.new
-    stubbee.define_instance_accessor(:mocha) { mocha }
-    stubbee.mocha = nil
+    stubbee.define_instance_method(:mocha) { mocha }
     method = ClassMethod.new(stubbee, :method_name)
-    assert_equal stubbee.mocha, method.mock
+    assert_equal mocha, method.mock
   end
 
   def test_should_not_match_if_other_object_has_a_different_class

data/test/unit/mock_test.rb

@@ -334,6 +334,14 @@ class MockTest < Mocha::TestCase
     assert_match(/unexpected invocation/, e.message)
   end
 
+  unless PRE_RUBY_V19
+    def test_expectation_is_defined_on_mock
+      mock = build_mock
+      mock.expects(:method1)
+      assert defined? mock.method1
+    end
+  end
+
   private
 
   def build_mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
@@ -179,6 +179,7 @@ files:
 - lib/mocha/logger.rb
 - lib/mocha/method_matcher.rb
 - lib/mocha/mini_test.rb
+- lib/mocha/minitest.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
 - lib/mocha/module_method.rb
@@ -377,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mocha
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library