kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Added failing tests for iphone

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2007-09-25 14:57:15 +00:00
parent 3b98b68516
commit 55a9c86e62
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
actionpack/lib/action_controller/layout.rb
View file

@ -234,10 +234,9 @@ module ActionController #:nodoc:
protected
def render_with_a_layout(options = nil, &block) #:nodoc:
if template_with_options = options.is_a?(Hash)
response.template.template_format = options[:content_type].to_sym if options[:content_type]
end
template_with_options = options.is_a?(Hash)
set_template_format(options)
if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
assert_existence_of_template_file(layout)
@ -307,5 +306,13 @@ module ActionController #:nodoc:
self.class.send(:layout_directory_exists_cache)[File.dirname(template_path)]
end
end
def set_template_format(options)
if options.is_a?(Hash) && options[:content_type]
response.template.template_format = options[:content_type].to_sym
elsif params[:format]
response.template.template_format = Mime::Type.lookup(Mime::Type.lookup_by_extension(params[:format]).to_s).to_sym
end
end
end
end

5
actionpack/test/controller/mime_responds_test.rb
View file

@ -116,7 +116,8 @@ class RespondToController < ActionController::Base
def iphone_with_html_response_type
Mime::Type.register_alias("text/html", :iphone)
request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
respond_to do |type|
type.html { @type = "Firefox" }
type.iphone { @type = "iPhone" }
@ -399,7 +400,7 @@ class MimeControllerTest < Test::Unit::TestCase
get :iphone_with_html_response_type, :format => "iphone"
assert_equal "text/html", @response.content_type
assert_equal "<html>Hello future from iPhone!</html>", @response.body
assert_equal "<html>Hello iPhone future from iPhone!</html>", @response.body
end
def test_format_with_custom_response_type_and_request_headers

1
actionpack/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb vendored Normal file
View file

@ -0,0 +1 @@
Hello iPhone future from <%= @type -%>!