diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 10:39:36 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 10:39:36 +0000 |
| commit | c56f2b96159afaf6f1e0831d0e7a756a40568cab (patch) | |
| tree | 9070e9f1d9b63733e7d0ecd57bd7aeca242bdc85 /spec/uploaders | |
| parent | b9ea4e35ac679a87ea16ca01a5f02bd96b3b16c3 (diff) | |
| parent | 678ceb257ef829377c197ef368ea8e1b7fce9c4e (diff) | |
| download | gitlab-ce-c56f2b96159afaf6f1e0831d0e7a756a40568cab.tar.gz | |
Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'
Resolve "Project export broken when avatar is set"
Closes #51318
See merge request gitlab-org/gitlab-ce!21649
Diffstat (limited to 'spec/uploaders')
| -rw-r--r-- | spec/uploaders/avatar_uploader_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb index b0468bc35ff..6aaec7a4fef 100644 --- a/spec/uploaders/avatar_uploader_spec.rb +++ b/spec/uploaders/avatar_uploader_spec.rb @@ -35,5 +35,13 @@ describe AvatarUploader do it_behaves_like "migrates", to_store: described_class::Store::REMOTE it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL + + it 'sets the right absolute path' do + storage_path = Gitlab.config.uploads.storage_path + absolute_path = File.join(storage_path, upload.path) + + expect(uploader.absolute_path.scan(storage_path).size).to eq(1) + expect(uploader.absolute_path).to eq(absolute_path) + end end end |