Commit 5f0c1a4c authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch '217250-fix-parent-child-pipeline-specs' into 'master'

Fix parent child pipeline relationship specs

See merge request gitlab-org/gitlab!32264
parents bb902428 60afb61d
...@@ -29,10 +29,12 @@ module QA ...@@ -29,10 +29,12 @@ module QA
view_pipelines view_pipelines
Page::Project::Pipeline::Show.perform do |parent_pipeline| Page::Project::Pipeline::Show.perform do |parent_pipeline|
parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_passed
parent_pipeline.retry_on_exception(sleep_interval: 1.0) do
parent_pipeline.click_linked_job(project.name)
end
expect(parent_pipeline).to have_job("child_job") expect(parent_pipeline).to have_job("child_job")
expect(parent_pipeline).to have_passed
end end
end end
...@@ -41,10 +43,12 @@ module QA ...@@ -41,10 +43,12 @@ module QA
view_pipelines view_pipelines
Page::Project::Pipeline::Show.perform do |parent_pipeline| Page::Project::Pipeline::Show.perform do |parent_pipeline|
parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_failed
parent_pipeline.retry_on_exception(sleep_interval: 1.0) do
parent_pipeline.click_linked_job(project.name)
end
expect(parent_pipeline).to have_job("child_job") expect(parent_pipeline).to have_job("child_job")
expect(parent_pipeline).to have_failed
end end
end end
......
...@@ -29,10 +29,12 @@ module QA ...@@ -29,10 +29,12 @@ module QA
view_pipelines view_pipelines
Page::Project::Pipeline::Show.perform do |parent_pipeline| Page::Project::Pipeline::Show.perform do |parent_pipeline|
parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_passed
parent_pipeline.retry_on_exception(reload: true, sleep_interval: 1.0) do
parent_pipeline.click_linked_job(project.name)
end
expect(parent_pipeline).to have_job("child_job") expect(parent_pipeline).to have_job("child_job")
expect(parent_pipeline).to have_passed
end end
end end
...@@ -41,10 +43,12 @@ module QA ...@@ -41,10 +43,12 @@ module QA
view_pipelines view_pipelines
Page::Project::Pipeline::Show.perform do |parent_pipeline| Page::Project::Pipeline::Show.perform do |parent_pipeline|
parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_passed
parent_pipeline.retry_on_exception(reload: true, sleep_interval: 1.0) do
parent_pipeline.click_linked_job(project.name)
end
expect(parent_pipeline).to have_job("child_job") expect(parent_pipeline).to have_job("child_job")
expect(parent_pipeline).to have_passed
end end
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