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 | |
| 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'
| -rw-r--r-- | actionmailer/test/message_delivery_test.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/controller/parameters/always_permitted_parameters_test.rb | 1 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/named_base_test.rb | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb index 862ce26187..b834cdd08c 100644 --- a/actionmailer/test/message_delivery_test.rb +++ b/actionmailer/test/message_delivery_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'active_job' -require 'minitest/mock' require 'mailers/delayed_mailer' class MessageDeliveryTest < ActiveSupport::TestCase 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 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' 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 diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb index 1c32fc1bfd..291f5e06c3 100644 --- a/railties/test/generators/named_base_test.rb +++ b/railties/test/generators/named_base_test.rb @@ -1,6 +1,5 @@ require 'generators/generators_test_helper' require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' -require 'minitest/mock' class NamedBaseTest < Rails::Generators::TestCase include GeneratorsTestHelper |