diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-27 07:26:15 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-27 07:26:15 -0700 |
| commit | 1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e (patch) | |
| tree | 4a0bb6a357cedd2869dedf67d1bd17937c12c5c0 /actionpack | |
| parent | c131211c679ce227f4ba68e1b5f3db5ae0e2bdb6 (diff) | |
| parent | ba3411067760ca6cd69c49a4e5c6c3a021011ce6 (diff) | |
| download | rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.tar.gz rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.tar.bz2 rails-1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e.zip | |
Merge pull request #7760 from alindeman/adds_missing_dependency_to_action_view_test_case
Adds missing dependency to ActionView::TestCase::Behavior
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index a28033fb32..0caeef3192 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -356,6 +356,7 @@ module ActionController module Behavior extend ActiveSupport::Concern include ActionDispatch::TestProcess + include ActiveSupport::Testing::ConstantLookup attr_reader :response, :request diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index a4e8068026..04073c73cc 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -47,6 +47,8 @@ module ActionView include ActionView::RecordIdentifier include ActionView::RoutingUrlFor + include ActiveSupport::Testing::ConstantLookup + delegate :lookup_context, :to => :controller attr_accessor :controller, :output_buffer, :rendered |