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
2b337353
Commit
2b337353
authored
Sep 27, 2021
by
richard.chong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Doubles the max_duration time to wait for pipeline status widget
parent
e0e687a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
20 deletions
+14
-20
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb
...erify/new_discussion_not_dropping_merge_trains_mr_spec.rb
+3
-5
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
+10
-14
No files found.
qa/qa/page/merge_request/show.rb
View file @
2b337353
...
...
@@ -202,7 +202,7 @@ module QA
def
has_pipeline_status?
(
text
)
# Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
wait_until
(
sleep_interval:
5
,
reload:
fals
e
)
do
wait_until
(
max_duration:
120
,
sleep_interval:
5
,
reload:
tru
e
)
do
has_element?
(
:merge_request_pipeline_info_content
,
text:
text
,
wait:
15
)
end
end
...
...
qa/qa/specs/features/ee/browser_ui/4_verify/new_discussion_not_dropping_merge_trains_mr_spec.rb
View file @
2b337353
...
...
@@ -53,11 +53,9 @@ module QA
it
'does not drop MR'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1250'
do
start_discussion
Support
::
Retrier
.
retry_until
(
max_attempts:
3
,
sleep_interval:
3
)
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
show
.
has_pipeline_status?
(
'passed'
)
expect
(
show
).
to
be_merged
end
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
show
.
has_pipeline_status?
(
'passed'
)
expect
(
show
).
to
be_merged
end
end
...
...
qa/qa/specs/features/ee/browser_ui/4_verify/pipelines_for_merged_results_and_merge_trains_spec.rb
View file @
2b337353
...
...
@@ -63,30 +63,26 @@ 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!
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.'
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."
end
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
end
end
it
'merges via a merge train'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1518'
do
merge_request
.
visit!
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.'
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."
end
expect
(
show
).
to
be_merged
,
"Expected content 'The changes were merged' but it did not appear."
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