diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-20 22:09:12 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-20 22:09:12 +0000 |
| commit | e1056530665d5c8eed2c325157fbb88553eb2678 (patch) | |
| tree | 30341bae8b9a63faed289f9dc56c1a654a449731 /actionpack/test/controller/layout_test.rb | |
| parent | 89cb34c9cfe9d169b79206b74c602e91bc7116a5 (diff) | |
| download | rails-e1056530665d5c8eed2c325157fbb88553eb2678.tar.gz rails-e1056530665d5c8eed2c325157fbb88553eb2678.tar.bz2 rails-e1056530665d5c8eed2c325157fbb88553eb2678.zip | |
Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index cade6738a7..edf8f44b3a 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -110,7 +110,9 @@ class ExemptFromLayoutTest < Test::Unit::TestCase def test_rhtml_exempt_from_layout_status_should_prevent_layout_render ActionController::Base.exempt_from_layout :rhtml + assert @controller.send(:template_exempt_from_layout?, 'test.rhtml') + assert @controller.send(:template_exempt_from_layout?, 'hello.rhtml') get :hello assert_equal 'hello.rhtml', @response.body |