gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Merge remote-tracking branch 'parent/main' into upstream-20230209

Browse source
This commit is contained in:
KMY 2024-02-09 12:53:59 +09:00
commit 05e52a09a8
188 changed files with 2810 additions and 1295 deletions
Download patch file Download diff file Expand all files Collapse all files

92
spec/controllers/activitypub/collections_controller_spec.rb
View file

@ -17,34 +17,27 @@ RSpec.describe ActivityPub::CollectionsController do
end
describe 'GET #show' do
context 'when id is "featured"' do
context 'without signature' do
subject(:response) { get :show, params: { id: 'featured', account_username: account.username } }
subject(:response) { get :show, params: { id: id, account_username: account.username } }
let(:body) { body_as_json }
context 'when id is "featured"' do
let(:id) { 'featured' }
context 'without signature' do
let(:remote_account) { nil }
it 'returns http success' do
it 'returns http success and correct media type' do
expect(response).to have_http_status(200)
end
it 'returns application/activity+json' do
expect(response.media_type).to eq 'application/activity+json'
end
it_behaves_like 'cacheable response'
it 'returns orderedItems with pinned statuses' do
expect(body[:orderedItems]).to be_an Array
expect(body[:orderedItems].size).to eq 3
end
it 'includes URI of private pinned status' do
expect(body[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
end
it 'does not include contents of private pinned status' do
expect(response.body).to_not include(private_pinned.text)
it 'returns orderedItems with correct items' do
expect(body_as_json[:orderedItems])
.to be_an(Array)
.and have_attributes(size: 3)
.and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
.and not_include(private_pinned.text)
end
context 'when account is permanently suspended' do
@ -73,33 +66,19 @@ RSpec.describe ActivityPub::CollectionsController do
let(:remote_account) { Fabricate(:account, domain: 'example.com') }
context 'when getting a featured resource' do
before do
get :show, params: { id: 'featured', account_username: account.username }
end
it 'returns http success' do
it 'returns http success and correct media type' do
expect(response).to have_http_status(200)
end
it 'returns application/activity+json' do
expect(response.media_type).to eq 'application/activity+json'
end
it_behaves_like 'cacheable response'
it 'returns orderedItems with pinned statuses' do
json = body_as_json
expect(json[:orderedItems]).to be_an Array
expect(json[:orderedItems].size).to eq 3
end
it 'includes URI of private pinned status' do
json = body_as_json
expect(json[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
end
it 'does not include contents of private pinned status' do
expect(response.body).to_not include(private_pinned.text)
it 'returns orderedItems with expected items' do
expect(body_as_json[:orderedItems])
.to be_an(Array)
.and have_attributes(size: 3)
.and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
.and not_include(private_pinned.text)
end
end
@ -111,50 +90,36 @@ RSpec.describe ActivityPub::CollectionsController do
context 'when signed request account is blocked' do
before do
account.block!(remote_account)
get :show, params: { id: 'featured', account_username: account.username }
end
it 'returns http success' do
it 'returns http success and correct media type and cache headers' do
expect(response).to have_http_status(200)
end
it 'returns application/activity+json' do
expect(response.media_type).to eq 'application/activity+json'
end
it 'returns private Cache-Control header' do
expect(response.headers['Cache-Control']).to include 'private'
end
it 'returns empty orderedItems' do
json = body_as_json
expect(json[:orderedItems]).to be_an Array
expect(json[:orderedItems].size).to eq 0
expect(body_as_json[:orderedItems])
.to be_an(Array)
.and have_attributes(size: 0)
end
end
context 'when signed request account is domain blocked' do
before do
account.block_domain!(remote_account.domain)
get :show, params: { id: 'featured', account_username: account.username }
end
it 'returns http success' do
it 'returns http success and correct media type and cache headers' do
expect(response).to have_http_status(200)
end
it 'returns application/activity+json' do
expect(response.media_type).to eq 'application/activity+json'
end
it 'returns private Cache-Control header' do
expect(response.headers['Cache-Control']).to include 'private'
end
it 'returns empty orderedItems' do
json = body_as_json
expect(json[:orderedItems]).to be_an Array
expect(json[:orderedItems].size).to eq 0
expect(body_as_json[:orderedItems])
.to be_an(Array)
.and have_attributes(size: 0)
end
end
end
@ -162,8 +127,9 @@ RSpec.describe ActivityPub::CollectionsController do
end
context 'when id is not "featured"' do
let(:id) { 'hoge' }
it 'returns http not found' do
get :show, params: { id: 'hoge', account_username: account.username }
expect(response).to have_http_status(404)
end
end

50
spec/controllers/admin/accounts_controller_spec.rb
View file

@ -9,18 +9,8 @@ RSpec.describe Admin::AccountsController do
describe 'GET #index' do
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
around do |example|
default_per_page = Account.default_per_page
Account.paginates_per 1
example.run
Account.paginates_per default_per_page
end
it 'filters with parameters' do
account_filter = instance_double(AccountFilter, results: Account.all)
allow(AccountFilter).to receive(:new).and_return(account_filter)
params = {
let(:params) do
{
origin: 'local',
by_domain: 'domain',
status: 'active',
@ -29,25 +19,35 @@ RSpec.describe Admin::AccountsController do
email: 'local-part@domain',
ip: '0.0.0.42',
}
get :index, params: params
expect(AccountFilter).to have_received(:new).with(hash_including(params))
end
it 'paginates accounts' do
around do |example|
default_per_page = Account.default_per_page
Account.paginates_per 1
example.run
Account.paginates_per default_per_page
end
before do
Fabricate(:account)
get :index, params: { page: 2 }
accounts = assigns(:accounts)
expect(accounts.count).to eq 1
expect(accounts.klass).to be Account
account_filter = instance_double(AccountFilter, results: Account.all)
allow(AccountFilter).to receive(:new).and_return(account_filter)
end
it 'returns http success' do
get :index
expect(response).to have_http_status(200)
it 'returns success and paginates and filters with parameters' do
get :index, params: params.merge(page: 2)
expect(response)
.to have_http_status(200)
expect(assigns(:accounts))
.to have_attributes(
count: eq(1),
klass: be(Account)
)
expect(AccountFilter)
.to have_received(:new)
.with(hash_including(params))
end
end

10
spec/controllers/admin/reports_controller_spec.rb
View file

@ -58,6 +58,7 @@ describe Admin::ReportsController do
report.reload
expect(report.action_taken_by_account).to eq user.account
expect(report.action_taken?).to be true
expect(last_action_log.target).to eq(report)
end
end
@ -70,6 +71,7 @@ describe Admin::ReportsController do
report.reload
expect(report.action_taken_by_account).to be_nil
expect(report.action_taken?).to be false
expect(last_action_log.target).to eq(report)
end
end
@ -81,6 +83,7 @@ describe Admin::ReportsController do
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to eq user.account
expect(last_action_log.target).to eq(report)
end
end
@ -92,6 +95,13 @@ describe Admin::ReportsController do
expect(response).to redirect_to(admin_report_path(report))
report.reload
expect(report.assigned_account).to be_nil
expect(last_action_log.target).to eq(report)
end
end
private
def last_action_log
Admin::ActionLog.last
end
end