Merge branch 'ce-backport-new-sidebar-boards' into 'master'

CE backport of new-sidebar-boards

See merge request !14246

app/helpers/boards_helper.rb

@@ -77,4 +77,8 @@ module BoardsHelper
       'max-select': dropdown_options[:data][:'max-select']
     }
   end
+
+  def boards_link_text
+    _("Board")
+  end
 end

app/views/layouts/nav/sidebar/_project.html.haml

@@ -114,9 +114,9 @@
                   List
 
             = nav_link(controller: :boards) do
-              = link_to project_boards_path(@project), title: 'Board' do
+              = link_to project_boards_path(@project), title: boards_link_text do
                 %span
-                  Board
+                  = boards_link_text
                 .feature-highlight.js-feature-highlight{ disabled: true, data: { trigger: 'manual', container: 'body', toggle: 'popover', placement: 'right', highlight: 'issue-boards' } }
               .feature-highlight-popover-content
                 = render 'feature_highlight/issue_boards.svg'

spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

 require 'spec_helper'
 
 describe 'layouts/nav/sidebar/_project' do
-  describe 'container registry tab' do
-    before do
-      project = create(:project, :repository)
-      stub_container_registry_config(enabled: true)
+  let(:project) { create(:project, :repository) }
 
+  before do
     assign(:project, project)
     assign(:repository, project.repository)
     allow(view).to receive(:current_ref).and_return('master')
 
     allow(view).to receive(:can?).and_return(true)
+  end
+
+  describe 'issue boards' do
+    it 'has boards tab when multiple issue boards available' do
+      render
+
+      expect(rendered).to have_css('a[title="Board"]')
+    end
+  end
+
+  describe 'container registry tab' do
+    before do
+      stub_container_registry_config(enabled: true)
+
       allow(controller).to receive(:controller_name)
         .and_return('repositories')
       allow(controller).to receive(:controller_path)