Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 2 insertions, 6 deletions

diff --git a/spec/models/clusters/clusters_hierarchy_spec.rb b/spec/models/clusters/clusters_hierarchy_spec.rb
index 5ac561eb2d0..5dd2fe98352 100644
--- a/spec/models/clusters/clusters_hierarchy_spec.rb
+++ b/spec/models/clusters/clusters_hierarchy_spec.rb
@@ -4,8 +4,8 @@ require 'spec_helper'
 
 RSpec.describe Clusters::ClustersHierarchy do
   describe '#base_and_ancestors' do
-    def base_and_ancestors(clusterable, include_management_project: true)
-      described_class.new(clusterable, include_management_project: include_management_project).base_and_ancestors
+    def base_and_ancestors(clusterable)
+      described_class.new(clusterable).base_and_ancestors
     end
 
     context 'project in nested group with clusters at every level' do
@@ -101,10 +101,6 @@ RSpec.describe Clusters::ClustersHierarchy do
         expect(base_and_ancestors(management_project)).to eq([ancestor, child])
       end
 
-      it 'returns clusters for management_project' do
-        expect(base_and_ancestors(management_project, include_management_project: false)).to eq([child, ancestor])
-      end
-
       it 'returns clusters for project' do
         expect(base_and_ancestors(project)).to eq([child, ancestor])
       end