aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/rescue_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-20 22:09:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-20 22:09:12 +0000
commite1056530665d5c8eed2c325157fbb88553eb2678 (patch)
tree30341bae8b9a63faed289f9dc56c1a654a449731 /actionpack/test/controller/rescue_test.rb
parent89cb34c9cfe9d169b79206b74c602e91bc7116a5 (diff)
downloadrails-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/rescue_test.rb')
-rw-r--r--actionpack/test/controller/rescue_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index f539546a1a..885ac0b8c0 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -111,7 +111,7 @@ class RescueTest < Test::Unit::TestCase
def test_rescue_action_locally
get :raises
assert_response :internal_server_error
- assert_template 'diagnostics.rhtml'
+ assert_template 'diagnostics.erb'
assert @response.body.include?('RescueController#raises'), "Response should include controller and action."
assert @response.body.include?("don't panic"), "Response should include exception message."
end