Merge remote-tracking branch 'parent/main' into upstream-20240109
This commit is contained in:
commit
d35fa72842
333 changed files with 4444 additions and 2541 deletions
|
@ -7,7 +7,7 @@ RSpec.describe Form::CustomEmojiBatch do
|
|||
subject { described_class.new({ current_account: account }.merge(options)) }
|
||||
|
||||
let(:options) { {} }
|
||||
let(:account) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
|
||||
let(:account) { Fabricate(:admin_user).account }
|
||||
|
||||
context 'with empty custom_emoji_ids' do
|
||||
let(:options) { { custom_emoji_ids: [] } }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue