summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-10-04 09:19:17 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-10-04 09:19:17 +0000
commit0e1fc6e04c96ce989062e02d9e706031cea87c36 (patch)
tree17eea361f0f9a2fa016514ddf8ed581a0071f97a /spec/features/projects
parent673971c82459f1cb14156233488f2e6121772e35 (diff)
parent2ec43d9e79c0c77f911c48d23fb1ec94a7ca3020 (diff)
downloadgitlab-ce-0e1fc6e04c96ce989062e02d9e706031cea87c36.tar.gz
Merge branch '51009-remove-rbac-clusters-feature-flag' into 'master'
Remove :rbac_clusters feature flag Closes #51009 See merge request gitlab-org/gitlab-ce!22096
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/clusters/gcp_spec.rb4
-rw-r--r--spec/features/projects/clusters/user_spec.rb4
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index edc763ad0ad..8b92b9fc869 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -84,10 +84,8 @@ describe 'Gcp Cluster', :js do
it_behaves_like 'valid cluster gcp form'
- context 'rbac_clusters feature flag is enabled' do
+ context 'RBAC is enabled for the cluster' do
before do
- stub_feature_flags(rbac_clusters: true)
-
check 'cluster_provider_gcp_attributes_legacy_abac'
end
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb
index 2b4998ed5ac..9ae1dba60b5 100644
--- a/spec/features/projects/clusters/user_spec.rb
+++ b/spec/features/projects/clusters/user_spec.rb
@@ -44,10 +44,8 @@ describe 'User Cluster', :js do
it_behaves_like 'valid cluster user form'
- context 'rbac_clusters feature flag is enabled' do
+ context 'RBAC is enabled for the cluster' do
before do
- stub_feature_flags(rbac_clusters: true)
-
check 'cluster_platform_kubernetes_attributes_authorization_type'
end