diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
| commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
| tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /actionpack/test/abstract_controller/layouts_test.rb | |
| parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
| parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
| download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/abstract_controller/layouts_test.rb')
| -rw-r--r-- | actionpack/test/abstract_controller/layouts_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb index 37eb55ec98..b28df7743f 100644 --- a/actionpack/test/abstract_controller/layouts_test.rb +++ b/actionpack/test/abstract_controller/layouts_test.rb @@ -9,7 +9,7 @@ module AbstractControllerTests include AbstractController::Renderer include AbstractController::Layouts - self.view_paths = [ActionView::Template::FixturePath.new( + self.view_paths = [ActionView::FixtureResolver.new( "layouts/hello.erb" => "With String <%= yield %>", "layouts/hello_override.erb" => "With Override <%= yield %>", "layouts/abstract_controller_tests/layouts/with_string_implied_child.erb" => |