blob: c7296b6eea2ca3239cfebac38ac892d600505855 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
# frozen_string_literal: true
module QA
RSpec.describe 'Create' do
describe 'Merge request rebasing' do
let(:merge_request) { Resource::MergeRequest.fabricate_via_api! }
before do
Flow::Login.sign_in
end
it 'user rebases source branch of merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347735' do
merge_request.project.visit!
Page::Project::Menu.perform(&:go_to_merge_request_settings)
Page::Project::Settings::MergeRequest.perform do |settings|
settings.enable_ff_only
end
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = merge_request.project
push.file_name = "other.txt"
push.file_content = "New file added!"
push.new_branch = false
end
merge_request.visit!
Page::MergeRequest::Show.perform do |mr_page|
expect(mr_page).to have_content('Merge blocked: the source branch must be rebased onto the target branch.')
expect(mr_page).to be_fast_forward_not_possible
expect(mr_page).not_to have_merge_button
expect(merge_request.project.commits.size).to eq(2)
mr_page.rebase!
expect { mr_page.has_merge_button? }.to eventually_be_truthy.within(max_duration: 60, reload_page: mr_page)
mr_page.merge!
expect(merge_request.project.commits.size).to eq(3)
end
end
end
end
end
|
