Commit d51ad1ea authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

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
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }> %li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }>
= link_to todos_filter_path(state: 'pending') do = link_to todos_filter_path(state: 'pending') do
%span %span
To do Todos
%span.badge %span.badge
= number_with_delimiter(todos_pending_count) = number_with_delimiter(todos_pending_count)
%li.todos-done{ class: active_when(params[:state] == 'done') }> %li.todos-done{ class: active_when(params[:state] == 'done') }>
......
---
title: Todos spelled correctly on Todos list page
merge_request: 15015
author:
type: changed
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
end end
it 'updates todo count' do 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' expect(page).to have_content 'Done 1'
end end
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
end end
it 'updates todo count' do 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' expect(page).to have_content 'Done 0'
end end
end end
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
end end
it 'updates todo count' do 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' expect(page).to have_content 'Done 0'
end end
end end
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
end end
it 'shows "All done" message!' do 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).to have_content "You're all done!"
expect(page).not_to have_selector('.gl-pagination') expect(page).not_to have_selector('.gl-pagination')
end end
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
it 'updates todo count' do it 'updates todo count' do
mark_all_and_undo 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' expect(page).to have_content 'Done 0'
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment