Merge branch 'ce-backport-new-sidebar-boards' into 'master'10-0-stable-prepare-rc5

CE backport of new-sidebar-boards

See merge request !14246
# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml

1 files changed, 18 insertions, 6 deletions

diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index b17bc6692f3..c5f455b8948 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -1,16 +1,28 @@
 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="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)