aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-05-02 01:08:48 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-05-02 01:10:33 +0900
commitac2bc00482c1cf47a57477edb6ab1426a3ba593c (patch)
tree0d36fe5278ffe0d28bf21f2a98b717cf94416b59
parent24aeccb1c873cb8bbf00ff77cb33432cfe598b3d (diff)
downloadrails-ac2bc00482c1cf47a57477edb6ab1426a3ba593c.tar.gz
rails-ac2bc00482c1cf47a57477edb6ab1426a3ba593c.tar.bz2
rails-ac2bc00482c1cf47a57477edb6ab1426a3ba593c.zip
`require "active_support/test_case"` is not supported since 53e877f7
It will cause "undefined method `test_order' for ActiveSupport:Module (NoMethodError)". https://travis-ci.org/rails/rails/jobs/373472604#L1208
-rw-r--r--activerecord/test/cases/arel/helper.rb2
-rw-r--r--activerecord/test/cases/test_case.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/arel/helper.rb b/activerecord/test/cases/arel/helper.rb
index 15cfd44e87..486644a628 100644
--- a/activerecord/test/cases/arel/helper.rb
+++ b/activerecord/test/cases/arel/helper.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require "active_support/test_case"
+require "active_support"
require "rubygems"
require "minitest/autorun"
require "arel"
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 024b5bd8a1..409b07e56c 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require "active_support/test_case"
+require "active_support"
require "active_support/testing/autorun"
require "active_support/testing/method_call_assertions"
require "active_support/testing/stream"