From 8bc768d86f1fd341a6ee9cc38fecacbff2d63cdd Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Wed, 3 Jul 2019 19:24:04 +0000 Subject: [PATCH] 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 --- spec/uploaders/file_mover_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/uploaders/file_mover_spec.rb b/spec/uploaders/file_mover_spec.rb index a9e03f3d4e5..5ee0a10f38d 100644 --- a/spec/uploaders/file_mover_spec.rb +++ b/spec/uploaders/file_mover_spec.rb @@ -85,8 +85,7 @@ describe FileMover do context 'when tmp uploader is not local storage' do before do - allow(PersonalFileUploader).to receive(:object_store_enabled?) { true } - tmp_uploader.object_store = ObjectStorage::Store::REMOTE + stub_uploads_object_storage(uploader: PersonalFileUploader) allow_any_instance_of(PersonalFileUploader).to receive(:file_storage?) { false } end -- GitLab