mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 10:04:20 -05:00
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
112 lines
3.0 KiB
Ruby
112 lines
3.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Api::V1::Accounts::CredentialsController do
|
|
render_views
|
|
|
|
let(:user) { Fabricate(:user) }
|
|
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
|
|
|
|
context 'with an oauth token' do
|
|
before do
|
|
allow(controller).to receive(:doorkeeper_token) { token }
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
let(:scopes) { 'read:accounts' }
|
|
|
|
it 'returns http success' do
|
|
get :show
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'PATCH #update' do
|
|
let(:scopes) { 'write:accounts' }
|
|
|
|
describe 'with valid data' do
|
|
before do
|
|
allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
|
|
|
|
patch :update, params: {
|
|
display_name: "Alice Isn't Dead",
|
|
note: "Hi!\n\nToot toot!",
|
|
avatar: fixture_file_upload('avatar.gif', 'image/gif'),
|
|
header: fixture_file_upload('attachment.jpg', 'image/jpeg'),
|
|
source: {
|
|
privacy: 'unlisted',
|
|
sensitive: true,
|
|
},
|
|
}
|
|
end
|
|
|
|
it 'returns http success' do
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
it 'updates account info' do
|
|
user.reload
|
|
user.account.reload
|
|
|
|
expect(user.account.display_name).to eq("Alice Isn't Dead")
|
|
expect(user.account.note).to eq("Hi!\n\nToot toot!")
|
|
expect(user.account.avatar).to exist
|
|
expect(user.account.header).to exist
|
|
expect(user.setting_default_privacy).to eq('unlisted')
|
|
expect(user.setting_default_sensitive).to be(true)
|
|
end
|
|
|
|
it 'queues up an account update distribution' do
|
|
expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(user.account_id)
|
|
end
|
|
end
|
|
|
|
describe 'with empty source list' do
|
|
before do
|
|
patch :update, params: {
|
|
display_name: "I'm a cat",
|
|
source: {},
|
|
}, as: :json
|
|
end
|
|
|
|
it 'returns http success' do
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
end
|
|
|
|
describe 'with invalid data' do
|
|
before do
|
|
note = 'This is too long. '
|
|
note = note + 'a' * (Account::MAX_NOTE_LENGTH - note.length + 1)
|
|
patch :update, params: { note: note }
|
|
end
|
|
|
|
it 'returns http unprocessable entity' do
|
|
expect(response).to have_http_status(422)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'without an oauth token' do
|
|
before do
|
|
allow(controller).to receive(:doorkeeper_token).and_return(nil)
|
|
end
|
|
|
|
describe 'GET #show' do
|
|
it 'returns http unauthorized' do
|
|
get :show
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
|
|
describe 'PATCH #update' do
|
|
it 'returns http unauthorized' do
|
|
patch :update, params: { note: 'Foo' }
|
|
expect(response).to have_http_status(401)
|
|
end
|
|
end
|
|
end
|
|
end
|