Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 6 deletions

diff --git a/spec/features/groups/new_group_page_spec.rb b/spec/features/groups/new_group_page_spec.rb
index a07c27331d9..4670df3fb5e 100644
--- a/spec/features/groups/new_group_page_spec.rb
+++ b/spec/features/groups/new_group_page_spec.rb
@@ -3,15 +3,14 @@
 require 'spec_helper'
 
 RSpec.describe 'New group page', :js, feature_category: :subgroups do
-  let(:user)  { create(:user) }
-  let(:group) { create(:group) }
+  let_it_be(:user)  { create(:user) }
+  let_it_be(:parent_group) { create(:group) }
 
   before do
+    parent_group.add_owner(user)
     sign_in(user)
   end
 
-  it_behaves_like 'a dashboard page with sidebar', :new_group_path, :groups
-
   describe 'new top level group alert' do
     context 'when a user visits the new group page' do
       it 'shows the new top level group alert' do
@@ -22,8 +21,6 @@ RSpec.describe 'New group page', :js, feature_category: :subgroups do
     end
 
     context 'when a user visits the new sub group page' do
-      let(:parent_group) { create(:group) }
-
       it 'does not show the new top level group alert' do
         visit new_group_path(parent_id: parent_group.id, anchor: 'create-group-pane')
 
@@ -31,4 +28,19 @@ RSpec.describe 'New group page', :js, feature_category: :subgroups do
       end
     end
   end
+
+  describe 'sidebar' do
+    context 'for a new top-level group' do
+      it_behaves_like 'a dashboard page with sidebar', :new_group_path, :groups
+    end
+
+    context 'for a new subgroup' do
+      it 'shows the group sidebar of the parent group' do
+        visit new_group_path(parent_id: parent_group.id, anchor: 'create-group-pane')
+        expect(page).to have_selector(
+          ".nav-sidebar[aria-label=\"Group navigation\"] .context-header[title=\"#{parent_group.name}\"]"
+        )
+      end
+    end
+  end
 end