Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
bfd33645
Commit
bfd33645
authored
Mar 07, 2017
by
Dimitrie Hoekstra
Committed by
Sean McGivern
Mar 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename priority sorting option to label priority
parent
e84afa8b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
app/helpers/sorting_helper.rb
app/helpers/sorting_helper.rb
+1
-1
changelogs/unreleased/priority-to-label-priority.yml
changelogs/unreleased/priority-to-label-priority.yml
+4
-0
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
...eatures/projects/labels/issues_sorted_by_priority_spec.rb
+2
-2
spec/features/todos/todos_sorting_spec.rb
spec/features/todos/todos_sorting_spec.rb
+4
-4
No files found.
app/helpers/sorting_helper.rb
View file @
bfd33645
...
@@ -50,7 +50,7 @@ module SortingHelper
...
@@ -50,7 +50,7 @@ module SortingHelper
end
end
def
sort_title_priority
def
sort_title_priority
'
P
riority'
'
Label p
riority'
end
end
def
sort_title_oldest_updated
def
sort_title_oldest_updated
...
...
changelogs/unreleased/priority-to-label-priority.yml
0 → 100644
View file @
bfd33645
---
title
:
Rename priority sorting option to label priority
merge_request
:
author
:
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
View file @
bfd33645
...
@@ -32,7 +32,7 @@ feature 'Issue prioritization', feature: true do
...
@@ -32,7 +32,7 @@ feature 'Issue prioritization', feature: true do
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
'priority'
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
'priority'
)
# Ensure we are indicating that issues are sorted by priority
# Ensure we are indicating that issues are sorted by priority
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'
P
riority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'
Label p
riority'
)
page
.
within
(
'.issues-holder'
)
do
page
.
within
(
'.issues-holder'
)
do
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
...
@@ -70,7 +70,7 @@ feature 'Issue prioritization', feature: true do
...
@@ -70,7 +70,7 @@ feature 'Issue prioritization', feature: true do
login_as
user
login_as
user
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
'priority'
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
'priority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'
P
riority'
)
expect
(
page
).
to
have_selector
(
'.dropdown-toggle'
,
text:
'
Label p
riority'
)
page
.
within
(
'.issues-holder'
)
do
page
.
within
(
'.issues-holder'
)
do
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
issue_titles
=
all
(
'.issues-list .issue-title-text'
).
map
(
&
:text
)
...
...
spec/features/todos/todos_sorting_spec.rb
View file @
bfd33645
...
@@ -56,8 +56,8 @@ describe "Dashboard > User sorts todos", feature: true do
...
@@ -56,8 +56,8 @@ describe "Dashboard > User sorts todos", feature: true do
expect
(
results_list
.
all
(
'p'
)[
4
]).
to
have_content
(
"merge_request_1"
)
expect
(
results_list
.
all
(
'p'
)[
4
]).
to
have_content
(
"merge_request_1"
)
end
end
it
"sorts by priority"
do
it
"sorts by
label
priority"
do
click_link
"
P
riority"
click_link
"
Label p
riority"
results_list
=
page
.
find
(
'.todos-list'
)
results_list
=
page
.
find
(
'.todos-list'
)
expect
(
results_list
.
all
(
'p'
)[
0
]).
to
have_content
(
"issue_3"
)
expect
(
results_list
.
all
(
'p'
)[
0
]).
to
have_content
(
"issue_3"
)
...
@@ -85,8 +85,8 @@ describe "Dashboard > User sorts todos", feature: true do
...
@@ -85,8 +85,8 @@ describe "Dashboard > User sorts todos", feature: true do
visit
dashboard_todos_path
visit
dashboard_todos_path
end
end
it
"doesn't mix issues and merge requests priorities"
do
it
"doesn't mix issues and merge requests
label
priorities"
do
click_link
"
P
riority"
click_link
"
Label p
riority"
results_list
=
page
.
find
(
'.todos-list'
)
results_list
=
page
.
find
(
'.todos-list'
)
expect
(
results_list
.
all
(
'p'
)[
0
]).
to
have_content
(
"issue_1"
)
expect
(
results_list
.
all
(
'p'
)[
0
]).
to
have_content
(
"issue_1"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment