diff options
author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-25 05:45:43 +0300 |
---|---|---|
committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-26 12:29:53 +0300 |
commit | 48717b434d583a0be1f22803edd6948c13e11591 (patch) | |
tree | 1d03ffc89bd912f79759877ce0ef42018429e636 /spec/policies/protected_branch_policy_spec.rb | |
parent | b6a4c0181b2a3d8bebde549cb9ad8dc6da8361d6 (diff) |
Revert exploratory branch restriction policy
Diffstat (limited to 'spec/policies/protected_branch_policy_spec.rb')
-rw-r--r-- | spec/policies/protected_branch_policy_spec.rb | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/spec/policies/protected_branch_policy_spec.rb b/spec/policies/protected_branch_policy_spec.rb index decddfde89a..b39de42d721 100644 --- a/spec/policies/protected_branch_policy_spec.rb +++ b/spec/policies/protected_branch_policy_spec.rb @@ -8,53 +8,15 @@ describe ProtectedBranchPolicy do subject { described_class.new(user, protected_branch) } - context 'when unprotection restriction feature is disabled' do - it "branches can't be updated by guests" do - project.add_guest(user) + it 'branches can be updated via project masters' do + project.add_master(user) - is_expected.to be_disallowed(:update_protected_branch) - end - - it 'branches can be updated via access to project settings' do - project.add_master(user) - - is_expected.to be_allowed(:update_protected_branch) - end + is_expected.to be_allowed(:update_protected_branch) end - context 'when unprotection restriction feature is enabled' do - before do - # stub_licensed_features(unprotection_restrictions: true) - end - - context 'and unprotection is limited to admins' do #TODO: remove this is temporary exploration - before do - stub_application_setting(only_admins_can_unprotect_master_branch: true) - end - - context 'and the protection is for master' do - let(:name) { 'master' } - - it 'project owners cannot remove protections' do - project.add_master(user) - - is_expected.not_to be_allowed(:update_protected_branch) - end - - it 'admins can remove protections' do - user.update!(admin: true) - - is_expected.to be_allowed(:update_protected_branch) - end - end - - context "and the protection isn't for master" do - it 'project owners can remove protections' do - project.add_master(user) + it "branches can't be updated by guests" do + project.add_guest(user) - is_expected.to be_allowed(:update_protected_branch) - end - end - end + is_expected.to be_disallowed(:update_protected_branch) end end |