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

[rails.git] / test / controllers / api / notes_controller_test.rb

diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb
index 2557a353b1a9d25b7cb46794cd12060a9bdaa845..0e4a6f35747ee0b93a2df68a2529b7c9f85388d5 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -747,11 +747,11 @@ module Api
 
       get :index, :params => { :bbox => "-10,-10,12,12", :format => :json }
       assert_response :bad_request
-      assert_equal "application/json", @response.media_type
+      assert_equal "text/plain", @response.media_type
 
       get :index, :params => { :l => "-10", :b => "-10", :r => "12", :t => "12", :format => :json }
       assert_response :bad_request
-      assert_equal "application/json", @response.media_type
+      assert_equal "text/plain", @response.media_type
     end
 
     def test_index_closed