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
7be97553
Commit
7be97553
authored
Dec 13, 2021
by
Désirée Chevalier
Committed by
Ramya Authappan
Dec 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update e2e tests for vue_issues_list ff
parent
3c6b6736
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
25 deletions
+52
-25
app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
...ue_shared/issuable/list/components/issuable_list_root.vue
+3
-0
app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
...pts/vue_shared/issuable/list/components/issuable_tabs.vue
+3
-1
ee/app/assets/javascripts/issues_list/components/issue_card_time_info.vue
...vascripts/issues_list/components/issue_card_time_info.vue
+5
-1
qa/qa/ee/page/project/issue/index.rb
qa/qa/ee/page/project/issue/index.rb
+3
-8
qa/qa/page/project/issue/index.rb
qa/qa/page/project/issue/index.rb
+15
-9
qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
...ecs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+16
-5
qa/qa/specs/features/ee/browser_ui/geo/attachment_replication_spec.rb
...features/ee/browser_ui/geo/attachment_replication_spec.rb
+7
-1
No files found.
app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
View file @
7be97553
...
@@ -272,6 +272,7 @@ export default {
...
@@ -272,6 +272,7 @@ export default {
:show-checkbox=
"showBulkEditSidebar"
:show-checkbox=
"showBulkEditSidebar"
:checkbox-checked=
"allIssuablesChecked"
:checkbox-checked=
"allIssuablesChecked"
class=
"gl-flex-grow-1 gl-border-t-none row-content-block"
class=
"gl-flex-grow-1 gl-border-t-none row-content-block"
data-qa-selector=
"issuable_search_container"
@
checked-input=
"handleAllIssuablesCheckedInput"
@
checked-input=
"handleAllIssuablesCheckedInput"
@
onFilter=
"$emit('filter', $event)"
@
onFilter=
"$emit('filter', $event)"
@
onSort=
"$emit('sort', $event)"
@
onSort=
"$emit('sort', $event)"
...
@@ -302,6 +303,8 @@ export default {
...
@@ -302,6 +303,8 @@ export default {
v-for=
"issuable in issuables"
v-for=
"issuable in issuables"
:key=
"issuableId(issuable)"
:key=
"issuableId(issuable)"
:class=
"
{ 'gl-cursor-grab': isManualOrdering }"
:class=
"
{ 'gl-cursor-grab': isManualOrdering }"
data-qa-selector="issuable_container"
:data-qa-issuable-title="issuable.title"
:issuable-symbol="issuableSymbol"
:issuable-symbol="issuableSymbol"
:issuable="issuable"
:issuable="issuable"
:enable-label-permalinks="enableLabelPermalinks"
:enable-label-permalinks="enableLabelPermalinks"
...
...
app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
View file @
7be97553
...
@@ -46,7 +46,9 @@ export default {
...
@@ -46,7 +46,9 @@ export default {
@
click=
"$emit('click', tab.name)"
@
click=
"$emit('click', tab.name)"
>
>
<template
#title
>
<template
#title
>
<span
:title=
"tab.titleTooltip"
>
{{
tab
.
title
}}
</span>
<span
:title=
"tab.titleTooltip"
:data-qa-selector=
"`$
{tab.name}_issuables_tab`">
{{
tab
.
title
}}
</span>
<gl-badge
<gl-badge
v-if=
"tabCounts && isTabCountNumeric(tab)"
v-if=
"tabCounts && isTabCountNumeric(tab)"
variant=
"muted"
variant=
"muted"
...
...
ee/app/assets/javascripts/issues_list/components/issue_card_time_info.vue
View file @
7be97553
...
@@ -26,7 +26,11 @@ export default {
...
@@ -26,7 +26,11 @@ export default {
<
template
>
<
template
>
<issue-card-time-info
:issue=
"issue"
>
<issue-card-time-info
:issue=
"issue"
>
<weight-count
class=
"issuable-weight gl-mr-3"
:weight=
"issue.weight"
/>
<weight-count
class=
"issuable-weight gl-mr-3"
:weight=
"issue.weight"
data-qa-selector=
"issuable_weight_content"
/>
<issue-health-status
v-if=
"showHealthStatus"
:health-status=
"issue.healthStatus"
/>
<issue-health-status
v-if=
"showHealthStatus"
:health-status=
"issue.healthStatus"
/>
</issue-card-time-info>
</issue-card-time-info>
</
template
>
</
template
>
qa/qa/ee/page/project/issue/index.rb
View file @
7be97553
...
@@ -12,12 +12,7 @@ module QA
...
@@ -12,12 +12,7 @@ module QA
super
super
base
.
class_eval
do
base
.
class_eval
do
view
'app/views/shared/issuable/_search_bar.html.haml'
do
view
'ee/app/assets/javascripts/issues_list/components/issue_card_time_info.vue'
do
element
:issue_filter_form
,
/form_tag.+class: 'filter-form /
# rubocop:disable QA/ElementWithPattern
element
:issue_filter_input
,
/%input.form-control.filtered-search/
# rubocop:disable QA/ElementWithPattern
end
view
'app/assets/javascripts/issues_list/components/issuable.vue'
do
element
:issuable_weight_content
element
:issuable_weight_content
end
end
end
end
...
@@ -38,8 +33,8 @@ module QA
...
@@ -38,8 +33,8 @@ module QA
end
end
def
filter_by_title
(
title
)
def
filter_by_title
(
title
)
page
.
within
(
'form.filter-form'
)
do
within_element
(
:issuable_search_container
)
do
fill_in
class:
'
filtered-search
'
,
with:
title
fill_in
class:
'
gl-filtered-search-term-input
'
,
with:
title
end
end
end
end
end
end
...
...
qa/qa/page/project/issue/index.rb
View file @
7be97553
...
@@ -5,9 +5,9 @@ module QA
...
@@ -5,9 +5,9 @@ module QA
module
Project
module
Project
module
Issue
module
Issue
class
Index
<
Page
::
Base
class
Index
<
Page
::
Base
view
'app/assets/javascripts/
issues_list/components/issuable
.vue'
do
view
'app/assets/javascripts/
vue_shared/issuable/list/components/issuable_list_root
.vue'
do
element
:issue_container
element
:issu
abl
e_container
element
:issu
e_link
element
:issu
able_search_container
end
end
view
'app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue'
do
view
'app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue'
do
...
@@ -25,8 +25,8 @@ module QA
...
@@ -25,8 +25,8 @@ module QA
element
:import_issues_dropdown
element
:import_issues_dropdown
end
end
view
'app/
views/shared/issuable/_nav.html.haml
'
do
view
'app/
assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
'
do
element
:closed_issu
es_link
element
:closed_issu
ables_tab
,
':data-qa-selector="`${tab.name}_issuables_tab`"'
# rubocop:disable QA/ElementWithPattern
end
end
def
avatar_counter
def
avatar_counter
...
@@ -37,8 +37,8 @@ module QA
...
@@ -37,8 +37,8 @@ module QA
click_link
(
title
)
click_link
(
title
)
end
end
def
click_closed_issues_
link
def
click_closed_issues_
tab
click_element
:closed_issues_link
click_element
(
:closed_issuables_tab
)
end
end
def
click_export_as_csv_button
def
click_export_as_csv_button
...
@@ -73,11 +73,17 @@ module QA
...
@@ -73,11 +73,17 @@ module QA
end
end
def
has_issue?
(
issue
)
def
has_issue?
(
issue
)
has_element?
:issu
e_container
,
issu
e_title:
issue
.
title
has_element?
:issu
able_container
,
issuabl
e_title:
issue
.
title
end
end
def
has_no_issue?
(
issue
)
def
has_no_issue?
(
issue
)
has_no_element?
:issue_container
,
issue_title:
issue
.
title
has_no_element?
:issuable_container
,
issuable_title:
issue
.
title
end
def
wait_for_vue_issues_list_ff
Support
::
Retrier
.
retry_until
(
max_duration:
60
,
reload_page:
page
,
retry_on_exception:
true
,
sleep_interval:
5
)
do
find_element
(
:closed_issuables_tab
)
end
end
end
end
end
end
end
...
...
qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
View file @
7be97553
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
RSpec
.
describe
'Plan'
,
:smoke
do
# TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
RSpec
.
describe
'Plan'
,
:smoke
,
:requires_admin
do
describe
'Issue creation'
do
describe
'Issue creation'
do
let
(
:closed_issue
)
{
Resource
::
Issue
.
fabricate_via_api!
}
let
(
:project
)
{
Resource
::
Project
.
fabricate_via_api!
}
let
(
:closed_issue
)
{
Resource
::
Issue
.
fabricate_via_api!
{
|
issue
|
issue
.
project
=
project
}
}
before
do
before
do
Runtime
::
Feature
.
enable
(
:vue_issues_list
,
group:
project
.
group
)
Flow
::
Login
.
sign_in
Flow
::
Login
.
sign_in
end
end
it
'creates an issue'
,
:mobile
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1185'
do
it
'creates an issue'
,
:mobile
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1185'
do
issue
=
Resource
::
Issue
.
fabricate_via_browser_ui!
issue
=
Resource
::
Issue
.
fabricate_via_browser_ui!
{
|
issue
|
issue
.
project
=
project
}
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
# TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
Page
::
Project
::
Issue
::
Index
.
perform
(
&
:wait_for_vue_issues_list_ff
)
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
expect
(
index
).
to
have_issue
(
issue
)
expect
(
index
).
to
have_issue
(
issue
)
end
end
...
@@ -29,10 +36,14 @@ module QA
...
@@ -29,10 +36,14 @@ module QA
end
end
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
# TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
Page
::
Project
::
Issue
::
Index
.
perform
(
&
:wait_for_vue_issues_list_ff
)
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
expect
(
index
).
not_to
have_issue
(
closed_issue
)
expect
(
index
).
not_to
have_issue
(
closed_issue
)
index
.
click_closed_issues_
link
index
.
click_closed_issues_
tab
expect
(
index
).
to
have_issue
(
closed_issue
)
expect
(
index
).
to
have_issue
(
closed_issue
)
end
end
...
@@ -45,7 +56,7 @@ module QA
...
@@ -45,7 +56,7 @@ module QA
end
end
before
do
before
do
Resource
::
Issue
.
fabricate_via_api!
.
visit!
Resource
::
Issue
.
fabricate_via_api!
{
|
issue
|
issue
.
project
=
project
}
.
visit!
end
end
# The following example is excluded from running in `review-qa-smoke` job
# The following example is excluded from running in `review-qa-smoke` job
...
...
qa/qa/specs/features/ee/browser_ui/geo/attachment_replication_spec.rb
View file @
7be97553
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
RSpec
.
describe
'Geo'
,
:orchestrated
,
:geo
do
# TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
RSpec
.
describe
'Geo'
,
:orchestrated
,
:geo
,
:requires_admin
do
describe
'GitLab Geo attachment replication'
do
describe
'GitLab Geo attachment replication'
do
let
(
:file_to_attach
)
{
File
.
absolute_path
(
File
.
join
(
'qa'
,
'fixtures'
,
'designs'
,
'banana_sample.gif'
))
}
let
(
:file_to_attach
)
{
File
.
absolute_path
(
File
.
join
(
'qa'
,
'fixtures'
,
'designs'
,
'banana_sample.gif'
))
}
...
@@ -12,6 +13,8 @@ module QA
...
@@ -12,6 +13,8 @@ module QA
project
.
description
=
'project for adding issues'
project
.
description
=
'project for adding issues'
end
end
Runtime
::
Feature
.
enable
(
:vue_issues_list
,
group:
@project
.
group
)
@issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
@issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
.
title
=
'My geo issue'
issue
.
title
=
'My geo issue'
issue
.
project
=
@project
issue
.
project
=
@project
...
@@ -44,6 +47,9 @@ module QA
...
@@ -44,6 +47,9 @@ module QA
Page
::
Project
::
Menu
.
act
{
click_issues
}
Page
::
Project
::
Menu
.
act
{
click_issues
}
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
# TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
index
.
wait_for_vue_issues_list_ff
index
.
wait_for_issue_replication
(
@issue
)
index
.
wait_for_issue_replication
(
@issue
)
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