Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d9d8e5c4
Commit
d9d8e5c4
authored
Sep 15, 2021
by
richard.chong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds 3 attempts and a sleep interval of 3s to allow for widget to update
parent
8253bfc3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
qa/qa/specs/features/ee/browser_ui/4_verify/pipelines_for_merged_results_and_merge_trains_spec.rb
...ify/pipelines_for_merged_results_and_merge_trains_spec.rb
+14
-10
No files found.
qa/qa/specs/features/ee/browser_ui/4_verify/pipelines_for_merged_results_and_merge_trains_spec.rb
View file @
d9d8e5c4
...
...
@@ -63,26 +63,30 @@ module QA
it
'creates a pipeline with merged results'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1517'
do
merge_request
.
visit!
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
expect
(
show
).
to
have_pipeline_status
(
'passed'
),
'Expected the merge request pipeline to pass.'
Support
::
Retrier
.
retry_until
(
max_attempts:
3
,
sleep_interval:
3
)
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
expect
(
show
).
to
have_pipeline_status
(
'passed'
),
'Expected the merge request pipeline to pass.'
# The default option is to merge via merge train,
# but that is covered by the 'merges via a merge train' test
show
.
skip_merge_train_and_merge_immediately
# The default option is to merge via merge train,
# but that is covered by the 'merges via a merge train' test
show
.
skip_merge_train_and_merge_immediately
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
end
end
end
it
'merges via a merge train'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1518'
do
merge_request
.
visit!
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
expect
(
show
).
to
have_pipeline_status
(
'passed'
),
'Expected the merge request pipeline to pass.'
Support
::
Retrier
.
retry_until
(
max_attempts:
3
,
sleep_interval:
3
)
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
expect
(
show
).
to
have_pipeline_status
(
'passed'
),
'Expected the merge request pipeline to pass.'
show
.
merge_via_merge_train
show
.
merge_via_merge_train
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment