github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better failing tests

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2007-09-25 15:09:21 +00:00
parent 55a9c86e62
commit 06dd4b3166
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
actionpack/test/controller/mime_responds_test.rb
View File

@@ -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>HTML for all_types_with_layout</html>', @response.body
assert_equal '<html><div id="html">HTML for all_types_with_layout</div></html>', @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 "<html>Hello future from Firefox!</html>", @response.body
assert_equal '<html><div id="html">Hello future from Firefox!</div></html>', @response.body
get :iphone_with_html_response_type, :format => "iphone"
assert_equal "text/html", @response.content_type
assert_equal "<html>Hello iPhone future from iPhone!</html>", @response.body
assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @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 "<html>Hello future from iPhone!</html>", @response.body
assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
assert_equal "text/html", @response.content_type
end
end

1
actionpack/test/fixtures/respond_to/layouts/standard.html.erb vendored Normal file
View File

@@ -0,0 +1 @@
<html><div id="html"><%= yield %></div></html>

1
actionpack/test/fixtures/respond_to/layouts/standard.rhtml vendored
View File

@@ -1 +0,0 @@
<html><%= @content_for_layout %></html>