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
ee6f1308
Commit
ee6f1308
authored
Mar 30, 2022
by
Tiffany Rea
Committed by
Mark Lapierre
Mar 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename child_pipeline to linked_pipeline
parent
173060d1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
19 deletions
+26
-19
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
...avascripts/pipelines/components/graph/linked_pipeline.vue
+2
-2
qa/qa/page/project/pipeline/show.rb
qa/qa/page/project/pipeline/show.rb
+20
-14
qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
...ne/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
+2
-2
qa/qa/specs/features/browser_ui/6_release/pipeline/multi-project_pipelines_spec.rb
...ser_ui/6_release/pipeline/multi-project_pipelines_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/6_release/.gitkeep
qa/qa/specs/features/ee/browser_ui/6_release/.gitkeep
+0
-0
qa/qa/support/matchers/have_matcher.rb
qa/qa/support/matchers/have_matcher.rb
+1
-0
No files found.
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
View file @
ee6f1308
...
...
@@ -133,7 +133,7 @@ export default {
class=
"gl-h-full gl-display-flex! gl-border-solid gl-border-gray-100 gl-border-1"
:class=
"flexDirection"
:title=
"tooltipText"
data-qa-selector=
"
child_pipeline
"
data-qa-selector=
"
linked_pipeline_container
"
@
mouseover=
"onDownstreamHovered"
@
mouseleave=
"onDownstreamHoverLeave"
>
...
...
@@ -171,7 +171,7 @@ export default {
:icon="expandedIcon"
:aria-label="__('Expand pipeline')"
data-testid="expand-pipeline-button"
data-qa-selector="expand_pipeline_button"
data-qa-selector="expand_
linked_
pipeline_button"
@click="onClickLinkedPipeline"
/>
</div>
...
...
qa/qa/page/project/pipeline/show.rb
View file @
ee6f1308
...
...
@@ -22,8 +22,8 @@ module QA
end
view
'app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue'
do
element
:expand_pipeline_button
element
:
child_pipeline
element
:expand_
linked_
pipeline_button
element
:
linked_pipeline_container
end
view
'app/assets/javascripts/reports/components/report_section.vue'
do
...
...
@@ -73,14 +73,18 @@ module QA
end
end
def
has_
chil
d_pipeline?
(
title:
nil
)
title
?
find_
child_pipeline_by_title
(
title
)
:
has_element?
(
:child_pipeline
)
def
has_
linke
d_pipeline?
(
title:
nil
)
title
?
find_
linked_pipeline_by_title
(
title
)
:
has_element?
(
:linked_pipeline_container
)
end
def
has_no_child_pipeline?
has_no_element?
(
:child_pipeline
)
alias_method
:has_child_pipeline?
,
:has_linked_pipeline?
def
has_no_linked_pipeline?
has_no_element?
(
:linked_pipeline_container
)
end
alias_method
:has_no_child_pipeline?
,
:has_no_linked_pipeline?
def
click_job
(
job_name
)
# Retry due to transient bug https://gitlab.com/gitlab-org/gitlab/-/issues/347126
QA
::
Support
::
Retrier
.
retry_on_exception
do
...
...
@@ -88,22 +92,24 @@ module QA
end
end
def
chil
d_pipelines
all_elements
(
:
child_pipeline
,
minimum:
1
)
def
linke
d_pipelines
all_elements
(
:
linked_pipeline_container
,
minimum:
1
)
end
def
find_
chil
d_pipeline_by_title
(
title
)
chil
d_pipelines
.
find
{
|
pipeline
|
pipeline
[
:title
].
include?
(
title
)
}
def
find_
linke
d_pipeline_by_title
(
title
)
linke
d_pipelines
.
find
{
|
pipeline
|
pipeline
[
:title
].
include?
(
title
)
}
end
def
expand_
chil
d_pipeline
(
title:
nil
)
child_pipeline
=
title
?
find_child_pipeline_by_title
(
title
)
:
chil
d_pipelines
.
first
def
expand_
linke
d_pipeline
(
title:
nil
)
linked_pipeline
=
title
?
find_linked_pipeline_by_title
(
title
)
:
linke
d_pipelines
.
first
within_element_by_index
(
:
child_pipeline
,
child_pipelines
.
index
(
chil
d_pipeline
))
do
click_element
(
:expand_pipeline_button
)
within_element_by_index
(
:
linked_pipeline_container
,
linked_pipelines
.
index
(
linke
d_pipeline
))
do
click_element
(
:expand_
linked_
pipeline_button
)
end
end
alias_method
:expand_child_pipeline
,
:expand_linked_pipeline
def
expand_license_report
within_element
(
:license_report_widget
)
do
click_element
(
:expand_report_button
)
...
...
qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
View file @
ee6f1308
...
...
@@ -44,8 +44,8 @@ module QA
it
'runs the pipeline with composed config'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348088'
do
Page
::
Project
::
Pipeline
::
Show
.
perform
do
|
parent_pipeline
|
Support
::
Waiter
.
wait_until
{
parent_pipeline
.
has_
chil
d_pipeline?
}
parent_pipeline
.
expand_
chil
d_pipeline
Support
::
Waiter
.
wait_until
{
parent_pipeline
.
has_
linke
d_pipeline?
}
parent_pipeline
.
expand_
linke
d_pipeline
parent_pipeline
.
click_job
(
'downstream_test'
)
end
...
...
qa/qa/specs/features/
ee/browser_ui/6_releas
e/multi-project_pipelines_spec.rb
→
qa/qa/specs/features/
browser_ui/6_release/pipelin
e/multi-project_pipelines_spec.rb
View file @
ee6f1308
...
...
@@ -48,7 +48,7 @@ module QA
expect
(
show
).
to
have_passed
expect
(
show
).
not_to
have_job
(
downstream_job_name
)
show
.
expand_
chil
d_pipeline
show
.
expand_
linke
d_pipeline
expect
(
show
).
to
have_job
(
downstream_job_name
)
end
...
...
qa/qa/specs/features/ee/browser_ui/6_release/.gitkeep
0 → 100644
View file @
ee6f1308
qa/qa/support/matchers/have_matcher.rb
View file @
ee6f1308
...
...
@@ -10,6 +10,7 @@ module QA
file_content
assignee
child_pipeline
linked_pipeline
content
design
file
...
...
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