From 4aae538d9ffff3a00a81f3da52fa70f7fd79ac74 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 8 Dec 2013 14:04:04 -0800 Subject: Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a little more work! This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997. --- actionpack/test/controller/mime/respond_to_test.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'actionpack/test/controller') diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb index 0bac86977a..c258bbec06 100644 --- a/actionpack/test/controller/mime/respond_to_test.rb +++ b/actionpack/test/controller/mime/respond_to_test.rb @@ -175,12 +175,6 @@ class RespondToController < ActionController::Base end end - def variant_inline_syntax - respond_to do |format| - format.html.phone { render text: "phone" } - end - end - protected def set_layout case action_name @@ -560,16 +554,10 @@ class RespondToControllerTest < ActionController::TestCase assert_equal "tablet", @response.body end + def test_no_variant_in_variant_setup get :variant_plus_none_for_format assert_equal "text/html", @response.content_type assert_equal "none", @response.body end - - def test_variant_inline_syntax - @request.variant = :phone - get :variant_inline_syntax - assert_equal "text/html", @response.content_type - assert_equal "phone", @response.body - end end -- cgit v1.2.3