Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 2 deletions

diff --git a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
index d96052d4c03..50390964e1b 100644
--- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
@@ -12,11 +12,19 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
   it_behaves_like 'has nav sidebar'
   it_behaves_like 'sidebar includes snowplow attributes', 'render', 'groups_side_navigation', 'groups_side_navigation'
 
-  describe 'Group information' do
+  describe 'Group context menu' do
     it 'has a link to the group path' do
       render
 
-      expect(rendered).to have_link('Group information', href: group_path(group))
+      expect(rendered).to have_link(group.name, href: group_path(group))
+    end
+  end
+
+  describe 'Group information' do
+    it 'has a link to the group activity path' do
+      render
+
+      expect(rendered).to have_link('Group information', href: activity_group_path(group))
     end
 
     it 'does not have a link to the details menu item' do