Commit 1108915f authored by Robert Speicher's avatar Robert Speicher

Change wording for task list summaries

parent 0a99e6e2
...@@ -26,11 +26,11 @@ module Taskable ...@@ -26,11 +26,11 @@ module Taskable
end end
# Return a string that describes the current state of this Taskable's task # Return a string that describes the current state of this Taskable's task
# list items, e.g. "20 tasks (12 done, 8 unfinished)" # list items, e.g. "20 tasks (12 completed, 8 remaining)"
def task_status def task_status
return '' if description.blank? return '' if description.blank?
sum = tasks.summary sum = tasks.summary
"#{sum.item_count} tasks (#{sum.complete_count} done, #{sum.incomplete_count} unfinished)" "#{sum.item_count} tasks (#{sum.complete_count} completed, #{sum.incomplete_count} remaining)"
end end
end end
...@@ -69,7 +69,7 @@ feature 'Task Lists' do ...@@ -69,7 +69,7 @@ feature 'Task Lists' do
it 'provides a summary on Issues#index' do it 'provides a summary on Issues#index' do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
expect(page).to have_content("6 tasks (2 done, 4 unfinished)") expect(page).to have_content("6 tasks (2 completed, 4 remaining)")
end end
end end
...@@ -145,7 +145,7 @@ feature 'Task Lists' do ...@@ -145,7 +145,7 @@ feature 'Task Lists' do
it 'provides a summary on MergeRequests#index' do it 'provides a summary on MergeRequests#index' do
visit namespace_project_merge_requests_path(project.namespace, project) visit namespace_project_merge_requests_path(project.namespace, project)
expect(page).to have_content("6 tasks (2 done, 4 unfinished)") expect(page).to have_content("6 tasks (2 completed, 4 remaining)")
end end
end end
end end
...@@ -15,8 +15,8 @@ shared_examples 'a Taskable' do ...@@ -15,8 +15,8 @@ shared_examples 'a Taskable' do
it 'returns the correct task status' do it 'returns the correct task status' do
expect(subject.task_status).to match('5 tasks') expect(subject.task_status).to match('5 tasks')
expect(subject.task_status).to match('2 done') expect(subject.task_status).to match('2 completed')
expect(subject.task_status).to match('3 unfinished') expect(subject.task_status).to match('3 remaining')
end end
describe '#tasks?' do describe '#tasks?' do
......
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