提交 a20c5236 编写于 作者: K Kasper Timm Hansen

Merge pull request #21387 from ronakjangir47/remove_dup_minitest

Removed duplicate require 'minitest/mock'
require 'abstract_unit' require 'abstract_unit'
require 'active_job' require 'active_job'
require 'minitest/mock'
require 'mailers/delayed_mailer' require 'mailers/delayed_mailer'
class MessageDeliveryTest < ActiveSupport::TestCase class MessageDeliveryTest < ActiveSupport::TestCase
......
require 'abstract_unit' require 'abstract_unit'
require 'action_controller/metal/strong_parameters' require 'action_controller/metal/strong_parameters'
require 'minitest/mock'
class AlwaysPermittedParametersTest < ActiveSupport::TestCase class AlwaysPermittedParametersTest < ActiveSupport::TestCase
def setup def setup
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
require 'active_support/testing/autorun' require 'active_support/testing/autorun'
require 'active_support/testing/method_call_assertions' require 'active_support/testing/method_call_assertions'
require 'minitest/mock'
# Skips the current run on Rubinius using Minitest::Assertions#skip # Skips the current run on Rubinius using Minitest::Assertions#skip
def rubinius_skip(message = '') def rubinius_skip(message = '')
skip message if RUBY_ENGINE == 'rbx' skip message if RUBY_ENGINE == 'rbx'
......
...@@ -38,8 +38,6 @@ def jruby_skip(message = '') ...@@ -38,8 +38,6 @@ def jruby_skip(message = '')
skip message if defined?(JRUBY_VERSION) skip message if defined?(JRUBY_VERSION)
end end
require 'minitest/mock'
class ActiveSupport::TestCase class ActiveSupport::TestCase
include ActiveSupport::Testing::MethodCallAssertions include ActiveSupport::Testing::MethodCallAssertions
end end
require 'generators/generators_test_helper' require 'generators/generators_test_helper'
require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
require 'minitest/mock'
class NamedBaseTest < Rails::Generators::TestCase class NamedBaseTest < Rails::Generators::TestCase
include GeneratorsTestHelper include GeneratorsTestHelper
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册