diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /qa/qa/specs/features/browser_ui/4_verify/pipeline | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-13.7.0-rc42.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'qa/qa/specs/features/browser_ui/4_verify/pipeline')
4 files changed, 10 insertions, 27 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb index cedc2db2a1a..c2ea568dbad 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb @@ -3,9 +3,8 @@ require 'faker' module QA - RSpec.describe 'Verify', :runner, :requires_admin, :skip_live_env do - describe "Include multiple files from a project" do - let(:feature_flag) { :ci_include_multiple_files_from_project } + RSpec.describe 'Verify', :runner do + describe 'Include multiple files from a project' do let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" } let(:expected_text) { Faker::Lorem.sentence } let(:unexpected_text) { Faker::Lorem.sentence } @@ -31,16 +30,14 @@ module QA end before do - Runtime::Feature.enable(feature_flag) Flow::Login.sign_in add_included_files add_main_ci_file project.visit! - view_the_last_pipeline + Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'succeeded') end after do - Runtime::Feature.disable(feature_flag) runner.remove_via_api! end @@ -57,7 +54,7 @@ module QA Page::Project::Job::Show.perform do |job| aggregate_failures 'main CI is not overridden' do - expect(job.output).to have_no_content("#{unexpected_text}") + expect(job.output).not_to have_content("#{unexpected_text}") expect(job.output).to have_content("#{expected_text}") end end @@ -81,12 +78,6 @@ module QA end end - def view_the_last_pipeline - Page::Project::Menu.perform(&:click_ci_cd_pipelines) - Page::Project::Pipeline::Index.perform(&:wait_for_latest_pipeline_success) - Page::Project::Pipeline::Index.perform(&:click_on_latest_pipeline) - end - def main_ci_file { file_path: '.gitlab-ci.yml', diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb index eafe28c1ee6..519777b32d9 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb @@ -3,9 +3,8 @@ require 'faker' module QA - RSpec.describe 'Verify', :runner, :requires_admin do - describe "Pass dotenv variables to downstream via bridge" do - let(:feature_flag) { :ci_bridge_dependency_variables } + RSpec.describe 'Verify', :runner do + describe 'Pass dotenv variables to downstream via bridge' do let(:executor_1) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" } let(:executor_2) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" } @@ -38,16 +37,14 @@ module QA end before do - Runtime::Feature.enable(feature_flag) Flow::Login.sign_in add_ci_file(downstream_project, downstream_ci_file) add_ci_file(upstream_project, upstream_ci_file) upstream_project.visit! - Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'success') + Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'succeeded') end after do - Runtime::Feature.disable(feature_flag) runner_1.remove_via_api! runner_2.remove_via_api! end diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb index b79bda108af..5f3ec3ec870 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb @@ -2,7 +2,7 @@ module QA RSpec.describe 'Verify' do - describe 'Run pipeline', only: { subdomain: :staging } do + describe 'Run pipeline' do context 'with web only rule' do let(:job_name) { 'test_job' } let(:project) do diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb index 2f66ed697a3..c89cda73711 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb @@ -3,11 +3,8 @@ require 'faker' module QA - RSpec.describe 'Verify', :runner, :requires_admin do - # [TODO]: Developer to remove :requires_admin once FF is removed in follow up issue - + RSpec.describe 'Verify', :runner do describe "Trigger child pipeline with 'when:manual'" do - let(:feature_flag) { :ci_manual_bridges } # [TODO]: Developer to remove when feature flag is removed let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" } let(:project) do @@ -25,15 +22,13 @@ module QA end before do - Runtime::Feature.enable(feature_flag) # [TODO]: Developer to remove when feature flag is removed Flow::Login.sign_in add_ci_files project.visit! - Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'success') + Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'succeeded') end after do - Runtime::Feature.disable(feature_flag) # [TODO]: Developer to remove when feature flag is removed runner.remove_via_api! end |