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
Boxiang Sun
gitlab-ce
Commits
18607d6c
Commit
18607d6c
authored
Oct 06, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added tests
parent
e6fa8a3d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
300 additions
and
3 deletions
+300
-3
app/assets/javascripts/boards/filters/due_date_filters.js.es6
...assets/javascripts/boards/filters/due_date_filters.js.es6
+1
-1
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+1
-1
app/views/projects/boards/components/sidebar/_assignee.html.haml
...ws/projects/boards/components/sidebar/_assignee.html.haml
+1
-1
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+297
-0
No files found.
app/assets/javascripts/boards/filters/due_date_filters.js.es6
View file @
18607d6c
Vue.filter('due-date', (value) => {
const date = new Date(value
.replace(new RegExp('-', 'g'), ',')
);
const date = new Date(value);
return $.datepicker.formatDate('M d, yy', date);
});
app/assets/javascripts/users_select.js
View file @
18607d6c
...
...
@@ -48,7 +48,7 @@
$block
.
on
(
'
click
'
,
'
.js-assign-yourself
'
,
function
(
e
)
{
e
.
preventDefault
();
if
(
$dropdown
.
hasClass
(
'
js-issue-board-
assignee
'
))
{
if
(
$dropdown
.
hasClass
(
'
js-issue-board-
sidebar
'
))
{
Vue
.
set
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
,
'
assignee
'
,
new
ListUser
({
id
:
_this
.
currentUser
.
id
,
username
:
_this
.
currentUser
.
username
,
...
...
app/views/projects/boards/components/sidebar/_assignee.html.haml
View file @
18607d6c
...
...
@@ -28,7 +28,7 @@
":value"
=>
"issue.assignee.id"
,
"v-if"
=>
"issue.assignee"
}
.dropdown
%button
.dropdown-menu-toggle.js-user-search.js-author-search.js-issue-board-sidebar
{
data:
{
toggle:
"dropdown"
,
field_name:
"issue[assignee_id]"
,
first_user:
(
current_user
.
username
if
current_user
),
current_user:
"true"
,
project_id:
@project
.
id
,
field_name:
"issue[assignee_id]"
,
null_user:
"true"
},
%button
.dropdown-menu-toggle.js-user-search.js-author-search.js-issue-board-sidebar
{
data:
{
toggle:
"dropdown"
,
field_name:
"issue[assignee_id]"
,
first_user:
(
current_user
.
username
if
current_user
),
current_user:
"true"
,
project_id:
@project
.
id
,
null_user:
"true"
},
":data-issuable-id"
=>
"issue.id"
,
":data-issue-update"
=>
"'#{namespace_project_issues_path(@project.namespace, @project)}/' + issue.id + '.json'"
}
Select assignee
...
...
spec/features/boards/sidebar_spec.rb
0 → 100644
View file @
18607d6c
require
'rails_helper'
describe
'Issue Boards'
,
feature:
true
,
js:
true
do
include
WaitForAjax
include
WaitForVueResource
let
(
:project
)
{
create
(
:project_with_board
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
let!
(
:label
)
{
create
(
:label
,
project:
project
)
}
let!
(
:label2
)
{
create
(
:label
,
project:
project
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:issue2
)
{
create
(
:labeled_issue
,
project:
project
,
assignee:
user
,
milestone:
milestone
,
labels:
[
label
])
}
let!
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
login_as
(
user
)
visit
namespace_project_board_path
(
project
.
namespace
,
project
)
wait_for_vue_resource
end
it
'shows sidebar when clicking issue'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
expect
(
page
).
to
have_selector
(
'.issue-boards-sidebar'
)
end
it
'closes sidebar when clicking issue'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
expect
(
page
).
to
have_selector
(
'.issue-boards-sidebar'
)
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
expect
(
page
).
not_to
have_selector
(
'.issue-boards-sidebar'
)
end
it
'closes sidebar when clicking close button'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
expect
(
page
).
to
have_selector
(
'.issue-boards-sidebar'
)
find
(
'.gutter-toggle'
).
click
expect
(
page
).
not_to
have_selector
(
'.issue-boards-sidebar'
)
end
it
'shows issue details when sidebar is open'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.issue-boards-sidebar'
)
do
expect
(
page
).
to
have_content
(
issue
.
title
)
expect
(
page
).
to
have_content
(
issue
.
to_reference
)
end
end
context
'assignee'
do
it
'updates the issues assignee'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.assignee'
)
do
click_link
'Edit'
wait_for_ajax
page
.
within
(
'.dropdown-menu-user'
)
do
click_link
user
.
name
wait_for_vue_resource
end
expect
(
page
).
to
have_content
(
user
.
name
)
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
first
(
'.card'
))
do
expect
(
page
).
to
have_selector
(
'.avatar'
)
end
end
end
it
'removes the assignee'
do
page
.
within
(
first
(
'.board'
))
do
find
(
'.card:nth-child(2)'
).
click
end
page
.
within
(
'.assignee'
)
do
click_link
'Edit'
wait_for_ajax
page
.
within
(
'.dropdown-menu-user'
)
do
click_link
'Unassigned'
wait_for_vue_resource
end
expect
(
page
).
to
have_content
(
'No assignee'
)
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
find
(
'.card:nth-child(2)'
))
do
expect
(
page
).
not_to
have_selector
(
'.avatar'
)
end
end
end
it
'assignees to current user'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.assignee'
)
do
click_link
'assign yourself'
wait_for_vue_resource
expect
(
page
).
to
have_content
(
user
.
name
)
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
first
(
'.card'
))
do
expect
(
page
).
to
have_selector
(
'.avatar'
)
end
end
end
end
context
'milestone'
do
it
'adds a milestone'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.milestone'
)
do
click_link
'Edit'
wait_for_ajax
click_link
milestone
.
title
wait_for_vue_resource
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_content
(
milestone
.
title
)
end
end
end
it
'removes a milestone'
do
page
.
within
(
first
(
'.board'
))
do
find
(
'.card:nth-child(2)'
).
click
end
page
.
within
(
'.milestone'
)
do
click_link
'Edit'
wait_for_ajax
click_link
"No Milestone"
wait_for_vue_resource
page
.
within
(
'.value'
)
do
expect
(
page
).
not_to
have_content
(
milestone
.
title
)
end
end
end
end
context
'due date'
do
it
'updates due date'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.due_date'
)
do
click_link
'Edit'
click_link
Date
.
today
.
day
wait_for_vue_resource
expect
(
page
).
to
have_content
(
Date
.
today
.
to_s
(
:medium
))
end
end
end
context
'labels'
do
it
'adds a single label'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.labels'
)
do
click_link
'Edit'
wait_for_ajax
click_link
label
.
title
wait_for_vue_resource
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.label'
,
count:
1
)
expect
(
page
).
to
have_content
(
label
.
title
)
end
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
first
(
'.card'
))
do
expect
(
page
).
to
have_selector
(
'.label'
,
count:
1
)
expect
(
page
).
to
have_content
(
label
.
title
)
end
end
end
it
'adds a multiple labels'
do
page
.
within
(
first
(
'.board'
))
do
first
(
'.card'
).
click
end
page
.
within
(
'.labels'
)
do
click_link
'Edit'
wait_for_ajax
click_link
label
.
title
click_link
label2
.
title
wait_for_vue_resource
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.label'
,
count:
2
)
expect
(
page
).
to
have_content
(
label
.
title
)
expect
(
page
).
to
have_content
(
label2
.
title
)
end
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
first
(
'.card'
))
do
expect
(
page
).
to
have_selector
(
'.label'
,
count:
2
)
expect
(
page
).
to
have_content
(
label
.
title
)
expect
(
page
).
to
have_content
(
label2
.
title
)
end
end
end
it
'removes a label'
do
page
.
within
(
first
(
'.board'
))
do
find
(
'.card:nth-child(2)'
).
click
end
page
.
within
(
'.labels'
)
do
click_link
'Edit'
wait_for_ajax
click_link
label
.
title
wait_for_vue_resource
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.label'
,
count:
0
)
expect
(
page
).
not_to
have_content
(
label
.
title
)
end
end
page
.
within
(
first
(
'.board'
))
do
page
.
within
(
find
(
'.card:nth-child(2)'
))
do
expect
(
page
).
not_to
have_selector
(
'.label'
,
count:
1
)
expect
(
page
).
not_to
have_content
(
label
.
title
)
end
end
end
end
end
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