Add integrations menu

Author: oliverguenther

config/locales/en.yml

@@ -3626,6 +3626,7 @@ en:
   label_ical_access_key_generation_hint: "Automatically generated when subscribing to a calendar."
   label_ical_access_key_latest: "latest"
   label_ical_access_key_revoke: "Revoke"
+  label_integrations: "Integrations"
   label_add_column: "Add column"
   label_applied_status: "Applied status"
   label_archive_project: "Archive project"

modules/github_integration/lib/open_project/github_integration/engine.rb

@@ -55,10 +55,16 @@ def self.settings
       settings:
     ) do
       ::Redmine::MenuManager.map(:admin_menu) do |menu|
+        menu.push :admin_integrations,
+                  { controller: "/github_integration/admin/settings", action: "show" },
+                  if: ->(_) { User.current.admin? },
+                  icon: :"git-compare",
+                  caption: :label_integrations
         menu.push :admin_github_integration,
                   { controller: "/github_integration/admin/settings", action: "show" },
+                  parent: :admin_integrations,
                   if: ->(_) { User.current.admin? },
-                  caption: :label_github_integration,
+                  caption: "GitHub",
                   icon: "mark-github"
       end
 

modules/gitlab_integration/lib/open_project/gitlab_integration/engine.rb

@@ -56,8 +56,9 @@ def self.settings
       ::Redmine::MenuManager.map(:admin_menu) do |menu|
         menu.push :admin_gitlab_integration,
                   { controller: "/gitlab_integration/admin/settings", action: "show" },
+                  parent: :admin_integrations,
                   if: ->(_) { User.current.admin? },
-                  caption: :label_gitlab_integration,
+                  caption: "GitLab",
                   icon: :"op-logo-gitlab"
       end
 

spec/features/menu_items/admin_menu_item_spec.rb

@@ -47,8 +47,8 @@
   context "without having any menu items hidden in configuration" do
     it "must display all menu items" do
       expect(page).to have_test_selector("menu-blocks--container")
-      expect(page).to have_test_selector("menu-block", count: 22)
-      expect(page).to have_test_selector("op-menu--item-action", count: 23) # All plus 'overview'
+      expect(page).to have_test_selector("menu-block", count: 23)
+      expect(page).to have_test_selector("op-menu--item-action", count: 24) # All plus 'overview'
     end
   end
 
@@ -58,10 +58,10 @@
           } do
     it "must not display the hidden menu items and blocks" do
       expect(page).to have_test_selector("menu-blocks--container")
-      expect(page).to have_test_selector("menu-block", count: 21)
+      expect(page).to have_test_selector("menu-block", count: 22)
       expect(page).not_to have_test_selector("menu-block", text: I18n.t(:label_color_plural))
 
-      expect(page).to have_test_selector("op-menu--item-action", count: 22) # All plus 'overview'
+      expect(page).to have_test_selector("op-menu--item-action", count: 23) # All plus 'overview'
       expect(page).not_to have_test_selector("op-menu--item-action", text: I18n.t(:label_color_plural))
     end
   end