Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Gitlab-External-Templates
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Adri
Gitlab-External-Templates
Commits
2d77b075
Commit
2d77b075
authored
2 years ago
by
richard.chong
Browse files
Options
Downloads
Patches
Plain Diff
Removes page refreshes for MR#show
parent
7230fd40
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
qa/qa/page/merge_request/show.rb
+1
-12
1 addition, 12 deletions
qa/qa/page/merge_request/show.rb
with
1 addition
and
12 deletions
qa/qa/page/merge_request/show.rb
+
1
−
12
View file @
2d77b075
...
...
@@ -257,15 +257,7 @@ def merge_when_pipeline_succeeds!
end
def
merged?
# Reloads the page at this point to avoid the problem of the merge status failing to update
# That's the transient UX issue this test is checking for, so if the MR is merged but the UI still shows the
# status as unmerged, the test will fail.
# Revisit after merge page re-architect is done https://gitlab.com/groups/gitlab-org/-/epics/5598
# To remove page refresh logic if possible
# We don't raise on failure because this method is used as a predicate matcher
retry_until
(
max_attempts:
3
,
reload:
true
,
raise_on_failure:
false
)
do
has_element?
(
:merged_status_content
,
text:
/The changes were merged into|Changes merged into/
,
wait:
20
)
end
has_element?
(
:merged_status_content
,
text:
/The changes were merged into|Changes merged into/
,
wait:
20
)
end
# Check if the MR is able to be merged
...
...
@@ -327,10 +319,7 @@ def merge_immediately!
end
def
try_to_merge!
# Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042
# To remove page refresh logic if possible
wait_until_ready_to_merge
wait_until
{
!
find_element
(
:merge_button
).
has_text?
(
"when pipeline succeeds"
)
}
click_element
(
:merge_button
)
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment