Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 0 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 0ac8e7c5fc8..cc0fdfbe278 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -549,6 +549,17 @@ describe 'Issue Boards', :js do
     end
   end
 
+  context 'issue board focus mode' do
+    before do
+      visit project_board_path(project, board)
+      wait_for_requests
+    end
+
+    it 'shows the button' do
+      expect(page).to have_link('Toggle focus mode')
+    end
+  end
+
   context 'keyboard shortcuts' do
     before do
       visit project_board_path(project, board)
diff --git a/spec/features/boards/focus_mode_spec.rb b/spec/features/boards/focus_mode_spec.rb
new file mode 100644
index 00000000000..fff3cce3c1a
--- /dev/null
+++ b/spec/features/boards/focus_mode_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Issue Boards focus mode', :js do
+  let(:project) { create(:project, :public) }
+
+  before do
+    visit project_boards_path(project)
+
+    wait_for_requests
+  end
+
+  it 'shows focus mode button to guest users' do
+    expect(page).to have_selector('.board-extra-actions .js-focus-mode-btn')
+  end
+end