diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-27 23:01:08 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-27 23:01:08 +0000 |
commit | 36451a753ac442250c1ed5a6427383817434d1ec (patch) | |
tree | fa19d4a05b104c516961dd8bd0289846ccbc213f /spec/models | |
parent | 62a40c5170cbecfc77dcb5fc97a23f3e93898a53 (diff) | |
parent | 8152efbe2fc486520ec5cd11d54a49fbf7e554bf (diff) | |
download | gitlab-ce-36451a753ac442250c1ed5a6427383817434d1ec.tar.gz |
Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'
Remove group and instance clusters feature flag
Closes #63383
See merge request gitlab-org/gitlab-ce!30124
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/concerns/deployment_platform_spec.rb | 10 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 29 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 1 |
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 |