2016-06-17 08:49:02 +00:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
feature 'Protected Branches', :js do
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:admin) { create(:admin) }
|
2017-03-28 21:13:16 +00:00
|
|
|
let(:project) { create(:project, :repository) }
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
context 'logged in as developer' do
|
|
|
|
before do
|
|
|
|
project.add_developer(user)
|
|
|
|
sign_in(user)
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
describe 'Delete protected branch' do
|
|
|
|
before do
|
|
|
|
create(:protected_branch, project: project, name: 'fix')
|
|
|
|
expect(ProtectedBranch.count).to eq(1)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not allow developer to removes protected branch' do
|
|
|
|
visit project_branches_path(project)
|
|
|
|
|
|
|
|
fill_in 'branch-search', with: 'fix'
|
|
|
|
find('#branch-search').native.send_keys(:enter)
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
expect(page).to have_css('.btn-remove.disabled')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
context 'logged in as master' do
|
|
|
|
before do
|
|
|
|
project.add_master(user)
|
|
|
|
sign_in(user)
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
describe 'Delete protected branch' do
|
|
|
|
before do
|
|
|
|
create(:protected_branch, project: project, name: 'fix')
|
|
|
|
expect(ProtectedBranch.count).to eq(1)
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
it 'removes branch after modal confirmation' do
|
|
|
|
visit project_branches_path(project)
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
fill_in 'branch-search', with: 'fix'
|
|
|
|
find('#branch-search').native.send_keys(:enter)
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
expect(page).to have_content('fix')
|
|
|
|
expect(find('.all-branches')).to have_selector('li', count: 1)
|
2017-10-11 21:54:05 +00:00
|
|
|
page.find('[data-target="#modal-delete-branch"]').click
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
expect(page).to have_css('.js-delete-branch[disabled]')
|
|
|
|
fill_in 'delete_branch_input', with: 'fix'
|
|
|
|
click_link 'Delete protected branch'
|
|
|
|
|
|
|
|
fill_in 'branch-search', with: 'fix'
|
|
|
|
find('#branch-search').native.send_keys(:enter)
|
|
|
|
|
|
|
|
expect(page).to have_content('No branches to show')
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
2017-10-05 21:41:57 +00:00
|
|
|
|
|
|
|
describe "Saved defaults" do
|
|
|
|
it "keeps the allowed to merge and push dropdowns defaults based on the previous selection" do
|
|
|
|
visit project_protected_branches_path(project)
|
2017-10-06 22:04:45 +00:00
|
|
|
form = '.js-new-protected-branch'
|
|
|
|
|
|
|
|
within form do
|
2017-10-11 21:54:05 +00:00
|
|
|
find(".js-allowed-to-merge").click
|
2018-05-23 21:28:08 +00:00
|
|
|
wait_for_requests
|
2017-10-06 22:04:45 +00:00
|
|
|
click_link 'No one'
|
2017-10-11 21:54:05 +00:00
|
|
|
find(".js-allowed-to-push").click
|
2018-05-23 21:28:08 +00:00
|
|
|
wait_for_requests
|
2017-10-06 22:04:45 +00:00
|
|
|
click_link 'Developers + Masters'
|
2017-10-05 21:41:57 +00:00
|
|
|
end
|
2017-10-06 22:04:45 +00:00
|
|
|
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
|
|
|
|
within form do
|
|
|
|
page.within(".js-allowed-to-merge") do
|
|
|
|
expect(page.find(".dropdown-toggle-text")).to have_content("No one")
|
|
|
|
end
|
|
|
|
page.within(".js-allowed-to-push") do
|
|
|
|
expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Masters")
|
|
|
|
end
|
2017-10-05 21:41:57 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
context 'logged in as admin' do
|
|
|
|
before do
|
|
|
|
sign_in(admin)
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
describe "explicit protected branches" do
|
|
|
|
it "allows creating explicit protected branches" do
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('some-branch')
|
|
|
|
click_on "Protect"
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
within(".protected-branches-list") { expect(page).to have_content('some-branch') }
|
|
|
|
expect(ProtectedBranch.count).to eq(1)
|
|
|
|
expect(ProtectedBranch.last.name).to eq('some-branch')
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
it "displays the last commit on the matching branch if it exists" do
|
|
|
|
commit = create(:commit, project: project)
|
|
|
|
project.repository.add_branch(admin, 'some-branch', commit.id)
|
|
|
|
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('some-branch')
|
|
|
|
click_on "Protect"
|
|
|
|
|
|
|
|
within(".protected-branches-list") { expect(page).to have_content(commit.id[0..7]) }
|
|
|
|
end
|
|
|
|
|
|
|
|
it "displays an error message if the named branch does not exist" do
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('some-branch')
|
|
|
|
click_on "Protect"
|
|
|
|
|
|
|
|
within(".protected-branches-list") { expect(page).to have_content('branch was removed') }
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
describe "wildcard protected branches" do
|
|
|
|
it "allows creating protected branches with a wildcard" do
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('*-stable')
|
|
|
|
click_on "Protect"
|
|
|
|
|
|
|
|
within(".protected-branches-list") { expect(page).to have_content('*-stable') }
|
|
|
|
expect(ProtectedBranch.count).to eq(1)
|
|
|
|
expect(ProtectedBranch.last.name).to eq('*-stable')
|
|
|
|
end
|
2016-08-16 05:09:13 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
it "displays the number of matching branches" do
|
|
|
|
project.repository.add_branch(admin, 'production-stable', 'master')
|
|
|
|
project.repository.add_branch(admin, 'staging-stable', 'master')
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('*-stable')
|
|
|
|
click_on "Protect"
|
2016-06-17 08:49:02 +00:00
|
|
|
|
2018-04-04 10:37:44 +00:00
|
|
|
within(".protected-branches-list") do
|
|
|
|
expect(page).to have_content("Protected branch (2)")
|
|
|
|
expect(page).to have_content("2 matching branches")
|
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
2017-09-15 11:25:12 +00:00
|
|
|
|
|
|
|
it "displays all the branches matching the wildcard" do
|
|
|
|
project.repository.add_branch(admin, 'production-stable', 'master')
|
|
|
|
project.repository.add_branch(admin, 'staging-stable', 'master')
|
|
|
|
project.repository.add_branch(admin, 'development', 'master')
|
|
|
|
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
set_protected_branch_name('*-stable')
|
|
|
|
click_on "Protect"
|
|
|
|
|
|
|
|
visit project_protected_branches_path(project)
|
|
|
|
click_on "2 matching branches"
|
|
|
|
|
|
|
|
within(".protected-branches-list") do
|
|
|
|
expect(page).to have_content("production-stable")
|
|
|
|
expect(page).to have_content("staging-stable")
|
|
|
|
expect(page).not_to have_content("development")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "access control" do
|
|
|
|
include_examples "protected branches > access control > CE"
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|
|
|
|
end
|
2016-07-08 08:48:50 +00:00
|
|
|
|
2017-09-15 11:25:12 +00:00
|
|
|
def set_protected_branch_name(branch_name)
|
2017-10-11 21:54:05 +00:00
|
|
|
find(".js-protected-branch-select").click
|
2017-09-15 11:25:12 +00:00
|
|
|
find(".dropdown-input-field").set(branch_name)
|
|
|
|
click_on("Create wildcard #{branch_name}")
|
2016-07-08 08:48:50 +00:00
|
|
|
end
|
2016-06-17 08:49:02 +00:00
|
|
|
end
|