summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-07-03 19:24:04 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-07-16 11:29:32 -0500
commit9dc82e81ddaf99a12b352a4dfe6b3a33cbc49b6d (patch)
treef4b2d5ac1f2e643174916d6176c27abc069bff84
parentb85e6215a854a02fbb63c4e3be9998fc9fd4e58a (diff)
downloadgitlab-ce-9dc82e81ddaf99a12b352a4dfe6b3a33cbc49b6d.tar.gz
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
-rw-r--r--spec/uploaders/file_mover_spec.rb3
1 files changed, 1 insertions, 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