Merge branch 'sh-fix-appearance-spec-failure' into 'master'
Fix order-dependent spec failure in appearance_spec.rb Closes #64083 See merge request gitlab-org/gitlab-ce!30323
This commit is contained in:
commit
fb35a3b7f4
|
@ -21,7 +21,7 @@ describe Appearance do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with uploads', :quarantine do
|
context 'with uploads' do
|
||||||
it_behaves_like 'model with uploads', false do
|
it_behaves_like 'model with uploads', false do
|
||||||
let(:model_object) { create(:appearance, :with_logo) }
|
let(:model_object) { create(:appearance, :with_logo) }
|
||||||
let(:upload_attribute) { :logo }
|
let(:upload_attribute) { :logo }
|
||||||
|
|
|
@ -85,8 +85,7 @@ describe FileMover do
|
||||||
|
|
||||||
context 'when tmp uploader is not local storage' do
|
context 'when tmp uploader is not local storage' do
|
||||||
before do
|
before do
|
||||||
allow(PersonalFileUploader).to receive(:object_store_enabled?) { true }
|
stub_uploads_object_storage(uploader: PersonalFileUploader)
|
||||||
tmp_uploader.object_store = ObjectStorage::Store::REMOTE
|
|
||||||
allow_any_instance_of(PersonalFileUploader).to receive(:file_storage?) { false }
|
allow_any_instance_of(PersonalFileUploader).to receive(:file_storage?) { false }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue