diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
| commit | b9088dce07f8525cdb84a1312a77b81db79067d6 (patch) | |
| tree | 72ace069842b074981ba814ef1c335271176ce27 /actionpack/test/new_base/etag_test.rb | |
| parent | 4864f92ee34e840307d968fa8b04972b6d786fe8 (diff) | |
| parent | 4417a19b035d73eb46a5e06e296a4b1c8091bef1 (diff) | |
| download | rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.gz rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.bz2 rails-b9088dce07f8525cdb84a1312a77b81db79067d6.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/new_base/etag_test.rb')
| -rw-r--r-- | actionpack/test/new_base/etag_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/new_base/etag_test.rb b/actionpack/test/new_base/etag_test.rb index a40d3c936a..3a69e7dac4 100644 --- a/actionpack/test/new_base/etag_test.rb +++ b/actionpack/test/new_base/etag_test.rb @@ -2,7 +2,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") module Etags class BasicController < ActionController::Base - self.view_paths = [ActionView::Template::FixturePath.new( + self.view_paths = [ActionView::FixtureResolver.new( "etags/basic/base.html.erb" => "Hello from without_layout.html.erb", "layouts/etags.html.erb" => "teh <%= yield %> tagz" )] |