diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-04-12 20:25:32 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-04-12 20:25:32 +0000 |
| commit | 6351e0a541698bdaca348ad78bc9f7b25f6d56d6 (patch) | |
| tree | db2ab82ada8dc23e949d69371841fae6ebfe8936 /actionpack/test/controller/mime_responds_test.rb | |
| parent | f5b8fc0335d4f5e4e5a3c7d7e4dab14e449403cc (diff) | |
| download | rails-6351e0a541698bdaca348ad78bc9f7b25f6d56d6.tar.gz rails-6351e0a541698bdaca348ad78bc9f7b25f6d56d6.tar.bz2 rails-6351e0a541698bdaca348ad78bc9f7b25f6d56d6.zip | |
The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6517 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index aa31d5b649..d8d7c64ce0 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -288,11 +288,13 @@ class MimeControllerTest < Test::Unit::TestCase assert_equal 'Either JS or XML', @response.body end - def test_all_types_with_layout + def test_rjs_type_skips_layout @request.env["HTTP_ACCEPT"] = "text/javascript" get :all_types_with_layout assert_equal 'RJS for all_types_with_layout', @response.body - + end + + def test_html_type_with_layout @request.env["HTTP_ACCEPT"] = "text/html" get :all_types_with_layout assert_equal '<html>HTML for all_types_with_layout</html>', @response.body @@ -343,14 +345,14 @@ class MimeControllerTest < Test::Unit::TestCase unless args.empty? @action = args.first[:action] end - response.body = @action + response.body = "#{@action} - #{@template.template_format}" end end get :using_defaults - assert_equal "using_defaults", @response.body + assert_equal "using_defaults - html", @response.body get :using_defaults, :format => "xml" - assert_equal "using_defaults.xml.builder", @response.body + assert_equal "using_defaults - xml", @response.body end end |