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

Fixed boards text in the project sidebar

Closes #3415

See merge request !2890

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

@@ -124,9 +124,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'

ee/app/helpers/ee/boards_helper.rb

@@ -54,5 +54,13 @@ module EE
     def board_sidebar_user_data
       super.merge(group_id: @group&.id)
     end
+
+    def boards_link_text
+      if @project.multiple_issue_boards_available?(current_user)
+        "Boards"
+      else
+        "Board"
+      end
+    end
   end
 end

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

 require 'spec_helper'
 
 describe 'layouts/nav/sidebar/_project' do
+  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="Boards"]')
+    end
+
+    it 'has board tab when multiple issue boards is not available' do
+      allow(License).to receive(:feature_available?).and_call_original
+      allow(License).to receive(:feature_available?).with(:multiple_issue_boards) { false }
+
+      render
+
+      expect(rendered).to have_css('a[title="Board"]')
+    end
+  end
+
   describe 'container registry tab' do
     before do
-      project = create(:project, :repository)
       stub_container_registry_config(enabled: true)
 
-      assign(:project, project)
-      assign(:repository, project.repository)
-      allow(view).to receive(:current_ref).and_return('master')
-
-      allow(view).to receive(:can?).and_return(true)
       allow(controller).to receive(:controller_name)
         .and_return('repositories')
       allow(controller).to receive(:controller_path)