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

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

diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb
index e62f338392c6f7798c41ef7d98d5429bc4743656..8e7079b851a2cf7b79ae62bd3495e1dd7d8d43e2 100644 (file)
--- a/test/controllers/api/users_controller_test.rb
+++ b/test/controllers/api/users_controller_test.rb
@@ -420,9 +420,13 @@ module Api
 
       get api_users_path, :params => { :users => create(:user, :suspended).id }
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       get api_users_path, :params => { :users => create(:user, :deleted).id }
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       get api_users_path, :params => { :users => 0 }
       assert_response :success
@@ -509,9 +513,13 @@ module Api
 
       signed_get api_users_path, :params => { :users => create(:user, :suspended).id }, :oauth => { :token => good_token }
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       signed_get api_users_path, :params => { :users => create(:user, :deleted).id }, :oauth => { :token => good_token }
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       signed_get api_users_path, :params => { :users => 0 }, :oauth => { :token => good_token }
       assert_response :success
@@ -598,9 +606,13 @@ module Api
 
       get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => bearer_authorization_header(good_token.token)
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       get api_users_path, :params => { :users => create(:user, :deleted).id }, :headers => bearer_authorization_header(good_token.token)
       assert_response :success
+      assert_equal "application/xml", response.media_type
+      assert_select "user", :count => 0
 
       get api_users_path, :params => { :users => 0 }, :headers => bearer_authorization_header(good_token.token)
       assert_response :success
@@ -719,7 +731,7 @@ module Api
     def check_json_details(js, user, include_private, include_email)
       assert_equal user.id, js["user"]["id"]
       assert_equal user.description, js["user"]["description"]
-      assert js["user"]["contributor_terms"]["agreed"]
+      assert_operator js["user"]["contributor_terms"], :[], "agreed"
 
       if include_private
         assert_not js["user"]["contributor_terms"]["pd"]