diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-06-12 13:13:03 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-12 13:13:03 +0900 |
| commit | d7a3180d06e7b16728d4f23b1e68007c9c2f3b9a (patch) | |
| tree | d111815ee462b6dd0b29af9c158d7d1abc24f505 /spec/models/ci | |
| parent | 644529590a263f8db215d288c2f59abbe632a09b (diff) | |
| parent | 26c9d71666d0350b17431a75d8c31d0316bd7220 (diff) | |
| download | gitlab-ce-d7a3180d06e7b16728d4f23b1e68007c9c2f3b9a.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'spec/models/ci')
| -rw-r--r-- | spec/models/ci/job_artifact_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb index a3e119cbc27..efddd4e7662 100644 --- a/spec/models/ci/job_artifact_spec.rb +++ b/spec/models/ci/job_artifact_spec.rb @@ -76,12 +76,12 @@ describe Ci::JobArtifact do context 'updating the artifact file' do it 'updates the artifact size' do - artifact.update!(file: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) + artifact.update!(file: fixture_file_upload('spec/fixtures/dk.png')) expect(artifact.size).to eq(1062) end it 'updates the project statistics' do - expect { artifact.update!(file: fixture_file_upload(File.join(Rails.root, 'spec/fixtures/dk.png'))) } + expect { artifact.update!(file: fixture_file_upload('spec/fixtures/dk.png')) } .to change { artifact.project.statistics.reload.build_artifacts_size } .by(1062 - 106365) end |