From bb5bc90ab0b3591729f8b940f178f7f54cc01c7d Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Thu, 7 Apr 2016 12:35:25 -0300 Subject: [PATCH 1/2] Update number of Todos in the sidebar when it's marked as "Done" --- app/views/layouts/nav/_dashboard.html.haml | 2 +- features/steps/dashboard/todos.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index d1a180e4299..f1052eadf81 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -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') diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb index 30b21b93ac7..a6e574f12a9 100644 --- a/features/steps/dashboard/todos.rb +++ b/features/steps/dashboard/todos.rb @@ -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}" From ee62ce65a1b80f3dae9c2cb5a52b784895fb8a9e Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Thu, 7 Apr 2016 14:07:13 -0300 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c6febbd93d3..d119a36e84b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -30,6 +30,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