From 1108915f758db254187d47d6a2e626ed6abcbbf3 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 6 May 2015 17:27:10 -0400
Subject: [PATCH] Change wording for task list summaries
---
app/models/concerns/taskable.rb | 4 ++--
spec/features/task_lists_spec.rb | 4 ++--
spec/support/taskable_shared_examples.rb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/models/concerns/taskable.rb b/app/models/concerns/taskable.rb
index 6e04578a7df..33b4814d7ec 100644
--- a/app/models/concerns/taskable.rb
+++ b/app/models/concerns/taskable.rb
@@ -26,11 +26,11 @@ module Taskable
end
# 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
return '' if description.blank?
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
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 651792601ed..2099fc40cca 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -69,7 +69,7 @@ feature 'Task Lists' do
it 'provides a summary on Issues#index' do
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
@@ -145,7 +145,7 @@ feature 'Task Lists' do
it 'provides a summary on MergeRequests#index' do
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
diff --git a/spec/support/taskable_shared_examples.rb b/spec/support/taskable_shared_examples.rb
index 77e0ed5f578..927c72c7409 100644
--- a/spec/support/taskable_shared_examples.rb
+++ b/spec/support/taskable_shared_examples.rb
@@ -15,8 +15,8 @@ shared_examples 'a Taskable' do
it 'returns the correct task status' do
expect(subject.task_status).to match('5 tasks')
- expect(subject.task_status).to match('2 done')
- expect(subject.task_status).to match('3 unfinished')
+ expect(subject.task_status).to match('2 completed')
+ expect(subject.task_status).to match('3 remaining')
end
describe '#tasks?' do
--
GitLab