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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'User edits a merge request', :js do
include Select2Helper
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:user) { create(:user) }
before do
project.add_maintainer(user)
sign_in(user)
visit(edit_project_merge_request_path(project, merge_request))
end
describe 'Squash commits' do
it 'override MR setting if "Required" is saved' do
merge_request.update!(squash: false)
project.project_setting.update!(squash_option: 'always')
visit(edit_project_merge_request_path(project, merge_request))
click_button('Save changes')
project.project_setting.update!(squash_option: 'default_off')
visit(edit_project_merge_request_path(project, merge_request))
expect(find("#merge_request_squash").selected?).to be(true)
end
it 'recovers MR squash setting if "Required" is not saved' do
merge_request.update!(squash: false)
project.project_setting.update!(squash_option: 'always')
visit(edit_project_merge_request_path(project, merge_request))
project.project_setting.update!(squash_option: 'default_on')
visit(edit_project_merge_request_path(project, merge_request))
expect(find("#merge_request_squash").selected?).to be(false)
end
it 'does not override MR squash setting if "Do not allow" is saved' do
merge_request.update!(squash: true)
project.project_setting.update!(squash_option: 'never')
visit(edit_project_merge_request_path(project, merge_request))
click_button('Save changes')
expect(merge_request.squash).to be true
end
it 'displays "Required in this project" for "Required" project setting squash option' do
project.project_setting.update!(squash_option: 'always')
visit(edit_project_merge_request_path(project, merge_request))
expect(page).to have_content('Squash commits when merge request is accepted.')
expect(page).to have_content("Required in this project")
end
it 'does not display message for "Allow" project setting squash option' do
project.project_setting.update!(squash_option: 'default_off')
visit(edit_project_merge_request_path(project, merge_request))
expect(page).to have_content('Squash commits when merge request is accepted.')
expect(page).not_to have_content("Required in this project")
end
it 'does not display message for "Encourage" project setting squash option' do
project.project_setting.update!(squash_option: 'default_on')
visit(edit_project_merge_request_path(project, merge_request))
expect(page).to have_content('Squash commits when merge request is accepted.')
expect(page).not_to have_content("Required in this project")
end
it 'is hidden for "Do not allow" project setting squash option' do
project.project_setting.update!(squash_option: 'never')
visit(edit_project_merge_request_path(project, merge_request))
expect(page).not_to have_content('Squash commits when merge request is accepted.')
expect(page).not_to have_css('#merge_request_squash')
end
end
it 'changes the target branch' do
expect(page).to have_content('From master into feature')
select2('merge-test', from: '#merge_request_target_branch')
click_button('Save changes')
expect(page).to have_content("Request to merge #{merge_request.source_branch} into merge-test")
expect(page).to have_content("changed target branch from #{merge_request.target_branch} to merge-test")
end
end
|
