1 files changed, 40 insertions, 14 deletions
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 62a2c54c94c..bb29dae1bdc 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -1,26 +1,52 @@
 require 'spec_helper'
 
-feature 'Dashboard shortcuts', feature: true, js: true do
-  before do
-    login_as :user
-    visit dashboard_projects_path
+feature 'Dashboard shortcuts', :feature, :js do
+  context 'logged in' do
+    before do
+      sign_in(create(:user))
+      visit root_dashboard_path
+    end
+
+    scenario 'Navigate to tabs' do
+      find('body').send_keys([:shift, 'I'])
+
+      check_page_title('Issues')
+
+      find('body').send_keys([:shift, 'M'])
+
+      check_page_title('Merge Requests')
+
+      find('body').send_keys([:shift, 'T'])
+
+      check_page_title('Todos')
+
+      find('body').send_keys([:shift, 'P'])
+
+      check_page_title('Projects')
+    end
   end
 
-  scenario 'Navigate to tabs' do
-    find('body').native.send_key('g')
-    find('body').native.send_key('p')
+  context 'logged out' do
+    before do
+      visit explore_root_path
+    end
+
+    scenario 'Navigate to tabs' do
+      find('body').send_keys([:shift, 'G'])
 
-    check_page_title('Projects')
+      find('.nothing-here-block')
+      expect(page).to have_content('No public groups')
 
-    find('body').native.send_key('g')
-    find('body').native.send_key('i')
+      find('body').send_keys([:shift, 'S'])
 
-    check_page_title('Issues')
+      find('.nothing-here-block')
+      expect(page).to have_selector('.snippets-list-holder')
 
-    find('body').native.send_key('g')
-    find('body').native.send_key('m')
+      find('body').send_keys([:shift, 'P'])
 
-    check_page_title('Merge Requests')
+      find('.nothing-here-block')
+      expect(page).to have_content('No projects found')
+    end
   end
 
   def check_page_title(title)