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/test/template/log_subscriber_test.rb | |
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/test/template/log_subscriber_test.rb')
-rw-r--r-- | actionpack/test/template/log_subscriber_test.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb index 1713ce935c..7f4c84929f 100644 --- a/actionpack/test/template/log_subscriber_test.rb +++ b/actionpack/test/template/log_subscriber_test.rb @@ -8,9 +8,10 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def setup super - @controller = Object.new - @controller.stubs(:_prefixes).returns(%w(test)) - @view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller) + view_paths = ActionController::Base.view_paths + lookup_context = ActionView::LookupContext.new(view_paths, {}, ["test"]) + renderer = ActionView::Renderer.new(lookup_context) + @view = ActionView::Base.new(renderer, {}) Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH)) ActionView::LogSubscriber.attach_to :action_view end |