Merge remote-tracking branch 'upstream/pull/2698'

[rails.git] / test / integration / cors_test.rb

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index 9ff7e360e50f1c903342e293da2659dfe2706c23..c35f73d349d7c90f415d73c6e7935feabafeb8c2 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -9,7 +9,7 @@ class CORSTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_equal "*", response.headers["Access-Control-Allow-Origin"]
 
     assert_response :success
     assert_equal "*", response.headers["Access-Control-Allow-Origin"]

-    assert_equal "text/plain", response.content_type
+    assert_nil response.media_type

     assert_equal "", response.body
   end
 
     assert_equal "", response.body
   end
 


@@ -21,7 +21,7 @@ class CORSTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_nil response.headers["Access-Control-Allow-Origin"]
 
     assert_response :success
     assert_nil response.headers["Access-Control-Allow-Origin"]

-    assert_nil response.content_type
+    assert_nil response.media_type

     assert_equal "", response.body
   end
 end
     assert_equal "", response.body
   end
 end