Commit e3dfc928 authored by Dan Davison's avatar Dan Davison

Merge branch 'fix-multi-project-pipeline-spec' into 'master'

Fix child pipeline button click

See merge request gitlab-org/gitlab!41391
parents 8b0f6331 3f8dd584
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
:class="`js-pipeline-expand-${pipeline.id} ${expandButtonPosition}`" :class="`js-pipeline-expand-${pipeline.id} ${expandButtonPosition}`"
:icon="expandedIcon" :icon="expandedIcon"
data-testid="expandPipelineButton" data-testid="expandPipelineButton"
data-qa-selector="linked_pipeline_button" data-qa-selector="expand_pipeline_button"
@click="onClickLinkedPipeline" @click="onClickLinkedPipeline"
/> />
</div> </div>
......
...@@ -21,7 +21,7 @@ module QA ...@@ -21,7 +21,7 @@ module QA
end end
view 'app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue' do view 'app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue' do
element :linked_pipeline_button element :expand_pipeline_button
element :child_pipeline element :child_pipeline
end end
...@@ -69,8 +69,10 @@ module QA ...@@ -69,8 +69,10 @@ module QA
click_element(:job_link, text: job_name) click_element(:job_link, text: job_name)
end end
def click_linked_job(project_name) def expand_child_pipeline
click_element(:linked_pipeline_button, text: /#{project_name}/) within_element(:child_pipeline) do
click_element(:expand_pipeline_button)
end
end end
def click_on_first_job def click_on_first_job
......
...@@ -75,7 +75,7 @@ module QA ...@@ -75,7 +75,7 @@ module QA
runner.remove_via_api! runner.remove_via_api!
end end
it 'creates a multi-project pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/560', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/243797', type: :investigating } do it 'creates a multi-project pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/560' do
Page::MergeRequest::Show.perform do |show| Page::MergeRequest::Show.perform do |show|
pipeline_passed = show.retry_until(reload: true, max_attempts: 20, sleep_interval: 6) do pipeline_passed = show.retry_until(reload: true, max_attempts: 20, sleep_interval: 6) do
show.has_content?(/Pipeline #\d+ passed/) show.has_content?(/Pipeline #\d+ passed/)
...@@ -90,7 +90,7 @@ module QA ...@@ -90,7 +90,7 @@ module QA
expect(show).to have_passed expect(show).to have_passed
expect(show).to have_no_job("downstream_job") expect(show).to have_no_job("downstream_job")
show.click_linked_job(downstream_project_name) show.expand_child_pipeline
expect(show).to have_job("downstream_job") expect(show).to have_job("downstream_job")
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment