Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master'

Update number of Todos in the sidebar when it's marked as "Done"

Closes #15002 

See merge request !3600
This commit is contained in:
Jacob Schatz 2016-04-07 17:44:41 +00:00
commit f79d3cda35
3 changed files with 4 additions and 1 deletions

View File

@ -31,6 +31,7 @@ v 8.7.0 (unreleased)
- Build status notifications
- API: Expose user location (Robert Schilling)
- ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
- Update number of Todos in the sidebar when it's marked as "Done". !3600
v 8.6.5 (unreleased)
- Only update repository language if it is not set to improve performance

View File

@ -9,7 +9,7 @@
= icon('bell fw')
%span
Todos
%span.count= number_with_delimiter(todos_pending_count)
%span.count.todos-pending-count= number_with_delimiter(todos_pending_count)
= nav_link(path: 'dashboard#activity') do
= link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do
= icon('dashboard fw')

View File

@ -26,6 +26,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
end
step 'I should see todos assigned to me' do
page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
expect(page).to have_content 'To do 4'
expect(page).to have_content 'Done 0'
@ -41,6 +42,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
click_link 'Done'
end
page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
expect(page).to have_content 'To do 3'
expect(page).to have_content 'Done 1'
should_not_see_todo "John Doe assigned you merge request !#{merge_request.iid}"