From fe438d0287ead7f07d9281261b5b079fd11147be Mon Sep 17 00:00:00 2001
From: Fabio Papa <fabtheman@gmail.com>
Date: Mon, 1 Jul 2019 09:17:26 -0700
Subject: Clean up the show_spec examples previously added

---
 spec/features/groups/show_spec.rb | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index 48ba9064327..ef0e885ee5f 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -56,27 +56,28 @@ describe 'Group show page' do
   end
 
   context 'subgroup support' do
+    let(:restricted_group) { create(:group,
+                                    subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
+    let(:relaxed_group) { create(:group,
+                                 subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
     let(:owner) { create(:user) }
     let(:maintainer) { create(:user) }
 
-    before do
-      group.add_owner(owner)
-      group.add_maintainer(maintainer)
-    end
-
     context 'for owners' do
+      let(:path) { group_path(restricted_group) }
+
       before do
+        restricted_group.add_owner(owner)
         sign_in(owner)
       end
 
       context 'when subgroups are supported', :js, :nested_groups do
         before do
           allow(Group).to receive(:supports_nested_objects?) { true }
+          visit path
         end
 
         it 'allows creating subgroups' do
-          visit path
-
           expect(page)
             .to have_css("li[data-text='New subgroup']", visible: false)
         end
@@ -85,11 +86,10 @@ describe 'Group show page' do
       context 'when subgroups are not supported' do
         before do
           allow(Group).to receive(:supports_nested_objects?) { false }
+          visit path
         end
 
         it 'does not allow creating subgroups' do
-          visit path
-
           expect(page)
             .not_to have_selector("li[data-text='New subgroup']", visible: false)
         end
@@ -107,30 +107,30 @@ describe 'Group show page' do
         end
 
         context 'when subgroup_creation_level is set to maintainers' do
-          let(:group) do
-            create(:group,
-                   subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+          before do
+            relaxed_group.add_maintainer(maintainer)
+            path = group_path(relaxed_group)
+            visit path
           end
 
           it 'allows creating subgroups' do
-            visit path
-
             expect(page)
               .to have_css("li[data-text='New subgroup']", visible: false)
           end
         end
 
         context 'when subgroup_creation_level is set to owners' do
-          let(:group) do
-            create(:group,
-                   subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
+          before do
+            restricted_group.add_maintainer(maintainer)
           end
 
           it 'does not allow creating subgroups' do
+            path = group_path(restricted_group)
             visit path
 
             expect(page)
-              .not_to have_css("li[data-text='New subgroup']", visible: false)
+              .not_to have_selector("li[data-text='New subgroup']",
+                                    visible: false)
           end
         end
       end
-- 
cgit v1.2.1