diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-26 20:27:30 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-26 20:27:30 +0200 |
commit | a20c5236bf9e355407946010e30b146ed5f9eb87 (patch) | |
tree | 79ed422991ab8e173eb44b6370991fe10eae9b4b /activesupport | |
parent | 54becd1a53bae3805f598b0920c57452f2629b34 (diff) | |
parent | 8d7bf977984d041f1a70ba67638956ce6eb3d05b (diff) | |
download | rails-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 'activesupport')
-rw-r--r-- | activesupport/test/abstract_unit.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 65a8edbabb..c0e23e89f7 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -38,8 +38,6 @@ def jruby_skip(message = '') skip message if defined?(JRUBY_VERSION) end -require 'minitest/mock' - class ActiveSupport::TestCase include ActiveSupport::Testing::MethodCallAssertions end |