Add latest changes from gitlab-org/gitlab@master

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index 91aedc5268c..9426f39cd80 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -106,6 +106,16 @@ RSpec.describe Nav::TopNavHelper do
         ]
         expect(subject[:secondary]).to eq(expected_secondary)
       end
+
+      context 'with current nav as project' do
+        before do
+          helper.nav('project')
+        end
+
+        it 'has expected :active' do
+          expect(subject[:primary].detect { |entry| entry[:id] == 'project' }[:active]).to eq(true)
+        end
+      end
     end
 
     context 'when current_user is non-admin' do
@@ -190,6 +200,16 @@ RSpec.describe Nav::TopNavHelper do
             expect(projects_view[:linksSecondary]).to eq(expected_links_secondary)
           end
 
+          context 'with current nav as project' do
+            before do
+              helper.nav('project')
+            end
+
+            it 'has expected :active' do
+              expect(subject[:primary].detect { |entry| entry[:id] == 'project' }[:active]).to eq(true)
+            end
+          end
+
           context 'with persisted project' do
             let_it_be(:project) { build_stubbed(:project) }
 
@@ -281,6 +301,16 @@ RSpec.describe Nav::TopNavHelper do
             expect(groups_view[:linksSecondary]).to eq(expected_links_secondary)
           end
 
+          context 'with current nav as group' do
+            before do
+              helper.nav('group')
+            end
+
+            it 'has expected :active' do
+              expect(subject[:primary].detect { |entry| entry[:id] == 'groups' }[:active]).to eq(true)
+            end
+          end
+
           context 'with persisted group' do
             let_it_be(:group) { build_stubbed(:group) }