Merge branch 'qa/issue-boards-e2e-tests' into 'master'
Backport of EE MR See merge request gitlab-org/gitlab-ce!31903
This commit is contained in:
commit
9f6ff5dca2
|
@ -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"
|
||||||
|
|
|
@ -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 />
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.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",
|
||||||
|
|
|
@ -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
|
||||||
{
|
{
|
||||||
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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue