Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 18 insertions, 2 deletions

diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 4f8e88ae9da..c00b7203af6 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -18,8 +18,8 @@ RSpec.shared_context 'project navbar structure' do
     {
       nav_item: _('Security & Compliance'),
       nav_sub_items: [
-        _('Configuration'),
-        (_('Audit Events') if Gitlab.ee?)
+        (_('Audit Events') if Gitlab.ee?),
+        _('Configuration')
       ]
     }
   end
@@ -71,8 +71,16 @@ RSpec.shared_context 'project navbar structure' do
     ]
   end
 
+  let(:project_context_nav_item) do
+    {
+      nav_item: "#{project.name[0, 1].upcase} #{project.name}",
+      nav_sub_items: []
+    }
+  end
+
   let(:structure) do
     [
+      project_context_nav_item,
       project_information_nav_item,
       {
         nav_item: _('Repository'),
@@ -200,8 +208,16 @@ RSpec.shared_context 'group navbar structure' do
     ]
   end
 
+  let(:group_context_nav_item) do
+    {
+      nav_item: "#{group.name[0, 1].upcase} #{group.name}",
+      nav_sub_items: []
+    }
+  end
+
   let(:structure) do
     [
+      group_context_nav_item,
       group_information_nav_item,
       {
         nav_item: _('Issues'),