diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:13 +0000 |
| commit | 41cb558299b483b44b45351730ee4c0e9fe4ca2c (patch) | |
| tree | 00688a9e40021c66195ad826ceddd9c19385cdcf /qa | |
| parent | 3d064c737e8448880e6180aeddc59000a01aa6a8 (diff) | |
| download | gitlab-ce-41cb558299b483b44b45351730ee4c0e9fe4ca2c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
3 files changed, 8 insertions, 4 deletions
diff --git a/qa/qa/page/component/ci_badge_link.rb b/qa/qa/page/component/ci_badge_link.rb index ef9bfa560ce..3db675c3a60 100644 --- a/qa/qa/page/component/ci_badge_link.rb +++ b/qa/qa/page/component/ci_badge_link.rb @@ -13,6 +13,10 @@ module QA timeout ? completed?(timeout: timeout) : completed? status_badge == status end + + # has_passed? => passed? + # has_failed? => failed? + alias_method :"has_#{status}?", :"#{status}?" end # e.g. def pending?; status_badge == 'pending'; end diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb index 9ff33698b0e..e71212bcb68 100644 --- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb @@ -32,7 +32,7 @@ module QA parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_job("child_job") - expect(parent_pipeline).to be_passed + expect(parent_pipeline).to have_passed end end @@ -44,7 +44,7 @@ module QA parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_job("child_job") - expect(parent_pipeline).to be_failed + expect(parent_pipeline).to have_failed end end diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb index ec7af809cf6..633af9c2e8a 100644 --- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb @@ -32,7 +32,7 @@ module QA parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_job("child_job") - expect(parent_pipeline).to be_passed + expect(parent_pipeline).to have_passed end end @@ -44,7 +44,7 @@ module QA parent_pipeline.click_linked_job(project.name) expect(parent_pipeline).to have_job("child_job") - expect(parent_pipeline).to be_passed + expect(parent_pipeline).to have_passed end end |