631eed028b
This was causing todo priority sorting to fail.
75 lines
2.8 KiB
Ruby
75 lines
2.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe TodosFinder do
|
|
describe '#execute' do
|
|
let(:user) { create(:user) }
|
|
let(:group) { create(:group) }
|
|
let(:project) { create(:project, namespace: group) }
|
|
let(:finder) { described_class }
|
|
|
|
before do
|
|
group.add_developer(user)
|
|
end
|
|
|
|
describe '#sort' do
|
|
context 'by date' do
|
|
let!(:todo1) { create(:todo, user: user, project: project) }
|
|
let!(:todo2) { create(:todo, user: user, project: project) }
|
|
let!(:todo3) { create(:todo, user: user, project: project) }
|
|
|
|
it 'sorts with oldest created first' do
|
|
todos = finder.new(user, { sort: 'id_asc' }).execute
|
|
|
|
expect(todos.first).to eq(todo1)
|
|
expect(todos.second).to eq(todo2)
|
|
expect(todos.third).to eq(todo3)
|
|
end
|
|
|
|
it 'sorts with newest created first' do
|
|
todos = finder.new(user, { sort: 'id_desc' }).execute
|
|
|
|
expect(todos.first).to eq(todo3)
|
|
expect(todos.second).to eq(todo2)
|
|
expect(todos.third).to eq(todo1)
|
|
end
|
|
end
|
|
|
|
it "sorts by priority" do
|
|
project_2 = create(:project)
|
|
|
|
label_1 = create(:label, title: 'label_1', project: project, priority: 1)
|
|
label_2 = create(:label, title: 'label_2', project: project, priority: 2)
|
|
label_3 = create(:label, title: 'label_3', project: project, priority: 3)
|
|
label_1_2 = create(:label, title: 'label_1', project: project_2, priority: 1)
|
|
|
|
issue_1 = create(:issue, title: 'issue_1', project: project)
|
|
issue_2 = create(:issue, title: 'issue_2', project: project)
|
|
issue_3 = create(:issue, title: 'issue_3', project: project)
|
|
issue_4 = create(:issue, title: 'issue_4', project: project)
|
|
merge_request_1 = create(:merge_request, source_project: project_2)
|
|
|
|
merge_request_1.labels << label_1_2
|
|
|
|
# Covers the case where Todo has more than one label
|
|
issue_3.labels << label_1
|
|
issue_3.labels << label_3
|
|
|
|
issue_2.labels << label_3
|
|
issue_1.labels << label_2
|
|
|
|
todo_1 = create(:todo, user: user, project: project, target: issue_4)
|
|
todo_2 = create(:todo, user: user, project: project, target: issue_2)
|
|
todo_3 = create(:todo, user: user, project: project, target: issue_3, created_at: 2.hours.ago)
|
|
todo_4 = create(:todo, user: user, project: project, target: issue_1)
|
|
todo_5 = create(:todo, user: user, project: project_2, target: merge_request_1, created_at: 1.hour.ago)
|
|
|
|
project_2.add_developer(user)
|
|
|
|
todos = finder.new(user, { sort: 'priority' }).execute
|
|
|
|
puts todos.to_sql
|
|
expect(todos).to eq([todo_3, todo_5, todo_4, todo_2, todo_1])
|
|
end
|
|
end
|
|
end
|
|
end
|