diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-01-01 18:13:14 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-01-01 18:13:14 +0100 |
| commit | f1e20ce9a781eb73e421678fc8149eba77ddc6f6 (patch) | |
| tree | c88842ff5196f2fe0bd02af6d544f9dc87647789 /actionpack/test/template/render_test.rb | |
| parent | 49a055dff639164435dfb71bf18d695970eedac9 (diff) | |
| parent | a5004573d8d132fe079242fc082ab4661b0976e9 (diff) | |
| download | rails-f1e20ce9a781eb73e421678fc8149eba77ddc6f6.tar.gz rails-f1e20ce9a781eb73e421678fc8149eba77ddc6f6.tar.bz2 rails-f1e20ce9a781eb73e421678fc8149eba77ddc6f6.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/template/render_test.rb')
| -rw-r--r-- | actionpack/test/template/render_test.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 0387a11de2..4bd897efeb 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -197,7 +197,7 @@ class CachedViewRenderTest < Test::Unit::TestCase # Ensure view path cache is primed def setup view_paths = ActionController::Base.view_paths - assert view_paths.first.loaded? + assert_equal ActionView::Template::EagerPath, view_paths.first.class setup_view(view_paths) end end @@ -208,8 +208,9 @@ class LazyViewRenderTest < Test::Unit::TestCase # Test the same thing as above, but make sure the view path # is not eager loaded def setup - view_paths = ActionView::Base.process_view_paths(FIXTURE_LOAD_PATH) - assert !view_paths.first.loaded? + path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH) + view_paths = ActionView::Base.process_view_paths(path) + assert_equal ActionView::Template::Path, view_paths.first.class setup_view(view_paths) end end |