assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, false)
+ check_xml_details(user, false, false)
# check that a suspended user is not returned
get api_user_path(:id => create(:user, :suspended).id)
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, false)
+ check_json_details(js, user, false, false)
end
def test_show_oauth1
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, true)
+ check_xml_details(user, true, false)
# check that we can fetch a different user's details as XML with read_prefs
signed_get api_user_path(:id => other_user.id), :oauth => { :token => good_token }
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(other_user, false)
+ check_xml_details(other_user, false, false)
# check that we can fetch our own details as XML without read_prefs
signed_get api_user_path(:id => user.id), :oauth => { :token => bad_token }
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, false)
+ check_xml_details(user, false, false)
# check that we can fetch our own details as JSON with read_prefs
signed_get api_user_path(:id => user.id, :format => "json"), :oauth => { :token => good_token }
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, true)
+ check_json_details(js, user, true, false)
# check that we can fetch a different user's details as JSON with read_prefs
signed_get api_user_path(:id => other_user.id, :format => "json"), :oauth => { :token => good_token }
assert_not_nil js
# check the data that is returned
- check_json_details(js, other_user, false)
+ check_json_details(js, other_user, false, false)
# check that we can fetch our own details as JSON without read_prefs
signed_get api_user_path(:id => other_user.id, :format => "json"), :oauth => { :token => bad_token }
assert_not_nil js
# check the data that is returned
- check_json_details(js, other_user, false)
+ check_json_details(js, other_user, false, false)
end
def test_show_oauth2
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, true)
+ check_xml_details(user, true, false)
# check that we can fetch a different user's details as XML with read_prefs
get api_user_path(:id => other_user.id), :headers => bearer_authorization_header(good_token.token)
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(other_user, false)
+ check_xml_details(other_user, false, false)
# check that we can fetch our own details as XML without read_prefs
get api_user_path(:id => user.id), :headers => bearer_authorization_header(bad_token.token)
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, false)
+ check_xml_details(user, false, false)
# check that we can fetch our own details as JSON with read_prefs
get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token)
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, true)
+ check_json_details(js, user, true, false)
# check that we can fetch a different user's details as JSON with read_prefs
get api_user_path(:id => other_user.id, :format => "json"), :headers => bearer_authorization_header(good_token.token)
assert_not_nil js
# check the data that is returned
- check_json_details(js, other_user, false)
+ check_json_details(js, other_user, false, false)
# check that we can fetch our own details as JSON without read_prefs
get api_user_path(:id => user.id, :format => "json"), :headers => bearer_authorization_header(bad_token.token)
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, false)
+ check_json_details(js, user, false, false)
end
def test_details
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, true)
+ check_xml_details(user, true, false)
# check that data is returned properly in json
auth_header = basic_authorization_header user.email, "test"
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, true)
+ check_json_details(js, user, true, false)
end
def test_details_oauth1
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, true)
+ check_xml_details(user, true, false)
# check that we can't fetch details as JSON without read_prefs
signed_get user_details_path(:format => "json"), :oauth => { :token => bad_token }
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, true)
+ check_json_details(js, user, true, false)
end
def test_details_oauth2
:scopes => %w[read_prefs])
bad_token = create(:oauth_access_token,
:resource_owner_id => user.id)
+ email_token = create(:oauth_access_token,
+ :resource_owner_id => user.id,
+ :scopes => %w[read_prefs read_email])
# check that we can't fetch details as XML without read_prefs
get user_details_path, :headers => bearer_authorization_header(bad_token.token)
assert_response :forbidden
- # check that we can fetch details as XML
+ # check that we can fetch details as XML without read_email
get user_details_path, :headers => bearer_authorization_header(good_token.token)
assert_response :success
assert_equal "application/xml", response.media_type
# check the data that is returned
- check_xml_details(user, true)
+ check_xml_details(user, true, false)
+
+ # check that we can fetch details as XML with read_email
+ get user_details_path, :headers => bearer_authorization_header(email_token.token)
+ assert_response :success
+ assert_equal "application/xml", response.media_type
+
+ # check the data that is returned
+ check_xml_details(user, true, true)
# check that we can't fetch details as JSON without read_prefs
get user_details_path(:format => "json"), :headers => bearer_authorization_header(bad_token.token)
assert_response :forbidden
- # check that we can fetch details as JSON
+ # check that we can fetch details as JSON without read_email
get user_details_path(:format => "json"), :headers => bearer_authorization_header(good_token.token)
assert_response :success
assert_equal "application/json", response.media_type
assert_not_nil js
# check the data that is returned
- check_json_details(js, user, true)
+ check_json_details(js, user, true, false)
+
+ # check that we can fetch details as JSON with read_email
+ get user_details_path(:format => "json"), :headers => bearer_authorization_header(email_token.token)
+ assert_response :success
+ assert_equal "application/json", response.media_type
+
+ # parse the response
+ js = ActiveSupport::JSON.decode(@response.body)
+ assert_not_nil js
+
+ # check the data that is returned
+ check_json_details(js, user, true, true)
end
def test_index
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
- check_xml_details(user1, false)
+ check_xml_details(user1, false, false)
assert_select "user[id='#{user2.id}']", :count => 0
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
assert_select "user[id='#{user1.id}']", :count => 0
- check_xml_details(user2, false)
+ check_xml_details(user2, false, false)
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 2 do
- check_xml_details(user1, false)
+ check_xml_details(user1, false, false)
assert_select "user[id='#{user2.id}']", :count => 0
- check_xml_details(user3, false)
+ check_xml_details(user3, false, false)
end
get api_users_path, :params => { :users => user1.id, :format => "json" }
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user1, false)
+ check_json_details(js["users"][0], user1, false, false)
get api_users_path, :params => { :users => user2.id, :format => "json" }
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user2, false)
+ check_json_details(js["users"][0], user2, false, false)
get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 2, js["users"].count
- check_json_details(js["users"][0], user1, false)
- check_json_details(js["users"][1], user3, false)
+ check_json_details(js["users"][0], user1, false, false)
+ check_json_details(js["users"][1], user3, false, false)
get api_users_path, :params => { :users => create(:user, :suspended).id }
assert_response :not_found
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
- check_xml_details(user1, true)
+ check_xml_details(user1, true, false)
assert_select "user[id='#{user2.id}']", :count => 0
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
assert_select "user[id='#{user1.id}']", :count => 0
- check_xml_details(user2, false)
+ check_xml_details(user2, false, false)
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 2 do
- check_xml_details(user1, true)
+ check_xml_details(user1, true, false)
assert_select "user[id='#{user2.id}']", :count => 0
- check_xml_details(user3, false)
+ check_xml_details(user3, false, false)
end
signed_get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :oauth => { :token => bad_token }
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 2 do
- check_xml_details(user1, false)
+ check_xml_details(user1, false, false)
assert_select "user[id='#{user2.id}']", :count => 0
- check_xml_details(user3, false)
+ check_xml_details(user3, false, false)
end
signed_get api_users_path, :params => { :users => user1.id, :format => "json" }, :oauth => { :token => good_token }
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user1, true)
+ check_json_details(js["users"][0], user1, true, false)
signed_get api_users_path, :params => { :users => user2.id, :format => "json" }, :oauth => { :token => good_token }
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user2, false)
+ check_json_details(js["users"][0], user2, false, false)
signed_get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :oauth => { :token => good_token }
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 2, js["users"].count
- check_json_details(js["users"][0], user1, true)
- check_json_details(js["users"][1], user3, false)
+ check_json_details(js["users"][0], user1, true, false)
+ check_json_details(js["users"][1], user3, false, false)
signed_get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :oauth => { :token => bad_token }
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 2, js["users"].count
- check_json_details(js["users"][0], user1, false)
- check_json_details(js["users"][1], user3, false)
+ check_json_details(js["users"][0], user1, false, false)
+ check_json_details(js["users"][1], user3, false, false)
signed_get api_users_path, :params => { :users => create(:user, :suspended).id }, :oauth => { :token => good_token }
assert_response :not_found
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
- check_xml_details(user1, true)
+ check_xml_details(user1, true, false)
assert_select "user[id='#{user2.id}']", :count => 0
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_equal "application/xml", response.media_type
assert_select "user", :count => 1 do
assert_select "user[id='#{user1.id}']", :count => 0
- check_xml_details(user2, false)
+ check_xml_details(user2, false, false)
assert_select "user[id='#{user3.id}']", :count => 0
end
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 2 do
- check_xml_details(user1, true)
+ check_xml_details(user1, true, false)
assert_select "user[id='#{user2.id}']", :count => 0
- check_xml_details(user3, false)
+ check_xml_details(user3, false, false)
end
get api_users_path, :params => { :users => "#{user1.id},#{user3.id}" }, :headers => bearer_authorization_header(bad_token.token)
assert_response :success
assert_equal "application/xml", response.media_type
assert_select "user", :count => 2 do
- check_xml_details(user1, false)
+ check_xml_details(user1, false, false)
assert_select "user[id='#{user2.id}']", :count => 0
- check_xml_details(user3, false)
+ check_xml_details(user3, false, false)
end
get api_users_path, :params => { :users => user1.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token)
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user1, true)
+ check_json_details(js["users"][0], user1, true, false)
get api_users_path, :params => { :users => user2.id, :format => "json" }, :headers => bearer_authorization_header(good_token.token)
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, js["users"].count
- check_json_details(js["users"][0], user2, false)
+ check_json_details(js["users"][0], user2, false, false)
get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(good_token.token)
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 2, js["users"].count
- check_json_details(js["users"][0], user1, true)
- check_json_details(js["users"][1], user3, false)
+ check_json_details(js["users"][0], user1, true, false)
+ check_json_details(js["users"][1], user3, false, false)
get api_users_path, :params => { :users => "#{user1.id},#{user3.id}", :format => "json" }, :headers => bearer_authorization_header(bad_token.token)
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 2, js["users"].count
- check_json_details(js["users"][0], user1, false)
- check_json_details(js["users"][1], user3, false)
+ check_json_details(js["users"][0], user1, false, false)
+ check_json_details(js["users"][1], user3, false, false)
get api_users_path, :params => { :users => create(:user, :suspended).id }, :headers => bearer_authorization_header(good_token.token)
assert_response :not_found
private
- def check_xml_details(user, include_private)
+ def check_xml_details(user, include_private, include_email)
assert_select "user[id='#{user.id}']", :count => 1 do
assert_select "description", :count => 1, :text => user.description
assert_select "languages", :count => 0
assert_select "messages", :count => 0
end
+
+ if include_email
+ assert_select "email", :count => 1, :text => user.email
+ else
+ assert_select "email", :count => 0
+ end
end
end
- def check_json_details(js, user, include_private)
+ 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"]
else
assert_nil js["user"]["messages"]
end
+
+ if include_email
+ assert_equal user.email, js["user"]["email"]
+ else
+ assert_nil js["user"]["email"]
+ end
end
end
end