diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-05 15:26:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-05 15:26:14 +0000 |
| commit | 0a5f3aa37833fe6365fc8ab7af8912d15b4d844a (patch) | |
| tree | 9e47a8dbb7960caa77b614506715cef04d385286 /spec/uploaders | |
| parent | 6153a61633b7cd3e2e13c09065c0ead081644e3e (diff) | |
| parent | 53d1c87c8673fa6c9d83519490698b37d67572df (diff) | |
| download | gitlab-ce-0a5f3aa37833fe6365fc8ab7af8912d15b4d844a.tar.gz | |
Merge branch 'fix-fog-mocking' into 'master'
Fix Fog mocking
Closes #47300
See merge request gitlab-org/gitlab-ce!19425
Diffstat (limited to 'spec/uploaders')
| -rw-r--r-- | spec/uploaders/object_storage_spec.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index cda911032b2..4503288e410 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -360,13 +360,6 @@ describe ObjectStorage do subject { uploader_class.workhorse_authorize(has_length: has_length, maximum_size: maximum_size) } - before do - # ensure that we use regular Fog libraries - # other tests might call `Fog.mock!` and - # it will make tests to fail - Fog.unmock! - end - shared_examples 'uses local storage' do it "returns temporary path" do is_expected.to have_key(:TempPath) |