diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-02-05 19:03:02 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-02-06 15:50:08 +0900 |
commit | d30e71b381b9cf33ed61b04c25c258c11942c79b (patch) | |
tree | 04d52f04078150673bc0717d11ca4473730fe16e | |
parent | 8bf9438150deda0562429b3f6658973247a957f9 (diff) | |
download | gitlab-ce-d30e71b381b9cf33ed61b04c25c258c11942c79b.tar.gz |
Fix tests for Drop filename enforcement
-rw-r--r-- | spec/services/ci/create_trace_artifact_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/uploaders/job_artifact_uploader_spec.rb | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/spec/services/ci/create_trace_artifact_service_spec.rb b/spec/services/ci/create_trace_artifact_service_spec.rb index e70b1a2bce2..847a88920fe 100644 --- a/spec/services/ci/create_trace_artifact_service_spec.rb +++ b/spec/services/ci/create_trace_artifact_service_spec.rb @@ -19,7 +19,7 @@ describe Ci::CreateTraceArtifactService do it 'creates trace artifact' do expect { subject }.to change { Ci::JobArtifact.count }.by(1) - expect(job.job_artifacts_trace.read_attribute(:file)).to eq('trace.log') + expect(job.job_artifacts_trace.read_attribute(:file)).to eq('sample_trace') end context 'when the job has already had trace artifact' do diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb index ae631f23ae2..5612ec7e661 100644 --- a/spec/uploaders/job_artifact_uploader_spec.rb +++ b/spec/uploaders/job_artifact_uploader_spec.rb @@ -38,22 +38,6 @@ describe JobArtifactUploader do end end - describe '#filename' do - subject { uploader.filename } - - context 'when artifact file_type is archive' do - let(:job_artifact) { create(:ci_job_artifact, :archive) } - - it { is_expected.to be_nil } - end - - context 'when artifact file_type is trace' do - let(:job_artifact) { create(:ci_job_artifact, :trace) } - - it { is_expected.to eq('trace.log') } - end - end - context 'file is stored in valid local_path' do let(:file) do fixture_file_upload( |