diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-22 15:31:41 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-22 15:31:41 +0100 |
commit | 738bad8ee83932ffd1b7b4de9113b0152b37172a (patch) | |
tree | d98a5fdf13634af2d094a852493d18f5d041fbb5 | |
parent | 5520e3ebc329cdfec4bf61aa29dd25de563c3e43 (diff) | |
download | gitlab-ce-738bad8ee83932ffd1b7b4de9113b0152b37172a.tar.gz |
Fix CI/CD end-to-end tests by waiting for changes
-rw-r--r-- | qa/qa/page/project/show.rb | 1 | ||||
-rw-r--r-- | qa/qa/specs/features/project/pipelines_spec.rb | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/repository/push_spec.rb | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb index c8af5ba6280..5e66e40a0b5 100644 --- a/qa/qa/page/project/show.rb +++ b/qa/qa/page/project/show.rb @@ -33,6 +33,7 @@ module QA def wait_for_push sleep 5 + refresh end end end diff --git a/qa/qa/specs/features/project/pipelines_spec.rb b/qa/qa/specs/features/project/pipelines_spec.rb index 56a6acee6a4..f9280cd049a 100644 --- a/qa/qa/specs/features/project/pipelines_spec.rb +++ b/qa/qa/specs/features/project/pipelines_spec.rb @@ -15,8 +15,10 @@ module QA end Page::Project::Settings::CICD.perform do |settings| + settings.refresh + settings.expand_runners_settings do |page| - expect(page).to have_content(runner) + expect(page).to have_content(executor) expect(page).to have_online_runner end end @@ -58,6 +60,8 @@ module QA end Page::Project::Show.act { wait_for_push } + + expect(page).to have_content('Add .gitlab-ci.yml') end end end diff --git a/qa/qa/specs/features/repository/push_spec.rb b/qa/qa/specs/features/repository/push_spec.rb index 4f6ffe14c9f..51d9c2c7fd2 100644 --- a/qa/qa/specs/features/repository/push_spec.rb +++ b/qa/qa/specs/features/repository/push_spec.rb @@ -11,10 +11,7 @@ module QA push.commit_message = 'Add README.md' end - Page::Project::Show.act do - wait_for_push - refresh - end + Page::Project::Show.act { wait_for_push } expect(page).to have_content('README.md') expect(page).to have_content('This is a test project') |