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-20231107

Browse source
This commit is contained in:
KMY 2023-11-07 11:35:05 +09:00
commit 64578feeb4
69 changed files with 437 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/requests/api/v1/media_spec.rb
View file

@ -127,19 +127,19 @@ RSpec.describe 'Media' do
end
end
context 'with image/jpeg', paperclip_processing: true do
context 'with image/jpeg', :paperclip_processing do
let(:params) { { file: fixture_file_upload('attachment.jpg', 'image/jpeg'), description: 'jpeg image' } }
it_behaves_like 'a successful media upload', 'image'
end
context 'with image/gif', paperclip_processing: true do
context 'with image/gif', :paperclip_processing do
let(:params) { { file: fixture_file_upload('attachment.gif', 'image/gif') } }
it_behaves_like 'a successful media upload', 'image'
end
context 'with video/webm', paperclip_processing: true do
context 'with video/webm', :paperclip_processing do
let(:params) { { file: fixture_file_upload('attachment.webm', 'video/webm') } }
it_behaves_like 'a successful media upload', 'gifv'

2
spec/requests/api/v2/media_spec.rb
View file

@ -2,7 +2,7 @@
require 'rails_helper'
RSpec.describe 'Media API', paperclip_processing: true do
RSpec.describe 'Media API', :paperclip_processing do
let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:scopes) { 'write' }