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
066079c5
Commit
066079c5
authored
Aug 16, 2019
by
Aleksandr Soborov
Committed by
Tanya Pazitny
Aug 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update selectors and page object to fix Secure test
parent
49b9200f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
ee/app/assets/javascripts/dependencies/components/app.vue
ee/app/assets/javascripts/dependencies/components/app.vue
+7
-2
qa/qa/ee/page/project/secure/dependency_list.rb
qa/qa/ee/page/project/secure/dependency_list.rb
+3
-2
No files found.
ee/app/assets/javascripts/dependencies/components/app.vue
View file @
066079c5
...
...
@@ -82,6 +82,9 @@ export default {
isTabDisabled
(
namespace
)
{
return
this
.
totals
[
namespace
]
<=
0
;
},
qaCountSelector
(
label
)
{
return
`dependency_list_
${
label
.
toLowerCase
().
replace
(
'
'
,
'
_
'
)}
_count`
;
},
},
};
</
script
>
...
...
@@ -123,7 +126,9 @@ export default {
>
<template
v-slot:title
>
{{
listType
.
label
}}
<gl-badge
pill
>
{{
totals
[
listType
.
namespace
]
}}
</gl-badge>
<gl-badge
pill
:data-qa-selector=
"qaCountSelector(listType.label)"
>
{{
totals
[
listType
.
namespace
]
}}
</gl-badge>
</
template
>
<paginated-dependencies-table
:namespace=
"listType.namespace"
/>
</gl-tab>
...
...
@@ -139,7 +144,7 @@ export default {
<div
class=
"d-sm-flex justify-content-between align-items-baseline my-2"
>
<h3
class=
"h5"
>
{{
__
(
'
Dependencies
'
)
}}
<gl-badge
v-if=
"pageInfo.total"
pill
data-qa-selector=
"dependency_list_total_co
nte
nt"
>
{{
<gl-badge
v-if=
"pageInfo.total"
pill
data-qa-selector=
"dependency_list_total_co
u
nt"
>
{{
pageInfo
.
total
}}
</gl-badge>
</h3>
...
...
qa/qa/ee/page/project/secure/dependency_list.rb
View file @
066079c5
...
...
@@ -6,11 +6,12 @@ module QA
module
Project::Secure
class
DependencyList
<
QA
::
Page
::
Base
view
'ee/app/assets/javascripts/dependencies/components/app.vue'
do
element
:dependency_list_total_content
element
:dependency_list_total_count
element
:dependency_list_all_count
,
"dependency_list_${label.toLowerCase().replace(' ', '_')"
# rubocop:disable QA/ElementWithPattern
end
def
has_dependency_count_of?
(
expected
)
find_element
(
:dependency_list_
total_conte
nt
).
has_content?
(
expected
)
find_element
(
:dependency_list_
all_cou
nt
).
has_content?
(
expected
)
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