Commit 3b110e04 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'tomi/qa/fix/rebase_merge_request' into 'master'

De-quarantine 'browser_ui/3_create/merge_request/rebase_merge_request_spec'

See merge request gitlab-org/gitlab!55586
parents 608675f7 8846531b
...@@ -183,7 +183,11 @@ module QA ...@@ -183,7 +183,11 @@ module QA
end end
def fast_forward_possible? def fast_forward_possible?
has_no_text?('Fast-forward merge is not possible') has_text?('Fast-forward merge without a merge commit')
end
def fast_forward_not_possible?
has_text?('Fast-forward merge is not possible')
end end
def has_file?(file_name) def has_file?(file_name)
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Create', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/30226', type: :bug } do RSpec.describe 'Create', quarantine: { only: { subdomain: :staging }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/323990', type: :flaky } do
describe 'Merge request rebasing' do describe 'Merge request rebasing' do
it 'user rebases source branch of merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1274' do it 'user rebases source branch of merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1274' do
Flow::Login.sign_in Flow::Login.sign_in
...@@ -34,7 +34,7 @@ module QA ...@@ -34,7 +34,7 @@ module QA
Page::MergeRequest::Show.perform do |merge_request| Page::MergeRequest::Show.perform do |merge_request|
expect(merge_request).to have_content('Needs rebasing') expect(merge_request).to have_content('Needs rebasing')
expect(merge_request).not_to be_fast_forward_possible expect(merge_request).to be_fast_forward_not_possible
expect(merge_request).not_to have_merge_button expect(merge_request).not_to have_merge_button
merge_request.rebase! merge_request.rebase!
......
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