aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/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 /actionpack/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 'actionpack/test')
-rw-r--r--actionpack/test/controller/parameters/always_permitted_parameters_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
index 59be08db54..efaf8a96c3 100644
--- a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
+++ b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
@@ -1,6 +1,5 @@
require 'abstract_unit'
require 'action_controller/metal/strong_parameters'
-require 'minitest/mock'
class AlwaysPermittedParametersTest < ActiveSupport::TestCase
def setup