Merge remote-tracking branch 'openstreetmap/pull/1553'

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

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 636ef345082c4a25bfbf19f338ae0fc447550506..51f8dfd400113c5a3c1cc67b386713b45d4fc973 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1122,7 +1122,7 @@ class UserControllerTest < ActionController::TestCase
     basic_authorization(user.email, "test")
     get :api_gpx_files
     assert_response :success
-    assert_equal "text/xml", response.content_type
+    assert_equal "application/xml", response.content_type
 
     # check the data that is returned
     assert_select "gpx_file[id='#{trace1.id}']", 1 do
@@ -1349,8 +1349,8 @@ class UserControllerTest < ActionController::TestCase
     user = create(:user)
     moderator_user = create(:moderator_user)
     administrator_user = create(:administrator_user)
-    suspended_user = create(:user, :suspended)
-    ip_user = create(:user, :creation_ip => "1.2.3.4")
+    _suspended_user = create(:user, :suspended)
+    _ip_user = create(:user, :creation_ip => "1.2.3.4")
 
     # There are now 7 users - the five above, plus two extra "granters" for the
     # moderator_user and administrator_user