Commit ffeadd6b authored by Mark Lapierre's avatar Mark Lapierre

Reload if needed when checking merge status

parent 4649b8b8
...@@ -85,7 +85,7 @@ module QA ...@@ -85,7 +85,7 @@ module QA
click_element :mr_rebase_button click_element :mr_rebase_button
success = wait(reload: false) do success = wait do
has_text?('Fast-forward merge without a merge commit') has_text?('Fast-forward merge without a merge commit')
end end
...@@ -118,7 +118,7 @@ module QA ...@@ -118,7 +118,7 @@ module QA
merge_immediately merge_immediately
success = wait(reload: false) do success = wait do
has_text?('The changes were merged into') has_text?('The changes were merged into')
end end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
module QA module QA
context 'Create' do context 'Create' do
describe 'Merge request rebasing' 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) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.perform(&:sign_in_using_credentials) Page::Main::Login.perform(&:sign_in_using_credentials)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment