diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-08-28 11:24:29 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-08-28 11:24:29 +0200 |
| commit | 4f093d81aca814b7433c4a1366985327b4ad0708 (patch) | |
| tree | d8361811cbf1f5b3947c57cbe1be1016c2835b2d /actionpack/lib/action_dispatch/testing | |
| parent | 1ec1eb2ff2ad5de70db7a632b93641a06a623a42 (diff) | |
| parent | daa0ed3af2e6443e26d658282b8ed654b5a32926 (diff) | |
| download | rails-4f093d81aca814b7433c4a1366985327b4ad0708.tar.gz rails-4f093d81aca814b7433c4a1366985327b4ad0708.tar.bz2 rails-4f093d81aca814b7433c4a1366985327b4ad0708.zip | |
Merge branch 'actionview-decoupling'
This branch contains set of changes that will allow to extract Action
View out of Action Pack in the future. This work will be probably done
after Rails 4.0 release, because of a few deprecations that were done
to make decoupling possible.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
3 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb index 7dc3d0f97c..6c61d4e61a 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/dom.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb @@ -1,4 +1,4 @@ -require 'action_controller/vendor/html-scanner' +require 'action_view/vendor/html-scanner' module ActionDispatch module Assertions diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb index d19d116a1f..9388d44eef 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb @@ -1,4 +1,5 @@ -require 'action_controller/vendor/html-scanner' +require 'action_view/vendor/html-scanner' +require 'active_support/core_ext/object/inclusion' #-- # Copyright (c) 2006 Assaf Arkin (http://labnotes.org) diff --git a/actionpack/lib/action_dispatch/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb index 68f1347e7c..2e38266aba 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/tag.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb @@ -1,4 +1,4 @@ -require 'action_controller/vendor/html-scanner' +require 'action_view/vendor/html-scanner' module ActionDispatch module Assertions |