aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-08-26 20:27:30 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-08-26 20:27:30 +0200
commita20c5236bf9e355407946010e30b146ed5f9eb87 (patch)
tree79ed422991ab8e173eb44b6370991fe10eae9b4b /activemodel/test
parent54becd1a53bae3805f598b0920c57452f2629b34 (diff)
parent8d7bf977984d041f1a70ba67638956ce6eb3d05b (diff)
downloadrails-a20c5236bf9e355407946010e30b146ed5f9eb87.tar.gz
rails-a20c5236bf9e355407946010e30b146ed5f9eb87.tar.bz2
rails-a20c5236bf9e355407946010e30b146ed5f9eb87.zip
Merge pull request #21387 from ronakjangir47/remove_dup_minitest
Removed duplicate require 'minitest/mock'
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/helper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index c100646837..0cd80be66f 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -13,8 +13,6 @@ I18n.enforce_available_locales = false
require 'active_support/testing/autorun'
require 'active_support/testing/method_call_assertions'
-require 'minitest/mock'
-
# Skips the current run on Rubinius using Minitest::Assertions#skip
def rubinius_skip(message = '')
skip message if RUBY_ENGINE == 'rbx'