Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-27 15:29:19 +0300
committerThong Kuah <tkuah@gitlab.com>2019-06-27 16:24:05 +0300
commit8152efbe2fc486520ec5cd11d54a49fbf7e554bf (patch)
tree224aa61a7751385b9963faaf773f3b9f3d9e6dcc /spec/policies
parent3f759e1674b19f9fc7690239c138fca8aeec6434 (diff)
Remove instance_clusters feature_flag
Now we have terminals for instance and group clusters we can remove the FF now. Deploying to instance clusters has been working without complaints too.
Diffstat (limited to 'spec/policies')
-rw-r--r--spec/policies/clusters/instance_policy_spec.rb18
1 files changed, 3 insertions, 15 deletions
diff --git a/spec/policies/clusters/instance_policy_spec.rb b/spec/policies/clusters/instance_policy_spec.rb
index 9d755c6d29d..7b61819e079 100644
--- a/spec/policies/clusters/instance_policy_spec.rb
+++ b/spec/policies/clusters/instance_policy_spec.rb
@@ -16,21 +16,9 @@ describe Clusters::InstancePolicy do
context 'when admin' do
let(:user) { create(:admin) }
- context 'with instance_level_clusters enabled' do
- it { expect(policy).to be_allowed :read_cluster }
- it { expect(policy).to be_allowed :update_cluster }
- it { expect(policy).to be_allowed :admin_cluster }
- end
-
- context 'with instance_level_clusters disabled' do
- before do
- stub_feature_flags(instance_clusters: false)
- end
-
- it { expect(policy).to be_disallowed :read_cluster }
- it { expect(policy).to be_disallowed :update_cluster }
- it { expect(policy).to be_disallowed :admin_cluster }
- end
+ it { expect(policy).to be_allowed :read_cluster }
+ it { expect(policy).to be_allowed :update_cluster }
+ it { expect(policy).to be_allowed :admin_cluster }
end
end
end