From 6597c213c341ae072216c125a97f94a174fc3dfa Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 12 Jul 2016 19:28:21 +0800
Subject: [PATCH] Prefer empty relation rather than arrays
---
app/models/project.rb | 2 +-
spec/models/build_spec.rb | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index 35ffb0a415d..bc15f8c4138 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -431,7 +431,7 @@ class Project < ActiveRecord::Base
def builds_for(build_name, ref = 'HEAD')
ct = commit(ref)
- return [] unless ct
+ return builds.none unless ct
sha = commit(ref).sha
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index c7c247189f5..b1354faa722 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -697,5 +697,11 @@ describe Ci::Build, models: true do
expect(build_ids).to eq([build.id])
end
+
+ it 'returns empty relation if the build cannot be found' do
+ builds = project.builds_for(build.name, 'TAIL').all
+
+ expect(builds).to be_empty
+ end
end
end
--
GitLab