diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:06 +0000 |
commit | e1549c75843d235607aebac9ed64f2fd10e549ed (patch) | |
tree | d6b4213b87b57b323464c7e5c1b75091212f3373 /qa/qa/specs/features/browser_ui/4_verify | |
parent | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (diff) | |
download | gitlab-ce-e1549c75843d235607aebac9ed64f2fd10e549ed.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs/features/browser_ui/4_verify')
-rw-r--r-- | qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb index 05adcc718e8..2502e8beda7 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - context 'Verify', :docker do + context 'Verify', :docker, :runner do describe 'Pipeline creation and processing' do let(:executor) { "qa-runner-#{Time.now.to_i}" } let(:max_wait) { 30 } @@ -12,7 +12,7 @@ module QA end end - before do + let!(:runner) do Resource::Runner.fabricate! do |runner| runner.project = project runner.name = executor @@ -21,7 +21,7 @@ module QA end after do - Service::DockerRun::GitlabRunner.new(executor).remove! + runner.remove_via_api! end it 'users creates a pipeline which gets processed', :smoke do 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 fb1ee4446a9..2550ee7193b 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 @@ -1,20 +1,23 @@ # frozen_string_literal: true module QA - context 'Verify', :docker do + context 'Verify', :docker, :runner do describe 'Runner registration' do let(:executor) { "qa-runner-#{Time.now.to_i}" } + let!(:runner) do + Resource::Runner.fabricate! do |runner| + runner.name = executor + end + end after do - Service::DockerRun::GitlabRunner.new(executor).remove! + runner.remove_via_api! end it 'user registers a new specific runner' do Flow::Login.sign_in - Resource::Runner.fabricate! do |runner| - runner.name = executor - end.project.visit! + runner.project.visit! Page::Project::Menu.perform(&:go_to_ci_cd_settings) Page::Project::Settings::CICD.perform do |settings| |