diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 00:08:48 +0300 |
| commit | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (patch) | |
| tree | 574475bd0901a2f8906d36a4728b8bbb95b41e1c /spec/uploaders/gitlab_uploader_spec.rb | |
| parent | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders/gitlab_uploader_spec.rb')
| -rw-r--r-- | spec/uploaders/gitlab_uploader_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/uploaders/gitlab_uploader_spec.rb b/spec/uploaders/gitlab_uploader_spec.rb index 4329171f0be..80efdb88585 100644 --- a/spec/uploaders/gitlab_uploader_spec.rb +++ b/spec/uploaders/gitlab_uploader_spec.rb @@ -59,7 +59,7 @@ describe GitlabUploader do describe '#cache!' do it 'moves the file from the working directory to the cache directory' do # One to get the work dir, the other to remove it - expect(subject).to receive(:workfile_path).exactly(2).times.and_call_original + expect(subject).to receive(:workfile_path).twice.and_call_original # Test https://github.com/carrierwavesubject/carrierwave/blob/v1.0.0/lib/carrierwave/sanitized_file.rb#L200 expect(FileUtils).to receive(:mv).with(anything, /^#{subject.work_dir}/).and_call_original expect(FileUtils).to receive(:mv).with(/^#{subject.work_dir}/, /#{subject.cache_dir}/).and_call_original |