Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 16 deletions

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 796b6917fb2..3f149f9d7ee 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -880,22 +880,6 @@ describe Group do
     end
   end
 
-  describe '#has_parent?' do
-    context 'when the group has a parent' do
-      it 'is truthy' do
-        group = create(:group, :nested)
-        expect(group.has_parent?).to be_truthy
-      end
-    end
-
-    context 'when the group has no parent' do
-      it 'is falsy' do
-        group = create(:group, parent: nil)
-        expect(group.has_parent?).to be_falsy
-      end
-    end
-  end
-
   context 'with uploads' do
     it_behaves_like 'model with uploads', true do
       let(:model_object) { create(:group, :with_avatar) }