From 646d57c438ee00ab4f7d76c91d76b08afd6f6155 Mon Sep 17 00:00:00 2001
From: Jo Liss <joliss42@gmail.com>
Date: Fri, 21 Sep 2012 16:36:42 +0200
Subject: [PATCH] Make test suite compatible with Rails 4

Rails 4 changes the JSONP content_type to text/javascript
---
 test/serialization_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/serialization_test.rb b/test/serialization_test.rb
index 2bcc1c9a..f2c1faea 100644
--- a/test/serialization_test.rb
+++ b/test/serialization_test.rb
@@ -214,7 +214,7 @@ class RenderJsonTest < ActionController::TestCase
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
     assert_equal 'alert({"hello":"world"})', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_match %r(application/json|text/javascript), @response.content_type
   end
 
   def test_render_json_with_custom_content_type