summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-07-01 00:00:35 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-07-01 00:00:35 +0800
commit7b06acea1c13b7fa9067902faaed73c7210f4bb3 (patch)
tree1259a1f1e0f93c05944874a0ac00fb894166fe59
parent9d8dca08e440ccb730f20dcd79b3b47aef8aeb2e (diff)
downloadgitlab-ce-7b06acea1c13b7fa9067902faaed73c7210f4bb3.tar.gz
Use nil for non-existing files rather than 0
-rw-r--r--app/models/ci/build.rb4
-rw-r--r--spec/requests/ci/api/builds_spec.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2079d5a2178..850895845f4 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -382,7 +382,9 @@ module Ci
private
def update_artifacts_size
- self.artifacts_size = artifacts_file.size
+ self.artifacts_size = if artifacts_file.exists?
+ artifacts_file.size
+ end
end
def erase_trace!
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 64cb7dd12d0..666fdbdd2b5 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -486,7 +486,7 @@ describe Ci::API::API do
expect(response).to have_http_status(200)
expect(build.artifacts_file.exists?).to be_falsy
expect(build.artifacts_metadata.exists?).to be_falsy
- expect(build.artifacts_size).to eq(0)
+ expect(build.artifacts_size).to be_nil
end
end