2019-07-31 22:56:46 +05:30
|
|
|
# frozen_string_literal: true
|
2017-08-17 22:00:37 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
RSpec.describe 'Projects > Settings > User manages merge request settings' do
|
2021-04-29 21:17:54 +05:30
|
|
|
include ProjectForksHelper
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:user) { create(:user) }
|
2018-10-15 14:42:47 +05:30
|
|
|
let(:project) { create(:project, :public, namespace: user.namespace, path: 'gitlab', name: 'sample') }
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
before do
|
2017-09-10 17:25:29 +05:30
|
|
|
sign_in(user)
|
2018-10-15 14:42:47 +05:30
|
|
|
visit edit_project_path(project)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
it 'shows "Merge commit" strategy' do
|
2019-02-15 15:39:39 +05:30
|
|
|
page.within '#js-merge-request-settings' do
|
2018-10-15 14:42:47 +05:30
|
|
|
expect(page).to have_content 'Merge commit'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows "Merge commit with semi-linear history " strategy' do
|
2019-02-15 15:39:39 +05:30
|
|
|
page.within '#js-merge-request-settings' do
|
2018-10-15 14:42:47 +05:30
|
|
|
expect(page).to have_content 'Merge commit with semi-linear history'
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
it 'shows "Fast-forward merge" strategy' do
|
2019-02-15 15:39:39 +05:30
|
|
|
page.within '#js-merge-request-settings' do
|
2018-10-15 14:42:47 +05:30
|
|
|
expect(page).to have_content 'Fast-forward merge'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
it 'shows Squash commit options', :aggregate_failures do
|
|
|
|
page.within '#js-merge-request-settings' do
|
|
|
|
expect(page).to have_content 'Do not allow'
|
|
|
|
expect(page).to have_content 'Squashing is never performed and the checkbox is hidden.'
|
|
|
|
|
|
|
|
expect(page).to have_content 'Allow'
|
|
|
|
expect(page).to have_content 'Checkbox is visible and unselected by default.'
|
|
|
|
|
|
|
|
expect(page).to have_content 'Encourage'
|
|
|
|
expect(page).to have_content 'Checkbox is visible and selected by default.'
|
|
|
|
|
|
|
|
expect(page).to have_content 'Require'
|
|
|
|
expect(page).to have_content 'Squashing is always performed. Checkbox is visible and selected, and users cannot change it.'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
context 'when Merge Request and Pipelines are initially enabled', :js do
|
|
|
|
context 'when Pipelines are initially enabled' do
|
|
|
|
it 'shows the Merge Requests settings' do
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).to have_content 'Pipelines must succeed'
|
|
|
|
expect(page).to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
within('.sharing-permissions-form') do
|
2021-03-11 19:13:27 +05:30
|
|
|
find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
|
2018-03-17 18:26:18 +05:30
|
|
|
find('input[value="Save changes"]').send_keys(:return)
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).not_to have_content 'Pipelines must succeed'
|
|
|
|
expect(page).not_to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
context 'when Pipelines are initially disabled', :js do
|
2017-08-17 22:00:37 +05:30
|
|
|
before do
|
|
|
|
project.project_feature.update_attribute('builds_access_level', ProjectFeature::DISABLED)
|
|
|
|
visit edit_project_path(project)
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
it 'shows the Merge Requests settings that do not depend on Builds feature' do
|
2019-09-04 21:01:54 +05:30
|
|
|
expect(page).to have_content 'Pipelines must succeed'
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
within('.sharing-permissions-form') do
|
2021-03-11 19:13:27 +05:30
|
|
|
find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click
|
2018-03-17 18:26:18 +05:30
|
|
|
find('input[value="Save changes"]').send_keys(:return)
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).to have_content 'Pipelines must succeed'
|
|
|
|
expect(page).to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
context 'when Merge Request are initially disabled', :js do
|
2017-08-17 22:00:37 +05:30
|
|
|
before do
|
|
|
|
project.project_feature.update_attribute('merge_requests_access_level', ProjectFeature::DISABLED)
|
|
|
|
visit edit_project_path(project)
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
it 'does not show the Merge Requests settings' do
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).not_to have_content 'Pipelines must succeed'
|
|
|
|
expect(page).not_to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
within('.sharing-permissions-form') do
|
2021-03-11 19:13:27 +05:30
|
|
|
find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
|
2018-03-17 18:26:18 +05:30
|
|
|
find('input[value="Save changes"]').send_keys(:return)
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
expect(page).to have_content 'Pipelines must succeed'
|
|
|
|
expect(page).to have_content 'All discussions must be resolved'
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
describe 'Checkbox to enable merge request link', :js do
|
|
|
|
it 'is initially checked' do
|
2017-08-17 22:00:37 +05:30
|
|
|
checkbox = find_field('project_printing_merge_request_link_enabled')
|
|
|
|
expect(checkbox).to be_checked
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
it 'when unchecked sets :printing_merge_request_link_enabled to false' do
|
2017-08-17 22:00:37 +05:30
|
|
|
uncheck('project_printing_merge_request_link_enabled')
|
2017-09-10 17:25:29 +05:30
|
|
|
within('.merge-request-settings-form') do
|
2019-10-12 21:52:04 +05:30
|
|
|
find('.rspec-save-merge-request-changes')
|
2017-09-10 17:25:29 +05:30
|
|
|
click_on('Save changes')
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-07-07 11:18:12 +05:30
|
|
|
find('.flash-notice')
|
2017-08-17 22:00:37 +05:30
|
|
|
checkbox = find_field('project_printing_merge_request_link_enabled')
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
expect(checkbox).not_to be_checked
|
|
|
|
|
|
|
|
project.reload
|
|
|
|
expect(project.printing_merge_request_link_enabled).to be(false)
|
|
|
|
end
|
|
|
|
end
|
2019-12-26 22:10:19 +05:30
|
|
|
|
|
|
|
describe 'Checkbox to remove source branch after merge', :js do
|
|
|
|
it 'is initially checked' do
|
|
|
|
checkbox = find_field('project_remove_source_branch_after_merge')
|
|
|
|
expect(checkbox).to be_checked
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'when unchecked sets :remove_source_branch_after_merge to false' do
|
|
|
|
uncheck('project_remove_source_branch_after_merge')
|
|
|
|
within('.merge-request-settings-form') do
|
2021-04-17 20:07:23 +05:30
|
|
|
find('.rspec-save-merge-request-changes')
|
2019-12-26 22:10:19 +05:30
|
|
|
click_on('Save changes')
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.flash-notice')
|
|
|
|
checkbox = find_field('project_remove_source_branch_after_merge')
|
|
|
|
|
|
|
|
expect(checkbox).not_to be_checked
|
|
|
|
|
|
|
|
project.reload
|
|
|
|
expect(project.remove_source_branch_after_merge).to be(false)
|
|
|
|
end
|
|
|
|
end
|
2020-07-28 23:09:34 +05:30
|
|
|
|
|
|
|
describe 'Squash commits when merging', :js do
|
|
|
|
it 'initially has :squash_option set to :default_off' do
|
|
|
|
radio = find_field('project_project_setting_attributes_squash_option_default_off')
|
|
|
|
expect(radio).to be_checked
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows :squash_option to be set to :default_on' do
|
|
|
|
choose('project_project_setting_attributes_squash_option_default_on')
|
|
|
|
|
|
|
|
within('.merge-request-settings-form') do
|
2021-04-17 20:07:23 +05:30
|
|
|
find('.rspec-save-merge-request-changes')
|
2020-07-28 23:09:34 +05:30
|
|
|
click_on('Save changes')
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.flash-notice')
|
|
|
|
radio = find_field('project_project_setting_attributes_squash_option_default_on')
|
|
|
|
|
|
|
|
expect(radio).to be_checked
|
|
|
|
expect(project.reload.project_setting.squash_option).to eq('default_on')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows :squash_option to be set to :always' do
|
|
|
|
choose('project_project_setting_attributes_squash_option_always')
|
|
|
|
|
|
|
|
within('.merge-request-settings-form') do
|
2021-04-17 20:07:23 +05:30
|
|
|
find('.rspec-save-merge-request-changes')
|
2020-07-28 23:09:34 +05:30
|
|
|
click_on('Save changes')
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.flash-notice')
|
|
|
|
radio = find_field('project_project_setting_attributes_squash_option_always')
|
|
|
|
|
|
|
|
expect(radio).to be_checked
|
|
|
|
expect(project.reload.project_setting.squash_option).to eq('always')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows :squash_option to be set to :never' do
|
|
|
|
choose('project_project_setting_attributes_squash_option_never')
|
|
|
|
|
|
|
|
within('.merge-request-settings-form') do
|
2021-04-17 20:07:23 +05:30
|
|
|
find('.rspec-save-merge-request-changes')
|
2020-07-28 23:09:34 +05:30
|
|
|
click_on('Save changes')
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.flash-notice')
|
|
|
|
radio = find_field('project_project_setting_attributes_squash_option_never')
|
|
|
|
|
|
|
|
expect(radio).to be_checked
|
|
|
|
expect(project.reload.project_setting.squash_option).to eq('never')
|
|
|
|
end
|
|
|
|
end
|
2021-04-29 21:17:54 +05:30
|
|
|
|
|
|
|
describe 'target project settings' do
|
|
|
|
context 'when project is a fork' do
|
|
|
|
let_it_be(:upstream) { create(:project, :public) }
|
|
|
|
|
|
|
|
let(:project) { fork_project(upstream, user) }
|
|
|
|
|
|
|
|
it 'allows to change merge request target project behavior' do
|
|
|
|
expect(page).to have_content 'The default target project for merge requests'
|
|
|
|
|
|
|
|
radio = find_field('project_project_setting_attributes_mr_default_target_self_false')
|
|
|
|
expect(radio).to be_checked
|
|
|
|
|
|
|
|
choose('project_project_setting_attributes_mr_default_target_self_true')
|
|
|
|
|
|
|
|
within('.merge-request-settings-form') do
|
|
|
|
find('.rspec-save-merge-request-changes')
|
|
|
|
click_on('Save changes')
|
|
|
|
end
|
|
|
|
|
|
|
|
find('.flash-notice')
|
|
|
|
radio = find_field('project_project_setting_attributes_mr_default_target_self_true')
|
|
|
|
|
|
|
|
expect(radio).to be_checked
|
|
|
|
expect(project.reload.project_setting.mr_default_target_self).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not show target project section' do
|
|
|
|
expect(page).not_to have_content 'The default target project for merge requests'
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|