mirror of https://github.com/tootsuite/mastodon
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998)
parent
61fe25fe74
commit
828eebad48
|
@ -15,6 +15,9 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
|
||||||
note: object.note,
|
note: object.note,
|
||||||
fields: object.fields.map(&:to_h),
|
fields: object.fields.map(&:to_h),
|
||||||
follow_requests_count: FollowRequest.where(target_account: object).limit(40).count,
|
follow_requests_count: FollowRequest.where(target_account: object).limit(40).count,
|
||||||
|
hide_collections: object.hide_collections,
|
||||||
|
discoverable: object.discoverable,
|
||||||
|
indexable: object.indexable,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'credentials API' do
|
||||||
|
let(:user) { Fabricate(:user, account_attributes: { discoverable: false, locked: true, indexable: false }) }
|
||||||
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
|
||||||
|
let(:scopes) { 'read:accounts write:accounts' }
|
||||||
|
let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
|
||||||
|
|
||||||
|
describe 'GET /api/v1/accounts/verify_credentials' do
|
||||||
|
subject do
|
||||||
|
get '/api/v1/accounts/verify_credentials', headers: headers
|
||||||
|
end
|
||||||
|
|
||||||
|
it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
subject
|
||||||
|
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the expected content' do
|
||||||
|
subject
|
||||||
|
|
||||||
|
expect(body_as_json).to include({
|
||||||
|
source: hash_including({
|
||||||
|
discoverable: false,
|
||||||
|
indexable: false,
|
||||||
|
}),
|
||||||
|
locked: true,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'POST /api/v1/accounts/update_credentials' do
|
||||||
|
subject do
|
||||||
|
patch '/api/v1/accounts/update_credentials', headers: headers, params: params
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:params) { { discoverable: true, locked: false, indexable: true } }
|
||||||
|
|
||||||
|
it_behaves_like 'forbidden for wrong scope', 'read read:accounts'
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
subject
|
||||||
|
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns JSON with updated attributes' do
|
||||||
|
subject
|
||||||
|
|
||||||
|
expect(body_as_json).to include({
|
||||||
|
source: hash_including({
|
||||||
|
discoverable: true,
|
||||||
|
indexable: true,
|
||||||
|
}),
|
||||||
|
locked: false,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue