Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 4 deletions

diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index e348eb80b1a..5662465d431 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -7,14 +7,22 @@ describe 'Group navbar' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }
 
+    let(:analytics_nav_item) do
+      {
+        nav_item: _('Analytics'),
+        nav_sub_items: [
+          _('Contribution Analytics')
+        ]
+      }
+    end
+
     let(:structure) do
       [
         {
           nav_item: _('Group overview'),
           nav_sub_items: [
             _('Details'),
-            _('Activity'),
-            (_('Contribution Analytics') if Gitlab.ee?)
+            _('Activity')
           ]
         },
         {
@@ -34,6 +42,7 @@ describe 'Group navbar' do
           nav_item: _('Kubernetes'),
           nav_sub_items: []
         },
+        (analytics_nav_item if Gitlab.ee?),
         {
           nav_item: _('Members'),
           nav_sub_items: []
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index f87bd5ca529..4917a0b0a59 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -59,13 +59,13 @@ describe 'Project navbar' do
             _('Environments'),
             _('Error Tracking'),
             _('Serverless'),
-            _('Kubernetes'),
-            _('Auto DevOps')
+            _('Kubernetes')
           ]
         },
         {
           nav_item: _('Analytics'),
           nav_sub_items: [
+            _('CI / CD Analytics'),
             (_('Code Review') if Gitlab.ee?),
             _('Cycle Analytics'),
             _('Repository Analytics')