mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #21387 from ronakjangir47/remove_dup_minitest
Removed duplicate require 'minitest/mock'
This commit is contained in:
commit
a20c5236bf
5 changed files with 0 additions and 7 deletions
|
@ -1,6 +1,5 @@
|
|||
require 'abstract_unit'
|
||||
require 'active_job'
|
||||
require 'minitest/mock'
|
||||
require 'mailers/delayed_mailer'
|
||||
|
||||
class MessageDeliveryTest < ActiveSupport::TestCase
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
require 'abstract_unit'
|
||||
require 'action_controller/metal/strong_parameters'
|
||||
require 'minitest/mock'
|
||||
|
||||
class AlwaysPermittedParametersTest < ActiveSupport::TestCase
|
||||
def setup
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue