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

[rails.git] / test / controllers / changesets_controller_test.rb

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index caf7721cd4ab425e483e7720f9147fc62cc41450..e754e32b71dac1ed67829c099b98596cf0f61c3f 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -214,7 +214,7 @@ class ChangesetsControllerTest < ActionController::TestCase
     get :feed, :params => { :format => :atom }
     assert_response :success
     assert_template "index"
     get :feed, :params => { :format => :atom }
     assert_response :success
     assert_template "index"

-    assert_equal "application/atom+xml", response.content_type
+    assert_equal "application/atom+xml", response.media_type

 
     check_feed_result([changeset, closed_changeset])
   end
 
     check_feed_result([changeset, closed_changeset])
   end


@@ -232,7 +232,7 @@ class ChangesetsControllerTest < ActionController::TestCase
     get :feed, :params => { :format => :atom, :bbox => "4.5,4.5,5.5,5.5" }
     assert_response :success
     assert_template "index"
     get :feed, :params => { :format => :atom, :bbox => "4.5,4.5,5.5,5.5" }
     assert_response :success
     assert_template "index"

-    assert_equal "application/atom+xml", response.content_type
+    assert_equal "application/atom+xml", response.media_type

 
     check_feed_result([changeset, closed_changeset])
   end
 
     check_feed_result([changeset, closed_changeset])
   end


@@ -250,7 +250,7 @@ class ChangesetsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"

-    assert_equal "application/atom+xml", response.content_type
+    assert_equal "application/atom+xml", response.media_type

 
     check_feed_result(changesets)
   end
 
     check_feed_result(changesets)
   end