diff options
Diffstat (limited to 'qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb')
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb index 2b1ac75b9f5..3a5850c0047 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb @@ -30,7 +30,7 @@ module QA content: <<~EOF test: tags: ["runner-for-#{project.name}"] - script: sleep 10 + script: sleep 20 only: - merge_requests EOF @@ -87,11 +87,11 @@ module QA end end - context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1684' do + context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1834' do it_behaves_like 'merge when pipeline succeeds' end - context 'when merging several times', :transient, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1684' do + context 'when merging several times', :transient, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1917' do it_behaves_like 'merge when pipeline succeeds', repeat: Runtime::Env.transient_trials end end |