diff options
author | Nick Thomas <nick@gitlab.com> | 2018-01-17 14:30:25 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-01-24 20:25:55 +0300 |
commit | 93ea3234dfaa43204c5f24d4010bbe5070d75c72 (patch) | |
tree | dab7e978b28b6dc79349a3e084fad36175cf55d7 /spec/uploaders/job_artifact_uploader_spec.rb | |
parent | 5a4fb8f0d183c7dd1560c90e750a7a37141c22d4 (diff) |
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Diffstat (limited to 'spec/uploaders/job_artifact_uploader_spec.rb')
-rw-r--r-- | spec/uploaders/job_artifact_uploader_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb index 14fd5f3600f..98a4373e9d0 100644 --- a/spec/uploaders/job_artifact_uploader_spec.rb +++ b/spec/uploaders/job_artifact_uploader_spec.rb @@ -8,7 +8,7 @@ describe JobArtifactUploader do describe '#store_dir' do subject { uploader.store_dir } - let(:path) { "#{job_artifact.created_at.utc.strftime('%Y_%m_%d')}/#{job_artifact.project_id}/#{job_artifact.id}" } + let(:path) { "#{job_artifact.created_at.utc.strftime('%Y_%m_%d')}/#{job_artifact.job_id}/#{job_artifact.id}" } context 'when using local storage' do it { is_expected.to start_with(local_path) } @@ -45,7 +45,7 @@ describe JobArtifactUploader do it { is_expected.to start_with(local_path) } it { is_expected.to include("/#{job_artifact.created_at.utc.strftime('%Y_%m_%d')}/") } - it { is_expected.to include("/#{job_artifact.project_id}/") } + it { is_expected.to include("/#{job_artifact.job_id}/#{job_artifact.id}/") } it { is_expected.to end_with("ci_build_artifacts.zip") } end end |