summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-28 00:17:26 +1200
committerThong Kuah <tkuah@gitlab.com>2019-06-28 00:28:03 +1200
commit3f759e1674b19f9fc7690239c138fca8aeec6434 (patch)
tree2cf01753bf63f2003e1d9af77618194459b2a70c /spec/models
parent47089be063b754b3cc76c47bda7d26876889e5de (diff)
downloadgitlab-ce-3f759e1674b19f9fc7690239c138fca8aeec6434.tar.gz
Remove group_clusters feature flag
Now we have terminals for instance and group clusters we can remove the FF now. Deploying to group clusters has been working without complaints too.
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/concerns/deployment_platform_spec.rb10
-rw-r--r--spec/models/group_spec.rb29
-rw-r--r--spec/models/project_spec.rb1
3 files changed, 0 insertions, 40 deletions
diff --git a/spec/models/concerns/deployment_platform_spec.rb b/spec/models/concerns/deployment_platform_spec.rb
index 96465a51db2..2378f400540 100644
--- a/spec/models/concerns/deployment_platform_spec.rb
+++ b/spec/models/concerns/deployment_platform_spec.rb
@@ -82,16 +82,6 @@ describe DeploymentPlatform do
end
end
end
-
- context 'feature flag disabled' do
- before do
- stub_feature_flags(group_clusters: false)
- end
-
- it 'returns nil' do
- is_expected.to be_nil
- end
- end
end
end
end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index d7accbef6bd..470ce65707d 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -866,35 +866,6 @@ describe Group do
end
end
- describe '#group_clusters_enabled?' do
- before do
- # Override global stub in spec/spec_helper.rb
- expect(Feature).to receive(:enabled?).and_call_original
- end
-
- subject { group.group_clusters_enabled? }
-
- it { is_expected.to be_truthy }
-
- context 'explicitly disabled for root ancestor' do
- before do
- feature = Feature.get(:group_clusters)
- feature.disable(group.root_ancestor)
- end
-
- it { is_expected.to be_falsey }
- end
-
- context 'explicitly disabled for root ancestor' do
- before do
- feature = Feature.get(:group_clusters)
- feature.enable(group.root_ancestor)
- end
-
- it { is_expected.to be_truthy }
- end
- end
-
describe '#first_auto_devops_config' do
using RSpec::Parameterized::TableSyntax
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index cc0f5002a1e..1bc092fa41a 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -497,7 +497,6 @@ describe Project do
it { is_expected.to delegate_method(:members).to(:team).with_prefix(true) }
it { is_expected.to delegate_method(:name).to(:owner).with_prefix(true).with_arguments(allow_nil: true) }
- it { is_expected.to delegate_method(:group_clusters_enabled?).to(:group).with_arguments(allow_nil: true) }
it { is_expected.to delegate_method(:root_ancestor).to(:namespace).with_arguments(allow_nil: true) }
it { is_expected.to delegate_method(:last_pipeline).to(:commit).with_arguments(allow_nil: true) }
end