Add latest changes from gitlab-org/gitlab@master

6 files changed, 35 insertions, 12 deletions

diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index 823c8cc8fad..a71b930d35f 100644
--- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -47,7 +47,7 @@ describe 'The group page' do
         expect(page).to have_link('Group overview')
         expect(page).to have_link('Details')
         expect(page).not_to have_link('Activity')
-        expect(page).not_to have_link('Contribution Analytics')
+        expect(page).not_to have_link('Contribution')
 
         expect(page).not_to have_link('Issues')
         expect(page).not_to have_link('Merge Requests')
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index 4d45bcf639d..0c457c11fce 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -10,7 +10,7 @@ describe 'Group navbar' do
     {
       nav_item: _('Analytics'),
       nav_sub_items: [
-        _('Contribution Analytics')
+        _('Contribution')
       ]
     }
   end
@@ -63,7 +63,7 @@ describe 'Group navbar' do
       before do
         stub_licensed_features(productivity_analytics: true)
 
-        analytics_nav_item[:nav_sub_items] << _('Productivity Analytics')
+        analytics_nav_item[:nav_sub_items] << _('Productivity')
 
         group.add_maintainer(user)
         sign_in(user)
@@ -78,7 +78,7 @@ describe 'Group navbar' do
       before do
         stub_licensed_features(cycle_analytics_for_groups: true)
 
-        analytics_nav_item[:nav_sub_items] << _('Value Stream Analytics')
+        analytics_nav_item[:nav_sub_items] << _('Value Stream')
 
         group.add_maintainer(user)
         sign_in(user)
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 9baba80bf06..e7c675bf6bf 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -225,6 +225,29 @@ describe 'Issue Sidebar' do
     it 'does not have a option to edit labels' do
       expect(page).not_to have_selector('.block.labels .edit-link')
     end
+
+    context 'interacting with collapsed sidebar', :js do
+      collapsed_sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed'
+      expanded_sidebar_selector = 'aside.right-sidebar.right-sidebar-expanded'
+      lock_sidebar_block = '.block.lock'
+      lock_button = '.block.lock .btn-close'
+      collapsed_sidebar_block_icon = '.sidebar-collapsed-icon'
+
+      before do
+        resize_screen_sm
+      end
+
+      it 'expands then does not show the lock dialog form' do
+        expect(page).to have_css(collapsed_sidebar_selector)
+
+        page.within(lock_sidebar_block) do
+          find(collapsed_sidebar_block_icon).click
+        end
+
+        expect(page).to have_css(expanded_sidebar_selector)
+        expect(page).not_to have_selector(lock_button)
+      end
+    end
   end
 
   def visit_issue(project, issue)
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb
index d7060c63d6d..69681da6b2a 100644
--- a/spec/features/projects/active_tabs_spec.rb
+++ b/spec/features/projects/active_tabs_spec.rb
@@ -136,16 +136,16 @@ describe 'Project active tab' do
 
       context 'on project Analytics/Repository Analytics' do
         it_behaves_like 'page has active tab', _('Analytics')
-        it_behaves_like 'page has active sub tab', _('Repository Analytics')
+        it_behaves_like 'page has active sub tab', _('Repository')
       end
 
       context 'on project Analytics/Cycle Analytics' do
         before do
-          click_tab(_('CI / CD Analytics'))
+          click_tab(_('CI / CD'))
         end
 
         it_behaves_like 'page has active tab', _('Analytics')
-        it_behaves_like 'page has active sub tab', _('CI / CD Analytics')
+        it_behaves_like 'page has active sub tab', _('CI / CD')
       end
     end
   end
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index 95a8f974261..dabb2b2dbf2 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -10,10 +10,10 @@ describe 'Project navbar' do
     {
       nav_item: _('Analytics'),
       nav_sub_items: [
-        _('CI / CD Analytics'),
+        _('CI / CD'),
         (_('Code Review') if Gitlab.ee?),
-        _('Repository Analytics'),
-        _('Value Stream Analytics')
+        _('Repository'),
+        _('Value Stream')
       ]
     }
   end
@@ -114,7 +114,7 @@ describe 'Project navbar' do
       before do
         stub_licensed_features(issues_analytics: true)
 
-        analytics_nav_item[:nav_sub_items] << _('Issues Analytics')
+        analytics_nav_item[:nav_sub_items] << _('Issues')
         analytics_nav_item[:nav_sub_items].sort!
 
         visit project_path(project)
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index beed1c07e51..33c2e65633e 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -222,7 +222,7 @@ describe 'User uses shortcuts', :js do
       find('body').native.send_key('d')
 
       expect(page).to have_active_navigation(_('Analytics'))
-      expect(page).to have_active_sub_navigation(_('Repository Analytics'))
+      expect(page).to have_active_sub_navigation(_('Repository'))
     end
   end
 end