Allow usage of any_projects? with an Array

In some cases we pass an Array to this method which would previously
fail since Array does not respond to "limit_value".

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
This commit is contained in:
Yorick Peterse 2017-08-15 12:33:07 +02:00
parent 4a2a6d521a
commit b401b3025b
No known key found for this signature in database
GPG Key ID: EDD30D2BEB691AC9
2 changed files with 11 additions and 3 deletions

View File

@ -234,6 +234,8 @@ module ProjectsHelper
# If no limit is applied we'll just issue a COUNT since the result set could
# be too large to load into memory.
def any_projects?(projects)
return projects.any? if projects.is_a?(Array)
if projects.limit_value
projects.to_a.any?
else

View File

@ -432,9 +432,7 @@ describe ProjectsHelper do
end
describe '#any_projects?' do
before do
create(:project)
end
let!(:project) { create(:project) }
it 'returns true when projects will be returned' do
expect(helper.any_projects?(Project.all)).to eq(true)
@ -444,6 +442,14 @@ describe ProjectsHelper do
expect(helper.any_projects?(Project.none)).to eq(false)
end
it 'returns true when using a non-empty Array' do
expect(helper.any_projects?([project])).to eq(true)
end
it 'returns false when using an empty Array' do
expect(helper.any_projects?([])).to eq(false)
end
it 'only executes a single query when a LIMIT is applied' do
relation = Project.limit(1)
recorder = ActiveRecord::QueryRecorder.new do