diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
| commit | 87d01cc3bfc12c08024881dc8f13101e5430e3e6 (patch) | |
| tree | 05e82defa51500257f97e3530862da03668895e3 /spec/lib/gitlab/import_export/avatar_saver_spec.rb | |
| parent | fef5c923c009c64183cc43909444a1bdaba218b7 (diff) | |
| parent | 71f3d48544cc0857c8d470b182f7e809de6a4642 (diff) | |
| download | gitlab-ce-consolidate-page-widths-part02.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consolidate-page-widths-part02consolidate-page-widths-part02
Diffstat (limited to 'spec/lib/gitlab/import_export/avatar_saver_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/import_export/avatar_saver_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/lib/gitlab/import_export/avatar_saver_spec.rb b/spec/lib/gitlab/import_export/avatar_saver_spec.rb index 90e6d653d34..2bd1b9924c6 100644 --- a/spec/lib/gitlab/import_export/avatar_saver_spec.rb +++ b/spec/lib/gitlab/import_export/avatar_saver_spec.rb @@ -8,8 +8,7 @@ describe Gitlab::ImportExport::AvatarSaver do before do FileUtils.mkdir_p("#{shared.export_path}/avatar/") - allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) - stub_feature_flags(import_export_object_storage: false) + allow_any_instance_of(Gitlab::ImportExport::Shared).to receive(:export_path).and_return(export_path) end after do @@ -19,7 +18,7 @@ describe Gitlab::ImportExport::AvatarSaver do it 'saves a project avatar' do described_class.new(project: project_with_avatar, shared: shared).save - expect(File).to exist("#{shared.export_path}/avatar/dk.png") + expect(File).to exist(Dir["#{shared.export_path}/avatar/**/dk.png"].first) end it 'is fine not to have an avatar' do |