Changeset 7629

Timestamp:

09/25/07 14:57:15 (1 year ago)

Author:

david

Message:

Added failing tests for iphone

Files:

• trunk/actionpack/lib/action_controller/layout.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/mime_responds_test.rb (modified) (2 diffs)
• trunk/actionpack/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb (added)

trunk/actionpack/lib/action_controller/layout.rb

@@ -235 +235 @@
-    protected
-      def render_with_a_layout(options = nil, &block) #:nodoc:
-
-
-
-
+
+
+
-        if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
-          assert_existence_of_template_file(layout)
@@ -308 +307 @@
-        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

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -117 +117 @@
-  def iphone_with_html_response_type 
-    Mime::Type.register_alias("text/html", :iphone)
-
+
+
-    respond_to do |type|
-      type.html   { @type = "Firefox" }
@@ -400 +401 @@
-    get :iphone_with_html_response_type, :format => "iphone"
-    assert_equal "text/html", @response.content_type
-
+iPhone 
-  end 
-