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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9f6ff5dc
Commit
9f6ff5dc
authored
Aug 22, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'qa/issue-boards-e2e-tests' into 'master'
Backport of EE MR See merge request gitlab-org/gitlab-ce!31903
parents
49e3e042
12621985
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
5 deletions
+11
-5
app/assets/javascripts/boards/components/board_card.vue
app/assets/javascripts/boards/components/board_card.vue
+1
-0
app/assets/javascripts/boards/components/board_list.vue
app/assets/javascripts/boards/components/board_list.vue
+1
-0
app/assets/javascripts/boards/components/boards_selector.vue
app/assets/javascripts/boards/components/boards_selector.vue
+1
-0
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+1
-1
app/views/shared/boards/components/_board.html.haml
app/views/shared/boards/components/_board.html.haml
+2
-2
qa/qa/resource/issue.rb
qa/qa/resource/issue.rb
+4
-2
qa/qa/resource/label.rb
qa/qa/resource/label.rb
+1
-0
No files found.
app/assets/javascripts/boards/components/board_card.vue
View file @
9f6ff5dc
...
@@ -83,6 +83,7 @@ export default {
...
@@ -83,6 +83,7 @@ export default {
}"
}"
:index="index"
:index="index"
:data-issue-id="issue.id"
:data-issue-id="issue.id"
data-qa-selector="board_card"
class="board-card p-3 rounded"
class="board-card p-3 rounded"
@mousedown="mouseDown"
@mousedown="mouseDown"
@mousemove="mouseMove"
@mousemove="mouseMove"
...
...
app/assets/javascripts/boards/components/board_list.vue
View file @
9f6ff5dc
...
@@ -227,6 +227,7 @@ export default {
...
@@ -227,6 +227,7 @@ export default {
<div
<div
:class=
"
{ 'd-none': !list.isExpanded, 'd-flex flex-column': list.isExpanded }"
:class=
"
{ 'd-none': !list.isExpanded, 'd-flex flex-column': list.isExpanded }"
class="board-list-component position-relative h-100"
class="board-list-component position-relative h-100"
data-qa-selector="board_list_cards_area"
>
>
<div
v-if=
"loading"
class=
"board-list-loading text-center"
:aria-label=
"__('Loading issues')"
>
<div
v-if=
"loading"
class=
"board-list-loading text-center"
:aria-label=
"__('Loading issues')"
>
<gl-loading-icon
/>
<gl-loading-icon
/>
...
...
app/assets/javascripts/boards/components/boards_selector.vue
View file @
9f6ff5dc
...
@@ -226,6 +226,7 @@ export default {
...
@@ -226,6 +226,7 @@ export default {
<div
class=
"boards-switcher js-boards-selector append-right-10"
>
<div
class=
"boards-switcher js-boards-selector append-right-10"
>
<span
class=
"boards-selector-wrapper js-boards-selector-wrapper"
>
<span
class=
"boards-selector-wrapper js-boards-selector-wrapper"
>
<gl-dropdown
<gl-dropdown
data-qa-selector=
"boards_dropdown"
toggle-class=
"dropdown-menu-toggle js-dropdown-toggle"
toggle-class=
"dropdown-menu-toggle js-dropdown-toggle"
menu-class=
"flex-column dropdown-extended-height"
menu-class=
"flex-column dropdown-extended-height"
:text=
"board.name"
:text=
"board.name"
...
...
app/views/shared/boards/_show.html.haml
View file @
9f6ff5dc
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#board-app
.boards-app.position-relative
{
"v-cloak"
=>
"true"
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
#board-app
.boards-app.position-relative
{
"v-cloak"
=>
"true"
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
=
render
'shared/issuable/search_bar'
,
type: :boards
,
board:
board
=
render
'shared/issuable/search_bar'
,
type: :boards
,
board:
board
.boards-list.w-100.py-3.px-2.text-nowrap
.boards-list.w-100.py-3.px-2.text-nowrap
{
data:
{
qa_selector:
"boards_list"
}
}
.boards-app-loading.w-100.text-center
{
"v-if"
=>
"loading"
}
.boards-app-loading.w-100.text-center
{
"v-if"
=>
"loading"
}
=
icon
(
"spinner spin 2x"
)
=
icon
(
"spinner spin 2x"
)
%board
{
"v-cloak"
=>
"true"
,
%board
{
"v-cloak"
=>
"true"
,
...
...
app/views/shared/boards/components/_board.html.haml
View file @
9f6ff5dc
.board.d-inline-block.h-100.px-2.align-top.ws-normal
{
":class"
=>
'
{
"is-draggable"
:
!
list
.
preset
,
"is-expandable"
:
list
.
isExpandable
,
"is-collapsed"
:
!
list
.
isExpanded
,
"board-type-assignee"
:
list
.
type
===
"assignee"
}
'
,
.board.d-inline-block.h-100.px-2.align-top.ws-normal
{
":class"
=>
'
{
"is-draggable"
:
!
list
.
preset
,
"is-expandable"
:
list
.
isExpandable
,
"is-collapsed"
:
!
list
.
isExpanded
,
"board-type-assignee"
:
list
.
type
===
"assignee"
}
'
,
":data-id"
=>
"list.id"
}
":data-id"
=>
"list.id"
,
data:
{
qa_selector:
"board_list"
}
}
.board-inner.d-flex.flex-column.position-relative.h-100.rounded
.board-inner.d-flex.flex-column.position-relative.h-100.rounded
%header
.board-header
{
":class"
=>
'
{
"has-border"
:
list
.
label
&&
list
.
label
.
color
,
"position-relative"
:
list
.
isExpanded
,
"position-absolute position-top-0 position-left-0 w-100 h-100"
:
!
list
.
isExpanded
}
'
,
":style"
=>
"{ borderTopColor: (list.label && list.label.color ? list.label.color : null) }"
}
%header
.board-header
{
":class"
=>
'
{
"has-border"
:
list
.
label
&&
list
.
label
.
color
,
"position-relative"
:
list
.
isExpanded
,
"position-absolute position-top-0 position-left-0 w-100 h-100"
:
!
list
.
isExpanded
}
'
,
":style"
=>
"{ borderTopColor: (list.label && list.label.color ? list.label.color : null) }"
,
data:
{
qa_selector:
"board_list_header"
}
}
%h3
.board-title.m-0.d-flex.js-board-handle
{
":class"
=>
'
{
"user-can-drag"
:
(
!
disabled
&&
!
list
.
preset
),
"border-bottom-0"
:
!
list
.
isExpanded
}
'
}
%h3
.board-title.m-0.d-flex.js-board-handle
{
":class"
=>
'
{
"user-can-drag"
:
(
!
disabled
&&
!
list
.
preset
),
"border-bottom-0"
:
!
list
.
isExpanded
}
'
}
.board-title-caret.no-drag
{
"v-if"
:
"list.isExpandable"
,
.board-title-caret.no-drag
{
"v-if"
:
"list.isExpandable"
,
...
...
qa/qa/resource/issue.rb
View file @
9f6ff5dc
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
QA
module
QA
module
Resource
module
Resource
class
Issue
<
Base
class
Issue
<
Base
attr_writer
:description
attr_writer
:description
,
:milestone
attribute
:project
do
attribute
:project
do
Project
.
fabricate!
do
|
resource
|
Project
.
fabricate!
do
|
resource
|
...
@@ -44,7 +44,9 @@ module QA
...
@@ -44,7 +44,9 @@ module QA
{
{
labels:
labels
,
labels:
labels
,
title:
title
title:
title
}
}.
tap
do
|
hash
|
hash
[
:milestone_id
]
=
@milestone
.
id
if
@milestone
end
end
end
end
end
end
end
...
...
qa/qa/resource/label.rb
View file @
9f6ff5dc
...
@@ -7,6 +7,7 @@ module QA
...
@@ -7,6 +7,7 @@ module QA
class
Label
<
Base
class
Label
<
Base
attr_accessor
:description
,
:color
attr_accessor
:description
,
:color
attribute
:id
attribute
:title
attribute
:title
attribute
:project
do
attribute
:project
do
...
...
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