diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-08-29 23:46:47 +0000 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-08-29 23:46:47 +0000 |
| commit | 739ecdb66443f1d90ec24da87f2861700aea93d1 (patch) | |
| tree | 8b7e7d9521dbb5a5d93f14cad414bc81dbaf05b7 /qa/qa/specs | |
| parent | ee18bf57f3cae9be75f7b569d3993df83d7d4d94 (diff) | |
| parent | 7a2bc31e38892f2d064b75710e37d6b3a31a3a03 (diff) | |
| download | gitlab-ce-739ecdb66443f1d90ec24da87f2861700aea93d1.tar.gz | |
Merge branch 'ce-backport-of-ml-web-terminal-spec-qa' into 'master'
Backport changes from EE MR 8186
See merge request gitlab-org/gitlab-ce!31707
Diffstat (limited to 'qa/qa/specs')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb index 33744236dd4..900ddcb7f59 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb @@ -15,11 +15,11 @@ module QA Resource::Runner.fabricate! do |runner| runner.name = executor - end + end.project.visit! + Page::Project::Menu.perform(&:go_to_ci_cd_settings) Page::Project::Settings::CICD.perform do |settings| sleep 5 # Runner should register within 5 seconds - settings.refresh settings.expand_runners_settings do |page| expect(page).to have_content(executor) diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index f6411d8c5ad..141166f6971 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -17,7 +17,7 @@ module QA @repository_location = @project.repository_ssh_location - Resource::Runner.fabricate_via_browser_ui! do |resource| + Resource::Runner.fabricate_via_api! do |resource| resource.project = @project resource.name = @runner_name resource.tags = %w[qa docker] |