diff options
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 3823afb9b9f..f54bea880a0 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -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 diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb index d093fbfbf22..3fbcd77dac6 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb @@ -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) |