summaryrefslogtreecommitdiff
path: root/spec/finders
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2015-10-06 16:35:51 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2015-10-06 17:26:32 +0200
commitb7abba0ca0a4629a854eee0488f94f160452e2f6 (patch)
tree6979d294a5d0d50e9400518a55a86b1c3da42d96 /spec/finders
parentd15eec64604d68093d8f01711c1847ee240eb0d2 (diff)
downloadgitlab-ce-b7abba0ca0a4629a854eee0488f94f160452e2f6.tar.gz
Revamp trending projects query
This changes the query to use a COUNT nested in an INNER JOIN, instead of a COUNT plus a GROUP BY. There are two reasons for this: 1. Using a COUNT in an INNER JOIN can be quite a bit faster. 2. The use of a GROUP BY means that method calls such as "any?" (and everything else that calls "count") operate on a Hash that counts the amount of notes on a per project basis, instead of just counting the total amount of projects. The query has been moved into Project.trending as its logic is simple enough. As a result of this testing the TrendingProjectsFinder class simply involves testing if the right methods are called, removing the need for setting up database records.
Diffstat (limited to 'spec/finders')
-rw-r--r--spec/finders/trending_projects_finder_spec.rb44
1 files changed, 20 insertions, 24 deletions
diff --git a/spec/finders/trending_projects_finder_spec.rb b/spec/finders/trending_projects_finder_spec.rb
index 1ad2e23f1f1..a49cbfd5160 100644
--- a/spec/finders/trending_projects_finder_spec.rb
+++ b/spec/finders/trending_projects_finder_spec.rb
@@ -1,42 +1,38 @@
require 'spec_helper'
describe TrendingProjectsFinder do
- let(:user) { create(:user) }
- let(:group) { create(:group) }
-
- let(:project1) { create(:empty_project, :public, group: group) }
- let(:project2) { create(:empty_project, :public, group: group) }
-
- before do
- 2.times do
- create(:note_on_commit, project: project1)
- end
-
- create(:note_on_commit, project: project2)
- end
+ let(:user) { build(:user) }
describe '#execute' do
describe 'without an explicit start date' do
- subject { described_class.new.execute(user).to_a }
+ subject { described_class.new }
- it 'sorts Projects by the amount of notes in descending order' do
- expect(subject).to eq([project1, project2])
+ it 'returns the trending projects' do
+ relation = double(:ar_relation)
+
+ allow(subject).to receive(:projects_for)
+ .with(user)
+ .and_return(relation)
+
+ allow(relation).to receive(:trending)
+ .with(an_instance_of(ActiveSupport::TimeWithZone))
end
end
describe 'with an explicit start date' do
let(:date) { 2.months.ago }
- subject { described_class.new.execute(user, date).to_a }
+ subject { described_class.new }
- before do
- 2.times do
- create(:note_on_commit, project: project2, created_at: date)
- end
- end
+ it 'returns the trending projects' do
+ relation = double(:ar_relation)
+
+ allow(subject).to receive(:projects_for)
+ .with(user)
+ .and_return(relation)
- it 'sorts Projects by the amount of notes in descending order' do
- expect(subject).to eq([project2, project1])
+ allow(relation).to receive(:trending)
+ .with(date)
end
end
end