summaryrefslogtreecommitdiff
path: root/spec/uploaders
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-23 18:51:20 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 12:04:49 +0100
commit38c61ab6df15fbd1eab22a8dff8da01b17c075f3 (patch)
treec0df50ea346d5ab5f9b21951b9fc746869a44612 /spec/uploaders
parent871de0f18581bb03fed5c0d800f8183598a0195f (diff)
downloadgitlab-ce-38c61ab6df15fbd1eab22a8dff8da01b17c075f3.tar.gz
Fix specs failures, and use factory with `:ci_job_artifact, :archive`
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/job_artifact_uploader_spec.rb38
-rw-r--r--spec/uploaders/legacy_artifact_uploader_spec.rb22
2 files changed, 55 insertions, 5 deletions
diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb
index d045acf9089..bb2cc52381d 100644
--- a/spec/uploaders/job_artifact_uploader_spec.rb
+++ b/spec/uploaders/job_artifact_uploader_spec.rb
@@ -2,14 +2,46 @@ require 'spec_helper'
describe JobArtifactUploader do
set(:job_artifact) { create(:ci_job_artifact) }
- let(:job) { job_artifact.job }
let(:uploader) { described_class.new(job_artifact, :file) }
+ let(:path) { Gitlab.config.artifacts.path }
describe '#store_dir' do
subject { uploader.store_dir }
- it { is_expected.to start_with(Gitlab.config.artifacts.path) }
- it { is_expected.not_to end_with("#{job.project_id}/#{job.created_at.utc.strftime('%Y_%m')}/#{job.id}") }
+ it { is_expected.to start_with(path) }
+ it { is_expected.not_to end_with("#{job_artifact.project_id}/#{job_artifact.created_at.utc.strftime('%Y_%m')}/#{job_artifact.id}") }
it { is_expected.to match(/\h{2}\/\h{2}\/\h{64}\/\d{4}_\d{1,2}_\d{1,2}\/\d+\/\d+\z/) }
end
+
+ describe '#cache_dir' do
+ subject { uploader.cache_dir }
+
+ it { is_expected.to start_with(path) }
+ it { is_expected.to end_with('/tmp/cache') }
+ end
+
+ describe '#work_dir' do
+ subject { uploader.work_dir }
+
+ it { is_expected.to start_with(path) }
+ it { is_expected.to end_with('/tmp/work') }
+ end
+
+ context 'file is stored in valid path' do
+ let(:file) do
+ fixture_file_upload(Rails.root.join(
+ 'spec/fixtures/ci_build_artifacts.zip'), 'application/zip')
+ end
+
+ before do
+ uploader.store!(file)
+ end
+
+ subject { uploader.file.path }
+
+ it { is_expected.to start_with(path) }
+ it { is_expected.to include("/#{job_artifact.created_at.utc.strftime('%Y_%m_%d')}/") }
+ it { is_expected.to include("/#{job_artifact.project_id.to_s}/") }
+ it { is_expected.to end_with("ci_build_artifacts.zip") }
+ end
end
diff --git a/spec/uploaders/legacy_artifact_uploader_spec.rb b/spec/uploaders/legacy_artifact_uploader_spec.rb
index 1d9adaccd8d..203630de91c 100644
--- a/spec/uploaders/legacy_artifact_uploader_spec.rb
+++ b/spec/uploaders/legacy_artifact_uploader_spec.rb
@@ -5,8 +5,8 @@ describe LegacyArtifactUploader do
let(:uploader) { described_class.new(job, :artifacts_file) }
let(:path) { Gitlab.config.artifacts.path }
- describe '.local_artifacts_store' do
- subject { described_class.local_artifacts_store }
+ describe '.local_store_path' do
+ subject { described_class.local_store_path }
it "delegate to artifacts path" do
expect(Gitlab.config.artifacts).to receive(:path)
@@ -58,4 +58,22 @@ describe LegacyArtifactUploader do
it { is_expected.not_to be_nil }
end
end
+
+ context 'file is stored in valid path' do
+ let(:file) do
+ fixture_file_upload(Rails.root.join(
+ 'spec/fixtures/ci_build_artifacts.zip'), 'application/zip')
+ end
+
+ before do
+ uploader.store!(file)
+ end
+
+ subject { uploader.file.path }
+
+ it { is_expected.to start_with(path) }
+ it { is_expected.to include("/#{job.created_at.utc.strftime('%Y_%m')}/") }
+ it { is_expected.to include("/#{job.project_id.to_s}/") }
+ it { is_expected.to end_with("ci_build_artifacts.zip") }
+ end
end