aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/test/abstract_unit.rb15
-rw-r--r--railties/test/generators/generators_test_helper.rb2
-rw-r--r--railties/test/isolation/abstract_unit.rb2
3 files changed, 0 insertions, 19 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 9600194ed6..93d09aad55 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -18,19 +18,4 @@ module TestApp
end
end
-class ActiveSupport::TestCase
- include ActiveSupport::Testing::Stream
-
- private
- # Skips the current run on Rubinius using Minitest::Assertions#skip
- def rubinius_skip(message = "")
- skip message if RUBY_ENGINE == "rbx"
- end
-
- # Skips the current run on JRuby using Minitest::Assertions#skip
- def jruby_skip(message = "")
- skip message if defined?(JRUBY_VERSION)
- end
-end
-
require_relative "../../tools/test_common"
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 8b42cb83db..c68ba46a9a 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -3,7 +3,6 @@
require "abstract_unit"
require "active_support/core_ext/module/remove_method"
require "active_support/testing/stream"
-require "active_support/testing/method_call_assertions"
require "rails/generators"
require "rails/generators/test_case"
@@ -28,7 +27,6 @@ require "action_view"
module GeneratorsTestHelper
include ActiveSupport::Testing::Stream
- include ActiveSupport::Testing::MethodCallAssertions
GemfileEntry = Struct.new(:name, :version, :comment, :options, :commented_out) do
def initialize(name, version, comment, options = {}, commented_out = false)
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 6077ba3ee7..40731d5f07 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -14,7 +14,6 @@ require "bundler/setup" unless defined?(Bundler)
require "active_support"
require "active_support/testing/autorun"
require "active_support/testing/stream"
-require "active_support/testing/method_call_assertions"
require "active_support/test_case"
require "minitest/retry"
@@ -495,7 +494,6 @@ class ActiveSupport::TestCase
include TestHelpers::Generation
include TestHelpers::Reload
include ActiveSupport::Testing::Stream
- include ActiveSupport::Testing::MethodCallAssertions
end
# Create a scope and build a fixture rails app