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
f684de50
Commit
f684de50
authored
Jan 06, 2020
by
Jennifer Louie
Committed by
Walmyr Lima e Silva Filho
Jan 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add retries to performance_bar_spec E2E test assertion methods
parent
720f7648
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
9 deletions
+20
-9
app/assets/javascripts/performance_bar/components/detailed_metric.vue
...avascripts/performance_bar/components/detailed_metric.vue
+2
-1
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
...cripts/performance_bar/components/performance_bar_app.vue
+5
-1
app/assets/javascripts/performance_bar/components/request_selector.vue
...vascripts/performance_bar/components/request_selector.vue
+2
-2
qa/qa/page/layout/performance_bar.rb
qa/qa/page/layout/performance_bar.rb
+11
-5
No files found.
app/assets/javascripts/performance_bar/components/detailed_metric.vue
View file @
f684de50
...
@@ -59,7 +59,8 @@ export default {
...
@@ -59,7 +59,8 @@ export default {
<div
<div
v-if=
"currentRequest.details && metricDetails"
v-if=
"currentRequest.details && metricDetails"
:id=
"`peek-view-$
{metric}`"
:id=
"`peek-view-$
{metric}`"
class="view qa-performance-bar-detailed-metric"
class="view"
data-qa-selector="detailed_metric_content"
>
>
<button
<button
:data-target=
"`#modal-peek-$
{metric}-details`"
:data-target=
"`#modal-peek-$
{metric}-details`"
...
...
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
View file @
f684de50
...
@@ -107,7 +107,11 @@ export default {
...
@@ -107,7 +107,11 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
id=
"js-peek"
:class=
"env"
>
<div
id=
"js-peek"
:class=
"env"
>
<div
v-if=
"currentRequest"
class=
"d-flex container-fluid container-limited qa-performance-bar"
>
<div
v-if=
"currentRequest"
class=
"d-flex container-fluid container-limited"
data-qa-selector=
"performance_bar"
>
<div
id=
"peek-view-host"
class=
"view"
>
<div
id=
"peek-view-host"
class=
"view"
>
<span
<span
v-if=
"hasHost"
v-if=
"hasHost"
...
...
app/assets/javascripts/performance_bar/components/request_selector.vue
View file @
f684de50
...
@@ -45,13 +45,13 @@ export default {
...
@@ -45,13 +45,13 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
id=
"peek-request-selector"
>
<div
id=
"peek-request-selector"
data-qa-selector=
"request_dropdown"
>
<select
v-model=
"currentRequestId"
>
<select
v-model=
"currentRequestId"
>
<option
<option
v-for=
"request in requests"
v-for=
"request in requests"
:key=
"request.id"
:key=
"request.id"
:value=
"request.id"
:value=
"request.id"
class=
"qa-performance-bar-request
"
data-qa-selector=
"request_dropdown_option
"
>
>
{{
request
.
truncatedUrl
}}
{{
request
.
truncatedUrl
}}
<span
v-if=
"request.hasWarnings"
>
(!)
</span>
<span
v-if=
"request.hasWarnings"
>
(!)
</span>
...
...
qa/qa/page/layout/performance_bar.rb
View file @
f684de50
...
@@ -9,11 +9,12 @@ module QA
...
@@ -9,11 +9,12 @@ module QA
end
end
view
'app/assets/javascripts/performance_bar/components/detailed_metric.vue'
do
view
'app/assets/javascripts/performance_bar/components/detailed_metric.vue'
do
element
:
performance_bar_detailed_metric
element
:
detailed_metric_content
end
end
view
'app/assets/javascripts/performance_bar/components/request_selector.vue'
do
view
'app/assets/javascripts/performance_bar/components/request_selector.vue'
do
element
:performance_bar_request
element
:request_dropdown_option
element
:request_dropdown
end
end
def
has_performance_bar?
def
has_performance_bar?
...
@@ -21,13 +22,18 @@ module QA
...
@@ -21,13 +22,18 @@ module QA
end
end
def
has_detailed_metrics?
def
has_detailed_metrics?
all_elements
(
:performance_bar_detailed_metric
).
all?
do
|
metric
|
retry_until
(
sleep_interval:
1
)
do
all_elements
(
:detailed_metric_content
).
all?
do
|
metric
|
metric
.
has_text?
(
%r{
\d
+}
)
metric
.
has_text?
(
%r{
\d
+}
)
end
end
end
end
end
def
has_request_for?
(
path
)
def
has_request_for?
(
path
)
has_element?
(
:performance_bar_request
,
text:
path
)
click_element
(
:request_dropdown
)
retry_until
(
sleep_interval:
1
)
do
has_element?
(
:request_dropdown_option
,
text:
path
)
end
end
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