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
799e5e9e
Commit
799e5e9e
authored
Sep 25, 2020
by
treagitlab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase wait time on pipeline and merge status
parent
840374cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+2
-2
No files found.
qa/qa/page/merge_request/show.rb
View file @
799e5e9e
...
@@ -164,7 +164,7 @@ module QA
...
@@ -164,7 +164,7 @@ module QA
def
has_pipeline_status?
(
text
)
def
has_pipeline_status?
(
text
)
# Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
# Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
has_element?
(
:merge_request_pipeline_info_content
,
text:
text
,
wait:
3
0
)
has_element?
(
:merge_request_pipeline_info_content
,
text:
text
,
wait:
6
0
)
end
end
def
has_title?
(
title
)
def
has_title?
(
title
)
...
@@ -198,7 +198,7 @@ module QA
...
@@ -198,7 +198,7 @@ module QA
end
end
def
merged?
def
merged?
has_element?
(
:merged_status_content
,
text:
'The changes were merged into'
,
wait:
3
0
)
has_element?
(
:merged_status_content
,
text:
'The changes were merged into'
,
wait:
6
0
)
end
end
# Check if the MR is able to be merged
# Check if the MR is able to be merged
...
...
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