Merge branch '39417-to-do-should-be-todos-on-todos-list-page' into 'master'
Resolve ""To do" should be "Todos" on Todos list page" Closes #39417 See merge request gitlab-org/gitlab-ce!15015
This commit is contained in:
commit
d51ad1ea64
|
@ -8,7 +8,7 @@
|
|||
%li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }>
|
||||
= link_to todos_filter_path(state: 'pending') do
|
||||
%span
|
||||
To do
|
||||
Todos
|
||||
%span.badge
|
||||
= number_with_delimiter(todos_pending_count)
|
||||
%li.todos-done{ class: active_when(params[:state] == 'done') }>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Todos spelled correctly on Todos list page
|
||||
merge_request: 15015
|
||||
author:
|
||||
type: changed
|
|
@ -52,7 +52,7 @@ feature 'Dashboard Todos' do
|
|||
end
|
||||
|
||||
it 'updates todo count' do
|
||||
expect(page).to have_content 'To do 0'
|
||||
expect(page).to have_content 'Todos 0'
|
||||
expect(page).to have_content 'Done 1'
|
||||
end
|
||||
|
||||
|
@ -81,7 +81,7 @@ feature 'Dashboard Todos' do
|
|||
end
|
||||
|
||||
it 'updates todo count' do
|
||||
expect(page).to have_content 'To do 1'
|
||||
expect(page).to have_content 'Todos 1'
|
||||
expect(page).to have_content 'Done 0'
|
||||
end
|
||||
end
|
||||
|
@ -200,7 +200,7 @@ feature 'Dashboard Todos' do
|
|||
end
|
||||
|
||||
it 'updates todo count' do
|
||||
expect(page).to have_content 'To do 1'
|
||||
expect(page).to have_content 'Todos 1'
|
||||
expect(page).to have_content 'Done 0'
|
||||
end
|
||||
end
|
||||
|
@ -256,7 +256,7 @@ feature 'Dashboard Todos' do
|
|||
end
|
||||
|
||||
it 'shows "All done" message!' do
|
||||
expect(page).to have_content 'To do 0'
|
||||
expect(page).to have_content 'Todos 0'
|
||||
expect(page).to have_content "You're all done!"
|
||||
expect(page).not_to have_selector('.gl-pagination')
|
||||
end
|
||||
|
@ -283,7 +283,7 @@ feature 'Dashboard Todos' do
|
|||
it 'updates todo count' do
|
||||
mark_all_and_undo
|
||||
|
||||
expect(page).to have_content 'To do 2'
|
||||
expect(page).to have_content 'Todos 2'
|
||||
expect(page).to have_content 'Done 0'
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue