aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/test/abstract_unit.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 686defab66..e97929fa44 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -20,13 +20,14 @@ require 'abstract_controller'
require 'action_controller'
require 'action_view'
require 'action_view/testing/resolvers'
-require 'action_view/testing/assertions'
require 'action_dispatch'
require 'active_support/dependencies'
require 'active_model'
require 'active_record'
require 'action_controller/caching'
+require 'rails-dom-testing'
+
require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
module Rails
@@ -106,7 +107,7 @@ end
module ActiveSupport
class TestCase
include ActionDispatch::DrawOnce
- include ActionView::Assertions
+ include Rails::Dom::Testing::Assertions
end
end