diff options
| author | Timm <kaspth@gmail.com> | 2013-09-24 19:09:22 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:16 +0200 |
| commit | a766a025e61c6ad43c113c7fbaca0adbb7841564 (patch) | |
| tree | d356a1297b564fb2b5b2e213f1ed8bf879b9577d | |
| parent | 2e8132444f1443806701fdf10a36e193031f6ebd (diff) | |
| download | rails-a766a025e61c6ad43c113c7fbaca0adbb7841564.tar.gz rails-a766a025e61c6ad43c113c7fbaca0adbb7841564.tar.bz2 rails-a766a025e61c6ad43c113c7fbaca0adbb7841564.zip | |
Moved ActionView::Assertions dependency from Action Pack's lib to abstract_unit.rb.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 0a728aa7c0..e6695ffc90 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -2,7 +2,6 @@ require 'rack/session/abstract/id' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/module/anonymous' require 'active_support/core_ext/hash/keys' -require 'action_view/testing/assertions' module ActionController module TemplateAssertions @@ -674,7 +673,6 @@ module ActionController included do include ActionController::TemplateAssertions include ActionDispatch::Assertions - include ActionView::Assertions class_attribute :_controller_class setup :setup_controller_request_and_response end diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 96f12b95a9..af3bc26691 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -2,7 +2,6 @@ require 'stringio' require 'uri' require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/object/try' -require 'action_view/testing/assertions' require 'rack/test' module ActionDispatch @@ -314,7 +313,7 @@ module ActionDispatch end module Runner - include ActionDispatch::Assertions, ActionView::Assertions + include ActionDispatch::Assertions def app @app ||= nil diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 6584d20840..686defab66 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -20,6 +20,7 @@ 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' @@ -105,6 +106,7 @@ end module ActiveSupport class TestCase include ActionDispatch::DrawOnce + include ActionView::Assertions end end |