diff options
| author | Timm <kaspth@gmail.com> | 2013-10-11 12:55:21 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:17 +0200 |
| commit | 5ac99b09c459ddd422d8e51d93715d67539d9380 (patch) | |
| tree | 2975aa8e75c482502c71334c3c665eda20b3ec50 /actionpack | |
| parent | c287572d21584f1632a90ec0091e80061fc82b1e (diff) | |
| download | rails-5ac99b09c459ddd422d8e51d93715d67539d9380.tar.gz rails-5ac99b09c459ddd422d8e51d93715d67539d9380.tar.bz2 rails-5ac99b09c459ddd422d8e51d93715d67539d9380.zip | |
Exchanged requiring of action view assertions with rails dom testing assertions.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 5 |
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 |