aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-09-06 09:28:47 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-09-06 09:29:00 -0300
commitb77781c012ebb60bfeee114aef6597ab8d3d3016 (patch)
treeec08d2f785545d4cf46999fa8df27c66f29f22ec /actionview
parentfaccffed194a895a64f2e90e2a31b54b66b7d986 (diff)
downloadrails-b77781c012ebb60bfeee114aef6597ab8d3d3016.tar.gz
rails-b77781c012ebb60bfeee114aef6597ab8d3d3016.tar.bz2
rails-b77781c012ebb60bfeee114aef6597ab8d3d3016.zip
Fix failure with minitest 5.0.7
Require minitest/mock in test where stub method is needed. Apparently this was being "imported" by minitest pride plugin, which previously required "minitest/autorun", that required "minitest/mock", making the method available by chance. It has been changed in minitest: https://github.com/seattlerb/minitest/commit/595ce955c0d89575726d10fc18d2afd8f334bcbe So we need to make sure we require what we really need where necessary.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/template/url_helper_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index d512fa9913..e3440915a4 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -1,5 +1,6 @@
# encoding: utf-8
require 'abstract_unit'
+require 'minitest/mock'
class UrlHelperTest < ActiveSupport::TestCase