Improve issuables_counter_spec relevance.

1 files changed, 25 insertions, 8 deletions

diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index f134eee19eb..1960552b411 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -1,33 +1,50 @@
 require 'spec_helper'
 
-describe 'Navigation bar counter', feature: true, js: true, caching: true do
+describe 'Navigation bar counter', feature: true, js: true do
   let(:user) { create(:user) }
   let(:project) { create(:empty_project, namespace: user.namespace) }
 
   before do
     login_as(user)
-    visit issues_dashboard_path
   end
 
   it 'reflects dashboard issues count' do
-    create(:issue, project: project, assignee: user)
+    issue = create(:issue, project: project, assignee: user)
+    visit issues_dashboard_path
+
+    dashboard_count = find('li.active span.badge')
+    nav_count = find('.dashboard-shortcuts-issues span.count')
+
+    expect(nav_count).to have_content('1')
+    expect(dashboard_count).to have_content('1')
+
+    issue.assignee = nil
     visit issues_dashboard_path
 
     dashboard_count = find('li.active span.badge')
     nav_count = find('.dashboard-shortcuts-issues span.count')
 
-    expect(dashboard_count).to have_content('0')
-    expect(nav_count).to have_content('0')
+    expect(nav_count).to have_content('1')
+    expect(dashboard_count).to have_content('1')
   end
 
   it 'reflects dashboard merge requests count' do
-    create(:merge_request, assignee: user)
+    merge_request = create(:merge_request, source_project: project, assignee: user)
+    visit merge_requests_dashboard_path
+
+    dashboard_count = find('li.active span.badge')
+    nav_count = find('.dashboard-shortcuts-merge_requests span.count')
+
+    expect(nav_count).to have_content('1')
+    expect(dashboard_count).to have_content('1')
+
+    merge_request.assignee = nil
     visit merge_requests_dashboard_path
 
     dashboard_count = find('li.active span.badge')
     nav_count = find('.dashboard-shortcuts-merge_requests span.count')
 
-    expect(dashboard_count).to have_content('0')
-    expect(nav_count).to have_content('0')
+    expect(nav_count).to have_content('1')
+    expect(dashboard_count).to have_content('1')
   end
 end