Merge branch 'group-settings-fix' into 'master'

Fix sidebar navigation issue when viewing Group Settings pages

Fix for #3

See merge request !21

CHANGELOG-EE

 v 8.0.0 (unreleased)
+  - Fix navigation issue when viewing Group Settings pages
 
 v 7.14.0
   - Disable adding, updating and removing members from a group that is synced with LDAP

app/controllers/audit_events_controller.rb

@@ -29,7 +29,7 @@ class AuditEventsController < ApplicationController
     if @project
       'project_settings'
     elsif @group
-      'group'
+      'group_settings'
     end
   end
 

app/controllers/groups/hooks_controller.rb

@@ -5,7 +5,7 @@ class Groups::HooksController < Groups::ApplicationController
 
   respond_to :html
 
-  layout "group"
+  layout 'group_settings'
 
   def index
     @hooks = @group.hooks

app/controllers/groups/ldap_group_links_controller.rb

@@ -3,7 +3,7 @@ class Groups::LdapGroupLinksController < Groups::ApplicationController
   before_action :require_ldap_enabled
   before_action :authorize_admin_group!
 
-  layout 'group'
+  layout 'group_settings'
 
   def index
   end

features/group_active_tab.feature

+Feature: Group Active Tab
+  Background:
+    Given I sign in as "John Doe"
+    And "John Doe" is owner of group "Owned"
+    When I visit group "Owned" settings page
+
+  Scenario: On Audit events
+    When I go to "Audit Events"
+    Then the active sub nav should be Audit Events
+    And no other sub navs should be active
+    And the active main tab should be Settings
+
+  Scenario: On Web Hooks
+    When I go to "Web Hooks"
+    Then the active sub nav should be Web Hooks
+    And no other sub navs should be active
+    And the active main tab should be Settings
+

features/steps/group_active_tab.rb

+class Spinach::Features::GroupActiveTab < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedUser
+  include SharedGroup
+  include SharedPaths
+  include SharedActiveTab
+
+  step 'the active sub nav should be Audit Events' do
+    ensure_active_sub_nav('Audit Events')
+  end
+
+  step 'the active main tab should be Settings' do
+    page.within '.nav-sidebar' do
+      expect(page).to have_content('Back to group')
+    end
+  end
+
+  step 'the active sub nav should be Web Hooks' do
+    ensure_active_sub_nav('Web Hooks')
+  end
+
+  step 'I go to "Audit Events"' do
+    click_link 'Audit Events'
+  end
+
+  step 'I go to "Web Hooks"' do
+    click_link 'Web Hooks'
+  end
+end