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

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

Browse source
This commit is contained in:
KMY 2024-08-30 08:17:34 +09:00
commit 206021455e
25 changed files with 378 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

35
spec/controllers/admin/resets_controller_spec.rb
View file

@ -1,35 +0,0 @@
# frozen_string_literal: true
require 'rails_helper'
describe Admin::ResetsController do
render_views
subject { post :create, params: { account_id: account.id } }
let(:account) { Fabricate(:account) }
before do
sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
end
describe 'POST #create', :inline_jobs do
it 'redirects to admin accounts page' do
emails = capture_emails { subject }
expect(emails.size)
.to eq(2)
expect(emails).to have_attributes(
first: have_attributes(
to: include(account.user.email),
subject: I18n.t('devise.mailer.password_change.subject')
),
last: have_attributes(
to: include(account.user.email),
subject: I18n.t('devise.mailer.reset_password_instructions.subject')
)
)
expect(response).to redirect_to(admin_account_path(account.id))
end
end
end

65
spec/controllers/media_controller_spec.rb
View file

@ -1,65 +0,0 @@
# frozen_string_literal: true
require 'rails_helper'
describe MediaController do
render_views
describe '#show' do
it 'raises when shortcode cant be found' do
get :show, params: { id: 'missing' }
expect(response).to have_http_status(404)
end
context 'when the media attachment has a shortcode' do
it 'redirects to the file url when attached to a status' do
status = Fabricate(:status)
media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param }
expect(response).to redirect_to(media_attachment.file.url(:original))
end
it 'responds with missing when there is not an attached status' do
media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
it 'raises when not permitted to view' do
status = Fabricate(:status, visibility: :direct)
media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
end
context 'when the media attachment has no shortcode' do
it 'redirects to the file url when attached to a status' do
status = Fabricate(:status)
media_attachment = Fabricate(:media_attachment, status: status)
get :show, params: { id: media_attachment.to_param }
expect(response).to redirect_to(media_attachment.file.url(:original))
end
it 'responds with missing when there is not an attached status' do
media_attachment = Fabricate(:media_attachment, status: nil)
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
it 'raises when not permitted to view' do
status = Fabricate(:status, visibility: :direct)
media_attachment = Fabricate(:media_attachment, status: status)
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
end
end
end