Commit 3770f3fb authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'spec_cluster_policy_coverage' into 'master'

Improve cluster policy spec coverage

See merge request gitlab-org/gitlab-ce!31700
parents 0297f1c2 b56f2850
...@@ -9,6 +9,8 @@ describe Clusters::InstancePolicy do ...@@ -9,6 +9,8 @@ describe Clusters::InstancePolicy do
describe 'rules' do describe 'rules' do
context 'when user' do context 'when user' do
it { expect(policy).to be_disallowed :read_cluster } it { expect(policy).to be_disallowed :read_cluster }
it { expect(policy).to be_disallowed :add_cluster }
it { expect(policy).to be_disallowed :create_cluster }
it { expect(policy).to be_disallowed :update_cluster } it { expect(policy).to be_disallowed :update_cluster }
it { expect(policy).to be_disallowed :admin_cluster } it { expect(policy).to be_disallowed :admin_cluster }
end end
...@@ -17,6 +19,8 @@ describe Clusters::InstancePolicy do ...@@ -17,6 +19,8 @@ describe Clusters::InstancePolicy do
let(:user) { create(:admin) } let(:user) { create(:admin) }
it { expect(policy).to be_allowed :read_cluster } it { expect(policy).to be_allowed :read_cluster }
it { expect(policy).to be_allowed :add_cluster }
it { expect(policy).to be_allowed :create_cluster }
it { expect(policy).to be_allowed :update_cluster } it { expect(policy).to be_allowed :update_cluster }
it { expect(policy).to be_allowed :admin_cluster } it { expect(policy).to be_allowed :admin_cluster }
end end
......
...@@ -13,7 +13,11 @@ shared_examples 'clusterable policies' do ...@@ -13,7 +13,11 @@ shared_examples 'clusterable policies' do
clusterable.add_developer(current_user) clusterable.add_developer(current_user)
end end
it { expect_disallowed(:read_cluster) }
it { expect_disallowed(:add_cluster) } it { expect_disallowed(:add_cluster) }
it { expect_disallowed(:create_cluster) }
it { expect_disallowed(:update_cluster) }
it { expect_disallowed(:admin_cluster) }
end end
context 'with a maintainer' do context 'with a maintainer' do
...@@ -22,7 +26,11 @@ shared_examples 'clusterable policies' do ...@@ -22,7 +26,11 @@ shared_examples 'clusterable policies' do
end end
context 'with no clusters' do context 'with no clusters' do
it { expect_allowed(:read_cluster) }
it { expect_allowed(:add_cluster) } it { expect_allowed(:add_cluster) }
it { expect_allowed(:create_cluster) }
it { expect_allowed(:update_cluster) }
it { expect_allowed(:admin_cluster) }
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment