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

[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..aa4bf1e9de85010ac51ba86793a421c6a2a39b84 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
 
       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
 
       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
 
       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
 
       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
 
       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
 
       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
 
       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
 
       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
 
       get api_users_path, :params => { :users => 0 }, :headers => bearer_authorization_header(good_token.token)
       assert_response :success