2 files changed, 63 insertions, 9 deletions
diff --git a/spec/features/boards/keyboard_shortcut_spec.rb b/spec/features/boards/keyboard_shortcut_spec.rb
index 435de3861cf..d820a59aa16 100644
--- a/spec/features/boards/keyboard_shortcut_spec.rb
+++ b/spec/features/boards/keyboard_shortcut_spec.rb
@@ -1,20 +1,38 @@
 require 'rails_helper'
 
 describe 'Issue Boards shortcut', :js do
-  let(:project) { create(:project) }
+  context 'issues are enabled' do
+    let(:project) { create(:project) }
 
-  before do
-    create(:board, project: project)
+    before do
+      create(:board, project: project)
 
-    sign_in(create(:admin))
+      sign_in(create(:admin))
 
-    visit project_path(project)
+      visit project_path(project)
+    end
+
+    it 'takes user to issue board index' do
+      find('body').native.send_keys('gb')
+      expect(page).to have_selector('.boards-list')
+
+      wait_for_requests
+    end
   end
 
-  it 'takes user to issue board index' do
-    find('body').native.send_keys('gb')
-    expect(page).to have_selector('.boards-list')
+  context 'issues are not enabled' do
+    let(:project) { create(:project, :issues_disabled) }
+
+    before do
+      sign_in(create(:admin))
+
+      visit project_path(project)
+    end
+
+    it 'does not take user to the issue board index' do
+      find('body').native.send_keys('gb')
 
-    wait_for_requests
+      expect(page).to have_selector("body[data-page='projects:show']")
+    end
   end
 end
diff --git a/spec/features/issues/keyboard_shortcut_spec.rb b/spec/features/issues/keyboard_shortcut_spec.rb
new file mode 100644
index 00000000000..961de9d3d25
--- /dev/null
+++ b/spec/features/issues/keyboard_shortcut_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe 'Issues shortcut', :js do
+  context 'New Issue shortcut' do
+    context 'issues are enabled' do
+      let(:project) { create(:project) }
+
+      before do
+        sign_in(create(:admin))
+
+        visit project_path(project)
+      end
+
+      it 'takes user to the new issue page' do
+        find('body').native.send_keys('i')
+        expect(page).to have_selector('#new_issue')
+      end
+    end
+
+    context 'issues are not enabled' do
+      let(:project) { create(:project, :issues_disabled) }
+
+      before do
+        sign_in(create(:admin))
+
+        visit project_path(project)
+      end
+
+      it 'does not take user to the new issue page' do
+        find('body').native.send_keys('i')
+
+        expect(page).to have_selector("body[data-page='projects:show']")
+      end
+    end
+  end
+end