Ticket #11140: mime_responds2.diff

actionpack/test/controller/mime_responds_test.rb

@@ -107 +107 @@
-      type.any(:js, :xml) { render :text => "Either JS or XML" }
-    end
-  end
+  
+  def handle_any_any
+    respond_to do |type|
+      type.html { render :text => 'HTML' }
+      type.any { render :text => 'Whatever you ask for, I got it' }
+    end
+  end
-
-  def all_types_with_layout
-    respond_to do |type|
@@ -335 +342 @@
-    assert_equal 'Either JS or XML', @response.body
-  end
-
+  def test_handle_any_any
+    @request.env["HTTP_ACCEPT"] = "*/*"
+    get :handle_any_any
+    assert_equal 'HTML', @response.body
+  end
+  
+  def test_handle_any_any_parameter_format
+    get :handle_any_any, {:format=>'html'}
+    assert_equal 'HTML', @response.body
+  end
+  
+  def test_handle_any_any_explicit_html
+    @request.env["HTTP_ACCEPT"] = "text/html"
+    get :handle_any_any
+    assert_equal 'HTML', @response.body
+  end
+
+  def test_handle_any_any_javascript
+    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    get :handle_any_any
+    assert_equal 'Whatever you ask for, I got it', @response.body
+  end
+  
+  def test_handle_any_any_xml
+    @request.env["HTTP_ACCEPT"] = "text/xml"
+    get :handle_any_any
+    assert_equal 'Whatever you ask for, I got it', @response.body
+  end
+
-  def test_rjs_type_skips_layout
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
-    get :all_types_with_layout

actionpack/lib/action_controller/mime_responds.rb

@@ -125 +125 @@
-
-        @order << mime_type
-
-
+||
-          @response.template.template_format = mime_type.to_sym
-          @response.content_type = mime_type.to_s
-          block_given? ? block.call : @controller.send(:render, :action => @controller.action_name)
@@ -133 +133 @@
-      end
-
-      def any(*args, &block)
-
+
+
+
+
+
-      end
-
-      def method_missing(symbol, &block)