Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
This commit is contained in:
Thibaut Girka
2018-12-23 11:28:28 +01:00
168 changed files with 2873 additions and 1871 deletions

View File

@ -191,58 +191,6 @@ RSpec.describe Admin::AccountsController, type: :controller do
end
end
describe 'POST #disable' do
subject { post :disable, params: { id: account.id } }
let(:current_user) { Fabricate(:user, admin: current_user_admin) }
let(:account) { Fabricate(:account, user: user) }
let(:user) { Fabricate(:user, disabled: false, admin: target_user_admin) }
context 'when user is admin' do
let(:current_user_admin) { true }
context 'when target user is admin' do
let(:target_user_admin) { true }
it 'fails to disable account' do
is_expected.to have_http_status :forbidden
expect(user.reload).not_to be_disabled
end
end
context 'when target user is not admin' do
let(:target_user_admin) { false }
it 'succeeds in disabling account' do
is_expected.to redirect_to admin_account_path(account.id)
expect(user.reload).to be_disabled
end
end
end
context 'when user is not admin' do
let(:current_user_admin) { false }
context 'when target user is admin' do
let(:target_user_admin) { true }
it 'fails to disable account' do
is_expected.to have_http_status :forbidden
expect(user.reload).not_to be_disabled
end
end
context 'when target user is not admin' do
let(:target_user_admin) { false }
it 'fails to disable account' do
is_expected.to have_http_status :forbidden
expect(user.reload).not_to be_disabled
end
end
end
end
describe 'POST #redownload' do
subject { post :redownload, params: { id: account.id } }

View File

@ -46,73 +46,37 @@ describe Admin::ReportsController do
end
end
describe 'PUT #update' do
describe 'with an unknown outcome' do
it 'rejects the change' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'unknown' }
describe 'POST #reopen' do
it 'reopens the report' do
report = Fabricate(:report)
expect(response).to have_http_status(404)
end
put :reopen, params: { id: report }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.action_taken_by_account).to eq nil
expect(report.action_taken).to eq false
end
end
describe 'with an outcome of `resolve`' do
it 'resolves the report' do
report = Fabricate(:report)
describe 'POST #assign_to_self' do
it 'reopens the report' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'resolve' }
expect(response).to redirect_to(admin_reports_path)
report.reload
expect(report.action_taken_by_account).to eq user.account
expect(report.action_taken).to eq true
end
put :assign_to_self, params: { id: report }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to eq user.account
end
end
describe 'with an outsome of `silence`' do
it 'silences the reported account' do
report = Fabricate(:report)
describe 'POST #unassign' do
it 'reopens the report' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'silence' }
expect(response).to redirect_to(admin_reports_path)
report.reload
expect(report.action_taken_by_account).to eq user.account
expect(report.action_taken).to eq true
expect(report.target_account).to be_silenced
end
end
describe 'with an outsome of `reopen`' do
it 'reopens the report' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'reopen' }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.action_taken_by_account).to eq nil
expect(report.action_taken).to eq false
end
end
describe 'with an outsome of `assign_to_self`' do
it 'reopens the report' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'assign_to_self' }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to eq user.account
end
end
describe 'with an outsome of `unassign`' do
it 'reopens the report' do
report = Fabricate(:report)
put :update, params: { id: report, outcome: 'unassign' }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to eq nil
end
put :unassign, params: { id: report }
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to eq nil
end
end
end

View File

@ -1,33 +0,0 @@
require 'rails_helper'
describe Admin::SilencesController do
render_views
before do
sign_in Fabricate(:user, admin: true), scope: :user
end
describe 'POST #create' do
it 'redirects to admin accounts page' do
account = Fabricate(:account, silenced: false)
post :create, params: { account_id: account.id }
account.reload
expect(account.silenced?).to eq true
expect(response).to redirect_to(admin_accounts_path)
end
end
describe 'DELETE #destroy' do
it 'redirects to admin accounts page' do
account = Fabricate(:account, silenced: true)
delete :destroy, params: { account_id: account.id }
account.reload
expect(account.silenced?).to eq false
expect(response).to redirect_to(admin_accounts_path)
end
end
end

View File

@ -1,39 +0,0 @@
require 'rails_helper'
describe Admin::SuspensionsController do
render_views
before do
sign_in Fabricate(:user, admin: true), scope: :user
end
describe 'GET #new' do
it 'returns 200' do
get :new, params: { account_id: Fabricate(:account).id, report_id: Fabricate(:report).id }
expect(response).to have_http_status(200)
end
end
describe 'POST #create' do
it 'redirects to admin accounts page' do
account = Fabricate(:account, suspended: false)
expect(Admin::SuspensionWorker).to receive(:perform_async).with(account.id)
post :create, params: { account_id: account.id, form_admin_suspension_confirmation: { acct: account.acct } }
expect(response).to redirect_to(admin_accounts_path)
end
end
describe 'DELETE #destroy' do
it 'redirects to admin accounts page' do
account = Fabricate(:account, suspended: true)
delete :destroy, params: { account_id: account.id }
account.reload
expect(account.suspended?).to eq false
expect(response).to redirect_to(admin_accounts_path)
end
end
end

View File

@ -0,0 +1,5 @@
Fabricator(:account_warning) do
account nil
target_account nil
text "MyText"
end

View File

@ -0,0 +1,3 @@
Fabricator(:account_warning_preset) do
text "MyText"
end

View File

@ -0,0 +1,22 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe AdminMailer, type: :mailer do
describe '.new_report' do
let(:sender) { Fabricate(:account, username: 'John', user: Fabricate(:user)) }
let(:recipient) { Fabricate(:account, username: 'Mike', user: Fabricate(:user, locale: :en)) }
let(:report) { Fabricate(:report, account: sender, target_account: recipient) }
let(:mail) { described_class.new_report(recipient, report) }
it 'renders the headers' do
expect(mail.subject).to eq("New report for cb6e6126.ngrok.io (##{report.id})")
expect(mail.to).to eq [recipient.user_email]
expect(mail.from).to eq ['notifications@localhost']
end
it 'renders the body' do
expect(mail.body.encoded).to eq("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n")
end
end
end

View File

@ -39,4 +39,9 @@ class UserMailerPreview < ActionMailer::Preview
def backup_ready
UserMailer.backup_ready(User.first, Backup.first)
end
# Preview this email at http://localhost:3000/rails/mailers/user_mailer/warning
def warning
UserMailer.warning(User.first, AccountWarning.new(text: '', action: :silence))
end
end

View File

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe AccountWarningPreset, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end

View File

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe AccountWarning, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end

View File

@ -0,0 +1,4 @@
require 'rails_helper'
RSpec.describe Admin::AccountAction, type: :model do
end

View File

@ -0,0 +1,70 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe CustomEmojiFilter do
describe '#results' do
let!(:custom_emoji_0) { Fabricate(:custom_emoji, domain: 'a') }
let!(:custom_emoji_1) { Fabricate(:custom_emoji, domain: 'b') }
let!(:custom_emoji_2) { Fabricate(:custom_emoji, domain: nil, shortcode: 'hoge') }
subject { described_class.new(params).results }
context 'params have values' do
context 'local' do
let(:params) { { local: true } }
it 'returns ActiveRecord::Relation' do
expect(subject).to be_kind_of(ActiveRecord::Relation)
expect(subject).to match_array([custom_emoji_2])
end
end
context 'remote' do
let(:params) { { remote: true } }
it 'returns ActiveRecord::Relation' do
expect(subject).to be_kind_of(ActiveRecord::Relation)
expect(subject).to match_array([custom_emoji_0, custom_emoji_1])
end
end
context 'by_domain' do
let(:params) { { by_domain: 'a' } }
it 'returns ActiveRecord::Relation' do
expect(subject).to be_kind_of(ActiveRecord::Relation)
expect(subject).to match_array([custom_emoji_0])
end
end
context 'shortcode' do
let(:params) { { shortcode: 'hoge' } }
it 'returns ActiveRecord::Relation' do
expect(subject).to be_kind_of(ActiveRecord::Relation)
expect(subject).to match_array([custom_emoji_2])
end
end
context 'else' do
let(:params) { { else: 'else' } }
it 'raises RuntimeError' do
expect do
subject
end.to raise_error(RuntimeError, /Unknown filter: else/)
end
end
end
context 'params without value' do
let(:params) { { hoge: nil } }
it 'returns ActiveRecord::Relation' do
expect(subject).to be_kind_of(ActiveRecord::Relation)
expect(subject).to match_array([custom_emoji_0, custom_emoji_1, custom_emoji_2])
end
end
end
end

View File

@ -0,0 +1,45 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe BackupPolicy do
let(:subject) { described_class }
let(:john) { Fabricate(:user).account }
permissions :create? do
context 'not user_signed_in?' do
it 'denies' do
expect(subject).to_not permit(nil, Backup)
end
end
context 'user_signed_in?' do
context 'no backups' do
it 'permits' do
expect(subject).to permit(john, Backup)
end
end
context 'backups are too old' do
it 'permits' do
travel(-8.days) do
Fabricate(:backup, user: john.user)
end
expect(subject).to permit(john, Backup)
end
end
context 'backups are newer' do
it 'denies' do
travel(-3.days) do
Fabricate(:backup, user: john.user)
end
expect(subject).to_not permit(john, Backup)
end
end
end
end
end

View File

@ -0,0 +1,38 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe CustomEmojiPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index?, :enable?, :disable? do
context 'staff' do
it 'permits' do
expect(subject).to permit(admin, CustomEmoji)
end
end
context 'not staff' do
it 'denies' do
expect(subject).to_not permit(john, CustomEmoji)
end
end
end
permissions :create?, :update?, :copy?, :destroy? do
context 'admin' do
it 'permits' do
expect(subject).to permit(admin, CustomEmoji)
end
end
context 'not admin' do
it 'denies' do
expect(subject).to_not permit(john, CustomEmoji)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe DomainBlockPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index?, :show?, :create?, :destroy? do
context 'admin' do
it 'permits' do
expect(subject).to permit(admin, DomainBlock)
end
end
context 'not admin' do
it 'denies' do
expect(subject).to_not permit(john, DomainBlock)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe EmailDomainBlockPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index?, :create?, :destroy? do
context 'admin' do
it 'permits' do
expect(subject).to permit(admin, EmailDomainBlock)
end
end
context 'not admin' do
it 'denies' do
expect(subject).to_not permit(john, EmailDomainBlock)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe InstancePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index?, :resubscribe? do
context 'admin' do
it 'permits' do
expect(subject).to permit(admin, Instance)
end
end
context 'not admin' do
it 'denies' do
expect(subject).to_not permit(john, Instance)
end
end
end
end

View File

@ -0,0 +1,94 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe InvitePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index? do
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, Invite)
end
end
end
permissions :create? do
context 'min_required_role?' do
it 'permits' do
allow_any_instance_of(described_class).to receive(:min_required_role?) { true }
expect(subject).to permit(john, Invite)
end
end
context 'not min_required_role?' do
it 'denies' do
allow_any_instance_of(described_class).to receive(:min_required_role?) { false }
expect(subject).to_not permit(john, Invite)
end
end
end
permissions :deactivate_all? do
context 'admin?' do
it 'permits' do
expect(subject).to permit(admin, Invite)
end
end
context 'not admin?' do
it 'denies' do
expect(subject).to_not permit(john, Invite)
end
end
end
permissions :destroy? do
context 'owner?' do
it 'permits' do
expect(subject).to permit(john, Fabricate(:invite, user: john.user))
end
end
context 'not owner?' do
context 'Setting.min_invite_role == "admin"' do
before do
Setting.min_invite_role = 'admin'
end
context 'admin?' do
it 'permits' do
expect(subject).to permit(admin, Fabricate(:invite))
end
end
context 'not admin?' do
it 'denies' do
expect(subject).to_not permit(john, Fabricate(:invite))
end
end
end
context 'Setting.min_invite_role != "admin"' do
before do
Setting.min_invite_role = 'else'
end
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, Fabricate(:invite))
end
end
context 'not staff?' do
it 'denies' do
expect(subject).to_not permit(john, Fabricate(:invite))
end
end
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe RelayPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :update? do
context 'admin?' do
it 'permits' do
expect(subject).to permit(admin, Relay)
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, Relay)
end
end
end
end

View File

@ -0,0 +1,48 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe ReportNotePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :create? do
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, ReportNote)
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, ReportNote)
end
end
end
permissions :destroy? do
context 'admin?' do
it 'permit' do
expect(subject).to permit(admin, ReportNote)
end
end
context 'admin?' do
context 'owner?' do
it 'permit' do
report_note = Fabricate(:report_note, account: john)
expect(subject).to permit(john, report_note)
end
end
context '!owner?' do
it 'denies' do
report_note = Fabricate(:report_note)
expect(subject).to_not permit(john, report_note)
end
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe ReportPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :update?, :index?, :show? do
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, Report)
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, Report)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe SettingsPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :update?, :show? do
context 'admin?' do
it 'permits' do
expect(subject).to permit(admin, Settings)
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, Settings)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe SubscriptionPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index? do
context 'admin?' do
it 'permits' do
expect(subject).to permit(admin, Subscription)
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, Subscription)
end
end
end
end

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe TagPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :index?, :hide?, :unhide? do
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, Tag)
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, Tag)
end
end
end
end

View File

@ -0,0 +1,167 @@
# frozen_string_literal: true
require 'rails_helper'
require 'pundit/rspec'
RSpec.describe UserPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
let(:john) { Fabricate(:user).account }
permissions :reset_password?, :change_email? do
context 'staff?' do
context '!record.staff?' do
it 'permits' do
expect(subject).to permit(admin, john.user)
end
end
context 'record.staff?' do
it 'denies' do
expect(subject).to_not permit(admin, admin.user)
end
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :disable_2fa? do
context 'admin?' do
context '!record.staff?' do
it 'permits' do
expect(subject).to permit(admin, john.user)
end
end
context 'record.staff?' do
it 'denies' do
expect(subject).to_not permit(admin, admin.user)
end
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :confirm? do
context 'staff?' do
context '!record.confirmed?' do
it 'permits' do
john.user.update(confirmed_at: nil)
expect(subject).to permit(admin, john.user)
end
end
context 'record.confirmed?' do
it 'denies' do
john.user.confirm!
expect(subject).to_not permit(admin, john.user)
end
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :enable? do
context 'staff?' do
it 'permits' do
expect(subject).to permit(admin, User)
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :disable? do
context 'staff?' do
context '!record.admin?' do
it 'permits' do
expect(subject).to permit(admin, john.user)
end
end
context 'record.admin?' do
it 'denies' do
expect(subject).to_not permit(admin, admin.user)
end
end
end
context '!staff?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :promote? do
context 'admin?' do
context 'promoteable?' do
it 'permits' do
expect(subject).to permit(admin, john.user)
end
end
context '!promoteable?' do
it 'denies' do
expect(subject).to_not permit(admin, admin.user)
end
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
permissions :demote? do
context 'admin?' do
context '!record.admin?' do
context 'demoteable?' do
it 'permits' do
john.user.update(moderator: true)
expect(subject).to permit(admin, john.user)
end
end
context '!demoteable?' do
it 'denies' do
expect(subject).to_not permit(admin, john.user)
end
end
end
context 'record.admin?' do
it 'denies' do
expect(subject).to_not permit(admin, admin.user)
end
end
end
context '!admin?' do
it 'denies' do
expect(subject).to_not permit(john, User)
end
end
end
end

View File

@ -111,4 +111,37 @@ describe InstancePresenter do
expect(instance_presenter.domain_count).to eq(345)
end
end
describe '#version_number' do
it 'returns Mastodon::Version' do
expect(instance_presenter.version_number).to be(Mastodon::Version)
end
end
describe '#source_url' do
it 'returns "https://github.com/tootsuite/mastodon"' do
expect(instance_presenter.source_url).to eq('https://github.com/tootsuite/mastodon')
end
end
describe '#thumbnail' do
it 'returns SiteUpload' do
thumbnail = Fabricate(:site_upload, var: 'thumbnail')
expect(instance_presenter.thumbnail).to eq(thumbnail)
end
end
describe '#hero' do
it 'returns SiteUpload' do
hero = Fabricate(:site_upload, var: 'hero')
expect(instance_presenter.hero).to eq(hero)
end
end
describe '#mascot' do
it 'returns SiteUpload' do
mascot = Fabricate(:site_upload, var: 'mascot')
expect(instance_presenter.mascot).to eq(mascot)
end
end
end