Merge branch '342793-update-title' into 'master'

Updates Compliance nav item and breadcrumb to use sentence casing

See merge request gitlab-org/gitlab!72226

ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb

@@ -66,7 +66,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('Security Dashboard'),
+              title: _('Security dashboard'),
               link: project_security_dashboard_index_path(context.project),
               active_routes: { path: 'projects/security/dashboard#index' },
               item_id: :dashboard
@@ -79,7 +79,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('Vulnerability Report'),
+              title: _('Vulnerability report'),
               link: project_security_vulnerability_report_index_path(context.project),
               active_routes: { path: %w[projects/security/vulnerability_report#index projects/security/vulnerabilities#show] },
               item_id: :vulnerability_report
@@ -98,7 +98,7 @@ module EE
                    end
 
             ::Sidebars::MenuItem.new(
-              title: s_('OnDemandScans|On-demand Scans'),
+              title: s_('OnDemandScans|On-demand scans'),
               link: link,
               item_id: :on_demand_scans,
               active_routes: { path: %w[
@@ -115,7 +115,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('Dependency List'),
+              title: _('Dependency list'),
               link: project_dependencies_path(context.project),
               active_routes: { path: 'projects/dependencies#index' },
               item_id: :dependency_list
@@ -128,7 +128,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('License Compliance'),
+              title: _('License compliance'),
               link: project_licenses_path(context.project),
               active_routes: { path: 'projects/licenses#index' },
               item_id: :license_compliance
@@ -141,7 +141,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('Threat Monitoring'),
+              title: _('Threat monitoring'),
               link: project_threat_monitoring_path(context.project),
               active_routes: { controller: ['projects/threat_monitoring'] },
               item_id: :threat_monitoring
@@ -167,7 +167,7 @@ module EE
             end
 
             ::Sidebars::MenuItem.new(
-              title: _('Audit Events'),
+              title: _('Audit events'),
               link: project_audit_events_path(context.project),
               active_routes: { controller: :audit_events },
               item_id: :audit_events

ee/lib/sidebars/groups/menus/security_compliance_menu.rb

@@ -52,7 +52,7 @@ module Sidebars
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Security Dashboard'),
+            title: _('Security dashboard'),
             link: group_security_dashboard_path(context.group),
             active_routes: { path: 'dashboard#show' },
             item_id: :security_dashboard
@@ -65,7 +65,7 @@ module Sidebars
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Vulnerability Report'),
+            title: _('Vulnerability report'),
             link: group_security_vulnerabilities_path(context.group),
             active_routes: { path: 'vulnerabilities#index' },
             item_id: :vulnerability_report
@@ -115,7 +115,7 @@ module Sidebars
           end
 
           ::Sidebars::MenuItem.new(
-            title: _('Audit Events'),
+            title: _('Audit events'),
             link: group_audit_events_path(context.group),
             active_routes: { path: 'audit_events#index' },
             item_id: :audit_events

ee/spec/controllers/projects/dependencies_controller_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Projects::DependenciesController do
           it { expect(response).to have_gitlab_http_status(:ok) }
 
           it 'renders the side navigation with the correct submenu set as active' do
-            expect(response.body).to have_active_sub_navigation('Dependency List')
+            expect(response.body).to have_active_sub_navigation('Dependency list')
           end
         end
 

ee/spec/features/groups/audit_events_spec.rb

@@ -28,17 +28,17 @@ RSpec.describe 'Groups > Audit Events', :js do
       expect(reqs.first.status_code).to eq(404)
     end
 
-    it 'does not have Audit Events button in head nav bar' do
+    it 'does not have Audit events button in head nav bar' do
       visit group_security_dashboard_path(group)
 
-      expect(page).not_to have_link('Audit Events')
+      expect(page).not_to have_link('Audit events')
     end
   end
 
-  it 'has Audit Events button in head nav bar' do
+  it 'has Audit events button in head nav bar' do
     visit group_audit_events_path(group)
 
-    expect(page).to have_link('Audit Events')
+    expect(page).to have_link('Audit events')
   end
 
   describe 'changing a user access level' do
@@ -54,7 +54,7 @@ RSpec.describe 'Groups > Audit Events', :js do
 
       page.within('.sidebar-top-level-items') do
         find(:link, text: 'Security & Compliance').click
-        click_link 'Audit Events'
+        click_link 'Audit events'
       end
 
       page.within('.audit-log-table') do

ee/spec/features/groups/navbar_spec.rb

@@ -145,10 +145,10 @@ RSpec.describe 'Group navbar' do
       {
         nav_item: _('Security & Compliance'),
         nav_sub_items: [
-          _('Security Dashboard'),
-          _('Vulnerability Report'),
+          _('Security dashboard'),
+          _('Vulnerability report'),
           _('Compliance report'),
-          _('Audit Events')
+          _('Audit events')
         ]
       }
     end

ee/spec/features/projects/audit_events_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Projects > Audit Events', :js do
     it 'does not have Audit Events button in head nav bar' do
       visit edit_project_path(project)
 
-      expect(page).not_to have_link('Audit Events')
+      expect(page).not_to have_link('Audit events')
     end
   end
 
@@ -57,7 +57,7 @@ RSpec.describe 'Projects > Audit Events', :js do
     it 'has Audit Events button in head nav bar' do
       visit project_audit_events_path(project)
 
-      expect(page).to have_link('Audit Events')
+      expect(page).to have_link('Audit events')
     end
 
     it 'does not have Project audit events in the header' do
@@ -70,7 +70,7 @@ RSpec.describe 'Projects > Audit Events', :js do
   it 'has Audit Events button in head nav bar' do
     visit project_audit_events_path(project)
 
-    expect(page).to have_link('Audit Events')
+    expect(page).to have_link('Audit events')
   end
 
   it 'has Project audit events in the header' do
@@ -122,7 +122,7 @@ RSpec.describe 'Projects > Audit Events', :js do
 
       page.within('.sidebar-top-level-items') do
         find(:link, text: 'Security & Compliance').click
-        click_link 'Audit Events'
+        click_link 'Audit events'
       end
 
       page.within('.audit-log-table') do
@@ -160,7 +160,7 @@ RSpec.describe 'Projects > Audit Events', :js do
 
             wait_for_all_requests
 
-            click_link 'Audit Events'
+            click_link 'Audit events'
           end
 
           wait_for_all_requests

ee/spec/features/projects/navbar_spec.rb

@@ -40,10 +40,10 @@ RSpec.describe 'Project navbar' do
       {
         nav_item: _('Security & Compliance'),
         nav_sub_items: [
-          _('Security Dashboard'),
-          _('Vulnerability Report'),
-          s_('OnDemandScans|On-demand Scans'),
-          _('Audit Events'),
+          _('Security dashboard'),
+          _('Vulnerability report'),
+          s_('OnDemandScans|On-demand scans'),
+          _('Audit events'),
           _('Configuration')
         ]
       }

ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb

@@ -198,7 +198,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
           render
 
           expect(rendered).not_to have_link 'Security & Compliance'
-          expect(rendered).not_to have_link 'Audit Events'
+          expect(rendered).not_to have_link 'Audit events'
         end
       end
 
@@ -212,7 +212,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
           render
 
           expect(rendered).to have_link 'Security & Compliance'
-          expect(rendered).to have_link 'Audit Events'
+          expect(rendered).to have_link 'Audit events'
         end
       end
     end

ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -176,27 +176,27 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       end
 
       it 'security dashboard link is visible' do
-        expect(rendered).to have_link('Security Dashboard', href: project_security_dashboard_index_path(project))
+        expect(rendered).to have_link('Security dashboard', href: project_security_dashboard_index_path(project))
       end
 
       it 'security vulnerability report link is visible' do
-        expect(rendered).to have_link('Vulnerability Report', href: project_security_vulnerability_report_index_path(project))
+        expect(rendered).to have_link('Vulnerability report', href: project_security_vulnerability_report_index_path(project))
       end
 
       it 'security on demand scans link is visible' do
-        expect(rendered).to have_link('On-demand Scans', href: project_on_demand_scans_path(project))
+        expect(rendered).to have_link('On-demand scans', href: project_on_demand_scans_path(project))
       end
 
       it 'dependency list link is visible' do
-        expect(rendered).to have_link('Dependency List', href: project_dependencies_path(project))
+        expect(rendered).to have_link('Dependency list', href: project_dependencies_path(project))
       end
 
       it 'license compliance link is visible' do
-        expect(rendered).to have_link('License Compliance', href: project_licenses_path(project))
+        expect(rendered).to have_link('License compliance', href: project_licenses_path(project))
       end
 
       it 'threat monitoring link is visible' do
-        expect(rendered).to have_link('Threat Monitoring', href: project_threat_monitoring_path(project))
+        expect(rendered).to have_link('Threat monitoring', href: project_threat_monitoring_path(project))
       end
 
       it 'policies link is visible' do
@@ -208,7 +208,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       end
 
       it 'audit events link is visible' do
-        expect(rendered).to have_link('Audit Events', href: project_audit_events_path(project))
+        expect(rendered).to have_link('Audit events', href: project_audit_events_path(project))
       end
     end
 
@@ -224,7 +224,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       end
 
       it 'links to on-demand scans form instead of index page' do
-        expect(rendered).to have_link('On-demand Scans', href: new_project_on_demand_scan_path(project))
+        expect(rendered).to have_link('On-demand scans', href: new_project_on_demand_scan_path(project))
       end
     end
   end

locale/gitlab.pot

@@ -4818,6 +4818,9 @@ msgstr ""
 msgid "Audit Events"
 msgstr ""
 
+msgid "Audit events"
+msgstr ""
+
 msgid "AuditLogs|(removed)"
 msgstr ""
 
@@ -11429,6 +11432,9 @@ msgstr ""
 msgid "Dependency Scanning"
 msgstr ""
 
+msgid "Dependency list"
+msgstr ""
+
 msgid "DependencyProxy|Cached %{time}"
 msgstr ""
 
@@ -20702,6 +20708,9 @@ msgstr ""
 msgid "License Compliance"
 msgstr ""
 
+msgid "License compliance"
+msgstr ""
+
 msgid "License file"
 msgstr ""
 
@@ -35855,7 +35864,7 @@ msgstr ""
 msgid "Thread to reply to cannot be found"
 msgstr ""
 
-msgid "Threat Monitoring"
+msgid "Threat monitoring"
 msgstr ""
 
 msgid "ThreatMonitoring|Alert Details"
@@ -38552,6 +38561,9 @@ msgstr ""
 msgid "Vulnerability remediated. Review before resolving."
 msgstr ""
 
+msgid "Vulnerability report"
+msgstr ""
+
 msgid "Vulnerability resolved in %{branch}"
 msgstr ""
 

qa/qa/ee/page/group/menu.rb

@@ -72,7 +72,7 @@ module QA
           def click_group_security_link
             hover_security_and_compliance do
               within_submenu do
-                click_element(:sidebar_menu_item_link, menu_item: 'Security Dashboard')
+                click_element(:sidebar_menu_item_link, menu_item: 'Security dashboard')
               end
             end
           end
@@ -80,7 +80,7 @@ module QA
           def click_group_vulnerability_link
             hover_security_and_compliance do
               within_submenu do
-                click_element(:sidebar_menu_item_link, menu_item: 'Vulnerability Report')
+                click_element(:sidebar_menu_item_link, menu_item: 'Vulnerability report')
               end
             end
           end
@@ -88,7 +88,7 @@ module QA
           def go_to_audit_events
             hover_security_and_compliance do
               within_submenu do
-                click_element(:sidebar_menu_item_link, menu_item: 'Audit Events')
+                click_element(:sidebar_menu_item_link, menu_item: 'Audit events')
               end
             end
           end

qa/qa/ee/page/project/sub_menus/license_compliance.rb

@@ -11,7 +11,7 @@ module QA
             def click_on_license_compliance
               hover_security_compliance do
                 within_submenu do
-                  click_element(:sidebar_menu_item_link, menu_item: 'License Compliance')
+                  click_element(:sidebar_menu_item_link, menu_item: 'License compliance')
                 end
               end
             end

qa/qa/ee/page/project/sub_menus/security_compliance.rb

@@ -10,14 +10,14 @@ module QA
 
             def click_on_security_dashboard
               within_sidebar do
-                click_element(:sidebar_menu_item_link, menu_item: 'Security Dashboard')
+                click_element(:sidebar_menu_item_link, menu_item: 'Security dashboard')
               end
             end
 
             def click_on_dependency_list
               hover_security_compliance do
                 within_submenu do
-                  click_element(:sidebar_menu_item_link, menu_item: 'Dependency List')
+                  click_element(:sidebar_menu_item_link, menu_item: 'Dependency list')
                 end
               end
             end
@@ -25,7 +25,7 @@ module QA
             def click_on_threat_monitoring
               hover_security_compliance do
                 within_submenu do
-                  click_element(:sidebar_menu_item_link, menu_item: 'Threat Monitoring')
+                  click_element(:sidebar_menu_item_link, menu_item: 'Threat monitoring')
                 end
               end
             end
@@ -41,7 +41,7 @@ module QA
             def click_on_vulnerability_report
               hover_security_compliance do
                 within_submenu do
-                  click_element(:sidebar_menu_item_link, menu_item: 'Vulnerability Report')
+                  click_element(:sidebar_menu_item_link, menu_item: 'Vulnerability report')
                 end
               end
             end
@@ -65,7 +65,7 @@ module QA
             def go_to_audit_events_settings
               hover_security_compliance do
                 within_submenu do
-                  click_element(:sidebar_menu_item_link, menu_item: 'Audit Events')
+                  click_element(:sidebar_menu_item_link, menu_item: 'Audit events')
                 end
               end
             end

spec/support/shared_contexts/navbar_structure_context.rb

@@ -5,7 +5,7 @@ RSpec.shared_context 'project navbar structure' do
     {
       nav_item: _('Security & Compliance'),
       nav_sub_items: [
-        (_('Audit Events') if Gitlab.ee?),
+        (_('Audit events') if Gitlab.ee?),
         _('Configuration')
       ]
     }
@@ -165,7 +165,7 @@ RSpec.shared_context 'group navbar structure' do
     {
       nav_item: _('Security & Compliance'),
       nav_sub_items: [
-        _('Audit Events')
+        _('Audit events')
       ]
     }
   end