Style rules; Revert some examples

8 files changed, 52 insertions, 22 deletions

diff --git a/db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb b/db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
index b0ea74d4765..eed0ba25f27 100644
--- a/db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
+++ b/db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
@@ -5,10 +5,13 @@ class AddGroupCreationLevelToNamespaces < ActiveRecord::Migration[5.1]
 
   DOWNTIME = false
   disable_ddl_transaction!
-  
+
   def up
     unless column_exists?(:namespaces, :subgroup_creation_level)
-      add_column_with_default(:namespaces, :subgroup_creation_level, :integer, default: 0)
+      add_column_with_default(:namespaces,
+                              :subgroup_creation_level,
+                              :integer,
+                              default: 0)
     end
   end
 
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index df11321537f..72f389513f8 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -70,9 +70,14 @@ describe Admin::GroupsController do
     end
 
     it 'updates the subgroup_creation_level successfully' do
+      MAINTAINER = ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS
+
       expect do
-        post :update, params: { id: group.to_param, group: { subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS } }
-      end.to change { group.reload.subgroup_creation_level }.to(::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+        post :update,
+             params: { id: group.to_param,
+                       group: { subgroup_creation_level: MAINTAINER } }
+      end.to change { group.reload.subgroup_creation_level }
+               .to(MAINTAINER)
     end
   end
 end
diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb
index 95534d5a2ba..676769c25fe 100644
--- a/spec/features/groups/group_settings_spec.rb
+++ b/spec/features/groups/group_settings_spec.rb
@@ -92,7 +92,7 @@ describe 'Edit group settings' do
       expect(page).to have_content('Allowed to create subgroups')
     end
   end
-  
+
   describe 'edit group avatar' do
     before do
       visit edit_group_path(group)
diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index 68fa3f4e817..163906010fa 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -76,7 +76,8 @@ describe 'Group show page' do
         end
 
         it 'allows creating subgroups' do
-          expect(page).to have_css("li[data-text='New subgroup']", visible: false)
+          expect(page)
+            .to have_css("li[data-text='New subgroup']", visible: false)
         end
       end
 
@@ -87,7 +88,8 @@ describe 'Group show page' do
         end
 
         it 'does not allow creating subgroups' do
-          expect(page).not_to have_selector("li[data-text='New subgroup']", visible: false)
+          expect(page)
+            .not_to have_selector("li[data-text='New subgroup']", visible: false)
         end
       end
     end
@@ -104,8 +106,11 @@ describe 'Group show page' do
         end
 
         context 'when subgroup_creation_level is set to maintainer' do
-          let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
-          
+          let(:group) do
+            create(:group,
+                   subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+          end
+
           it 'allows creating subgroups' do
             visit path
             expect(page).to have_css("li[data-text='New subgroup']", visible: false)
@@ -113,11 +118,15 @@ describe 'Group show page' do
         end
 
         context 'when subgroup_creation_level is set to owners' do
-          let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
+          let(:group) do
+            create(:group,
+                   subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
+          end
 
           it 'does not allow creating subgroups' do
             visit path
-            expect(page).not_to have_css("li[data-text='New subgroup']", visible: false)
+            expect(page)
+              .not_to have_css("li[data-text='New subgroup']", visible: false)
           end
         end
       end
@@ -129,7 +138,8 @@ describe 'Group show page' do
         end
 
         it 'does not allow creating subgroups' do
-          expect(page).not_to have_selector("li[data-text='New subgroup']", visible: false)
+          expect(page)
+            .not_to have_selector("li[data-text='New subgroup']", visible: false)
         end
       end
     end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 426e2526a01..2b85b281d33 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1028,7 +1028,8 @@ describe Group do
     it 'outputs the default one if it is nil' do
       group = create(:group, subgroup_creation_level: nil)
 
-      expect(group.subgroup_creation_level).to eq(::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+      expect(group.subgroup_creation_level)
+        .to eq(::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
     end
   end
 end
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index aed9a8e34ff..da186f63eca 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -145,7 +145,8 @@ describe GroupPolicy do
 
       it 'allows every owner permission except creating subgroups' do
         create_subgroup_permission = [:create_subgroup]
-        updated_owner_permissions = owner_permissions - create_subgroup_permission
+        updated_owner_permissions =
+          owner_permissions - create_subgroup_permission
 
         expect_disallowed(*create_subgroup_permission)
         expect_allowed(*updated_owner_permissions)
@@ -157,7 +158,8 @@ describe GroupPolicy do
 
       it 'allows every owner permission except creating subgroups' do
         create_subgroup_permission = [:create_subgroup]
-        updated_owner_permissions = owner_permissions - create_subgroup_permission
+        updated_owner_permissions =
+          owner_permissions - create_subgroup_permission
 
         expect_disallowed(*create_subgroup_permission)
         expect_allowed(*updated_owner_permissions)
@@ -169,7 +171,8 @@ describe GroupPolicy do
 
       it 'allows every maintainer permission except creating subgroups' do
         create_subgroup_permission = [:create_subgroup]
-        updated_maintainer_permissions = maintainer_permissions - create_subgroup_permission
+        updated_maintainer_permissions =
+          maintainer_permissions - create_subgroup_permission
 
         expect_disallowed(*create_subgroup_permission)
         expect_allowed(*updated_maintainer_permissions)
@@ -475,7 +478,11 @@ describe GroupPolicy do
 
   context "create_subgroup" do
     context 'when group has subgroup creation level set to owner' do
-      let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
+      let(:group) do
+        create(
+          :group,
+          subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -503,7 +510,11 @@ describe GroupPolicy do
     end
 
     context 'when group has subgroup creation level set to maintainer' do
-      let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
+      let(:group) do
+        create(
+          :group,
+          subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 52d926d5484..c41408fba65 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -803,10 +803,10 @@ describe API::Groups do
           group2.add_maintainer(user1)
         end
 
-        it 'can create subgroups' do
+        it 'cannot create subgroups' do
           post api("/groups", user1), params: { parent_id: group2.id, name: 'foo', path: 'foo' }
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index b4e6ddddfac..267ad529d3b 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -89,9 +89,9 @@ describe Groups::CreateService, '#execute' do
         it { is_expected.to be_persisted }
       end
 
-      context 'as maintainer' do
+      context 'as Owner' do
         before do
-          group.add_maintainer(user)
+          group.add_owner(user)
         end
 
         it { is_expected.to be_persisted }