1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
require 'spec_helper'
describe 'Projects > Merge requests > User lists merge requests', feature: true do
include SortingHelper
let(:project) { create(:project, :public) }
let(:user) { create(:user) }
before { login_with(user) }
describe 'Filter merge requests' do
before do
%w[fix markdown].each do |branch|
create(:merge_request,
author: user,
assignee: user,
source_project: project,
source_branch: branch,
title: branch)
end
create(:merge_request,
author: user,
assignee: nil,
source_project: project,
source_branch: 'lfs',
title: 'lfs',
milestone: create(:milestone, project: project))
end
it 'allows filtering by merge requests with no specified assignee' do
visit namespace_project_merge_requests_path(project.namespace, project, assignee_id: IssuableFinder::NONE)
expect(current_path).to eq(namespace_project_merge_requests_path(project.namespace, project))
expect(page).to have_content 'lfs'
expect(page).not_to have_content 'fix'
expect(page).not_to have_content 'markdown'
end
it 'allows filtering by a specified assignee' do
visit namespace_project_merge_requests_path(project.namespace, project, assignee_id: user.id)
expect(page).not_to have_content 'lfs'
expect(page).to have_content 'fix'
expect(page).to have_content 'markdown'
end
end
describe 'Filter & Sort merge requests' do
%w[fix markdown lfs].each_with_index do |branch, index|
let!(branch.to_sym) do
create(:merge_request,
title: branch,
source_project: project,
source_branch: branch,
created_at: Time.now - (index * 60))
end
end
let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
describe 'Sort merge requests' do
it 'sorts by newest' do
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_recently_created)
expect(first_merge_request).to include('lfs')
expect(last_merge_request).to include('fix')
end
it 'sorts by oldest' do
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_oldest_created)
expect(first_merge_request).to include('fix')
expect(last_merge_request).to include('lfs')
end
it 'sorts by most recently updated' do
lfs.updated_at = Time.now + 100
lfs.save
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_recently_updated)
expect(first_merge_request).to include('lfs')
end
it 'sorts by least recently updated' do
lfs.updated_at = Time.now - 100
lfs.save
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_oldest_updated)
expect(first_merge_request).to include('lfs')
end
describe 'sorting by milestone' do
before do
fix.milestone = newer_due_milestone
fix.save
markdown.milestone = later_due_milestone
markdown.save
end
it 'sorts by recently due milestone' do
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_milestone_soon)
expect(first_merge_request).to include('fix')
end
it 'sorts by least recently due milestone' do
visit namespace_project_merge_requests_path(project.namespace, project, sort: sort_value_milestone_later)
expect(first_merge_request).to include('markdown')
end
end
end
describe 'Filter and sort at the same time' do
let(:user2) { create(:user) }
before do
fix.assignee = user2
fix.milestone = newer_due_milestone
fix.save
markdown.assignee = user2
markdown.milestone = later_due_milestone
markdown.save
end
context 'filter on one label' do
let(:label) { create(:label, project: project) }
before { create(:label_link, label: label, target: fix) }
it 'sorts by due soon' do
visit namespace_project_merge_requests_path(project.namespace, project,
label_name: [label.name],
sort: sort_value_due_date_soon)
expect(first_merge_request).to include('fix')
end
end
context 'filter on two labels' do
let(:label) { create(:label, project: project) }
let(:label2) { create(:label, project: project) }
before do
create(:label_link, label: label, target: fix)
create(:label_link, label: label2, target: fix)
end
it 'sorts by due soon' do
visit namespace_project_merge_requests_path(project.namespace, project,
label_name: [label.name, label2.name],
sort: sort_value_due_date_soon)
expect(first_merge_request).to include('fix')
end
context 'filter on assignee' do
it 'sorts by due soon' do
visit namespace_project_merge_requests_path(project.namespace, project,
label_name: [label.name, label2.name],
assignee_id: user2.id,
sort: sort_value_due_date_soon)
expect(first_merge_request).to include('fix')
end
it 'sorts by recently due milestone' do
visit namespace_project_merge_requests_path(project.namespace, project,
label_name: [label.name, label2.name],
assignee_id: user2.id,
sort: sort_value_milestone_soon)
expect(first_merge_request).to include('fix')
end
end
end
end
end
def first_merge_request
page.all('ul.mr-list > li').first.text
end
def last_merge_request
page.all('ul.mr-list > li').last.text
end
end
|
