BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
31c04b56
Commit
31c04b56
authored
Jan 21, 2017
by
Jacob Schatz
Committed by
James Lopez
Jan 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'filter-assigned-to-me' into 'master'
Added current user filter to assignee dropdown Closes #26959 and #26882 See merge request !8653
parent
7d7e3dfa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+4
-0
dropdown_assignee_spec.rb
...features/issues/filtered_search/dropdown_assignee_spec.rb
+16
-0
No files found.
app/views/shared/issuable/_search_bar.html.haml
View file @
31c04b56
...
...
@@ -47,6 +47,10 @@
%li
.filter-dropdown-item
{
'data-value'
=>
'none'
}
%button
.btn.btn-link
No Assignee
-
if
current_user
%li
.filter-dropdown-item
{
'data-value'
=>
current_user
.
to_reference
}
%button
.btn.btn-link
Assigned to me
%li
.divider
%ul
.filter-dropdown
{
'data-dynamic'
=>
true
,
'data-dropdown'
=>
true
}
%li
.filter-dropdown-item
...
...
spec/features/issues/filtered_search/dropdown_assignee_spec.rb
View file @
31c04b56
...
...
@@ -43,6 +43,14 @@ describe 'Dropdown assignee', js: true, feature: true do
expect
(
page
).
to
have_css
(
js_dropdown_assignee
,
visible:
true
)
end
it
'shows assigned to me link'
do
filtered_search
.
set
(
'assignee:'
)
page
.
within
js_dropdown_assignee
do
expect
(
page
).
to
have_content
(
'Assigned to me'
)
end
end
it
'closes when the search bar is unfocused'
do
find
(
'body'
).
click
()
...
...
@@ -121,6 +129,14 @@ describe 'Dropdown assignee', js: true, feature: true do
filtered_search
.
set
(
'assignee:'
)
end
it
'filters by current user'
do
page
.
within
js_dropdown_assignee
do
click_button
'Assigned to me'
end
expect
(
filtered_search
.
value
).
to
eq
(
"assignee:
#{
user
.
to_reference
}
"
)
end
it
'fills in the assignee username when the assignee has not been filtered'
do
click_assignee
(
user_jacob
.
name
)
...
...
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