4 files changed, 76 insertions, 38 deletions

diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb
index d5f8470fab0..1d4b86ed4b4 100644
--- a/spec/features/dashboard/group_spec.rb
+++ b/spec/features/dashboard/group_spec.rb
@@ -5,16 +5,18 @@ RSpec.describe 'Dashboard Group', feature: true do
     login_as(:user)
   end
 
-  it 'creates new grpup' do
+  it 'creates new group', js: true do
     visit dashboard_groups_path
-    click_link 'New Group'
+    click_link 'New group'
+    new_path = 'Samurai'
+    new_description = 'Tokugawa Shogunate'
 
-    fill_in 'group_path', with: 'Samurai'
-    fill_in 'group_description', with: 'Tokugawa Shogunate'
+    fill_in 'group_path', with: new_path
+    fill_in 'group_description', with: new_description
     click_button 'Create group'
 
-    expect(current_path).to eq group_path(Group.find_by(name: 'Samurai'))
-    expect(page).to have_content('Samurai')
-    expect(page).to have_content('Tokugawa Shogunate')
+    expect(current_path).to eq group_path(Group.find_by(name: new_path))
+    expect(page).to have_content(new_path)
+    expect(page).to have_content(new_description)
   end
 end
diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index a1718912fc6..4fca7577e74 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Navigation bar counter', feature: true, js: true, caching: true do
+describe 'Navigation bar counter', feature: true, caching: true do
   let(:user) { create(:user) }
   let(:project) { create(:empty_project, namespace: user.namespace) }
   let(:issue) { create(:issue, project: project) }
@@ -13,33 +13,48 @@ describe 'Navigation bar counter', feature: true, js: true, caching: true do
   end
 
   it 'reflects dashboard issues count' do
-    visit issues_dashboard_path
+    visit issues_path
 
     expect_counters('issues', '1')
 
     issue.update(assignee: nil)
-    visit issues_dashboard_path
 
-    expect_counters('issues', '1')
+    Timecop.travel(3.minutes.from_now) do
+      visit issues_path
+
+      expect_counters('issues', '0')
+    end
   end
 
   it 'reflects dashboard merge requests count' do
-    visit merge_requests_dashboard_path
+    visit merge_requests_path
 
     expect_counters('merge_requests', '1')
 
     merge_request.update(assignee: nil)
-    visit merge_requests_dashboard_path
 
-    expect_counters('merge_requests', '1')
+    Timecop.travel(3.minutes.from_now) do
+      visit merge_requests_path
+
+      expect_counters('merge_requests', '0')
+    end
+  end
+
+  def issues_path
+    issues_dashboard_path(assignee_id: user.id)
+  end
+
+  def merge_requests_path
+    merge_requests_dashboard_path(assignee_id: user.id)
   end
 
   def expect_counters(issuable_type, count)
-    dashboard_count = find('li.active')
-    find('.global-dropdown-toggle').click
+    dashboard_count = find('.nav-links li.active')
     nav_count = find(".dashboard-shortcuts-#{issuable_type}")
+    header_count = find(".header-content .#{issuable_type.tr('_', '-')}-count")
 
-    expect(nav_count).to have_content(count)
     expect(dashboard_count).to have_content(count)
+    expect(nav_count).to have_content(count)
+    expect(header_count).to have_content(count)
   end
 end
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index c4e58d14f75..f1789fc9d43 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe 'Dashboard Projects', feature: true do
   before do
     project.team << [user, :developer]
     login_as user
-    visit dashboard_projects_path
   end
 
   it 'shows the project the user in a member of in the list' do
@@ -15,15 +14,19 @@ RSpec.describe 'Dashboard Projects', feature: true do
     expect(page).to have_content('awesome stuff')
   end
 
-  describe "with a pipeline" do
-    let(:pipeline) {  create(:ci_pipeline, :success, project: project, sha: project.commit.sha) }
+  describe "with a pipeline", redis: true do
+    let!(:pipeline) {  create(:ci_pipeline, project: project, sha: project.commit.sha) }
 
     before do
-      pipeline
+      # Since the cache isn't updated when a new pipeline is created
+      # we need the pipeline to advance in the pipeline since the cache was created
+      # by visiting the login page.
+      pipeline.succeed
     end
 
     it 'shows that the last pipeline passed' do
       visit dashboard_projects_path
+
       expect(page).to have_xpath("//a[@href='#{pipelines_namespace_project_commit_path(project.namespace, project, project.commit)}']")
     end
   end
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 3642c0bfb5b..4c9adcabe34 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -1,31 +1,49 @@
 require 'spec_helper'
 
 feature 'Dashboard shortcuts', feature: true, js: true do
-  before do
-    login_as :user
-    visit dashboard_projects_path
-  end
+  context 'logged in' do
+    before do
+      login_as :user
+      visit root_dashboard_path
+    end
+
+    scenario 'Navigate to tabs' do
+      find('body').native.send_keys([:shift, 'P'])
+
+      check_page_title('Projects')
+
+      find('body').native.send_key([:shift, 'I'])
+
+      check_page_title('Issues')
 
-  scenario 'Navigate to tabs' do
-    find('body').native.send_key('g')
-    find('body').native.send_key('p')
+      find('body').native.send_key([:shift, 'M'])
+
+      check_page_title('Merge Requests')
+
+      find('body').native.send_keys([:shift, 'T'])
+
+      check_page_title('Todos')
+    end
+  end
 
-    check_page_title('Projects')
+  context 'logged out' do
+    before do
+      visit explore_root_path
+    end
 
-    find('body').native.send_key('g')
-    find('body').native.send_key('i')
+    scenario 'Navigate to tabs' do
+      find('body').native.send_keys([:shift, 'P'])
 
-    check_page_title('Issues')
+      expect(page).to have_content('No projects found')
 
-    find('body').native.send_key('g')
-    find('body').native.send_key('m')
+      find('body').native.send_keys([:shift, 'G'])
 
-    check_page_title('Merge Requests')
+      expect(page).to have_content('No public groups')
 
-    find('body').native.send_key('g')
-    find('body').native.send_key('t')
+      find('body').native.send_keys([:shift, 'S'])
 
-    check_page_title('Todos')
+      expect(page).to have_selector('.snippets-list-holder')
+    end
   end
 
   def check_page_title(title)