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
ffeadd6b
Commit
ffeadd6b
authored
Jan 28, 2019
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reload if needed when checking merge status
parent
4649b8b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+2
-2
qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
...er_ui/3_create/merge_request/rebase_merge_request_spec.rb
+1
-1
No files found.
qa/qa/page/merge_request/show.rb
View file @
ffeadd6b
...
...
@@ -85,7 +85,7 @@ module QA
click_element
:mr_rebase_button
success
=
wait
(
reload:
false
)
do
success
=
wait
do
has_text?
(
'Fast-forward merge without a merge commit'
)
end
...
...
@@ -118,7 +118,7 @@ module QA
merge_immediately
success
=
wait
(
reload:
false
)
do
success
=
wait
do
has_text?
(
'The changes were merged into'
)
end
...
...
qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
View file @
ffeadd6b
...
...
@@ -3,7 +3,7 @@
module
QA
context
'Create'
do
describe
'Merge request rebasing'
do
it
'user rebases source branch of merge request'
,
:quarantine
do
it
'user rebases source branch of merge request'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
...
...
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