From 06dd4b3166d3b30264ac2f14f48e385e404d8ceb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 25 Sep 2007 15:09:21 +0000 Subject: Better failing tests git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/mime_responds_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionpack/test/controller/mime_responds_test.rb') diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 959cb7c2f4..ab5132bc45 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -133,7 +133,7 @@ class RespondToController < ActionController::Base protected def set_layout if ["all_types_with_layout", "iphone_with_html_response_type"].include?(action_name) - "standard" + "respond_to/layouts/standard" end end end @@ -327,7 +327,7 @@ class MimeControllerTest < Test::Unit::TestCase def test_html_type_with_layout @request.env["HTTP_ACCEPT"] = "text/html" get :all_types_with_layout - assert_equal 'HTML for all_types_with_layout', @response.body + assert_equal '
HTML for all_types_with_layout
', @response.body end def test_xhr @@ -396,17 +396,17 @@ class MimeControllerTest < Test::Unit::TestCase def test_format_with_custom_response_type get :iphone_with_html_response_type - assert_equal "Hello future from Firefox!", @response.body + assert_equal '
Hello future from Firefox!
', @response.body get :iphone_with_html_response_type, :format => "iphone" assert_equal "text/html", @response.content_type - assert_equal "Hello iPhone future from iPhone!", @response.body + assert_equal '
Hello iPhone future from iPhone!
', @response.body end def test_format_with_custom_response_type_and_request_headers @request.env["HTTP_ACCEPT"] = "text/iphone" get :iphone_with_html_response_type - assert_equal "Hello future from iPhone!", @response.body + assert_equal '
Hello iPhone future from iPhone!
', @response.body assert_equal "text/html", @response.content_type end end -- cgit v1.2.3