Commit 8fa4d3c1 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch '349358-wait-for-new-pipeline' into 'master'

Account for behavior on slow network condition

See merge request gitlab-org/gitlab!77615
parents c9780a46 ae92ac84
...@@ -11,6 +11,14 @@ module QA ...@@ -11,6 +11,14 @@ module QA
end end
end end
let!(:runner) do
Resource::Runner.fabricate_via_api! do |runner|
runner.project = project
runner.name = random_test_string
runner.tags = [random_test_string]
end
end
let!(:commit) do let!(:commit) do
Resource::Repository::Commit.fabricate_via_api! do |commit| Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = project commit.project = project
...@@ -21,6 +29,7 @@ module QA ...@@ -21,6 +29,7 @@ module QA
file_path: '.gitlab-ci.yml', file_path: '.gitlab-ci.yml',
content: <<~YAML content: <<~YAML
test_job: test_job:
tags: ['#{random_test_string}']
script: script:
- echo "Simple test!" - echo "Simple test!"
YAML YAML
...@@ -33,11 +42,12 @@ module QA ...@@ -33,11 +42,12 @@ module QA
before do before do
Flow::Login.sign_in Flow::Login.sign_in
project.visit! project.visit!
Support::Waiter.wait_until { project.pipelines.first[:status] == 'success' }
Page::Project::Menu.perform(&:go_to_pipeline_editor) Page::Project::Menu.perform(&:go_to_pipeline_editor)
end end
after do after do
project.remove_via_api! [runner, project].each(&:remove_via_api!)
end end
it 'creates new pipeline and target branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349005' do it 'creates new pipeline and target branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349005' do
...@@ -50,7 +60,7 @@ module QA ...@@ -50,7 +60,7 @@ module QA
expect(show.target_branch_name).to eq(random_test_string) expect(show.target_branch_name).to eq(random_test_string)
expect(show.current_branch).to eq(random_test_string) expect(show.current_branch).to eq(random_test_string)
expect(show.editing_content).to have_content(random_test_string) expect(show.editing_content).to have_content(random_test_string)
expect(show.pipeline_id).to eq(project.pipelines.first[:id]) expect { show.pipeline_id }.to eventually_eq(project.pipelines.pluck(:id).max).within(max_duration: 60, sleep_interval: 3)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment