Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-06-10 01:12:00 +0300
committerRobert Speicher <rspeicher@gmail.com>2017-06-10 01:23:19 +0300
commitf2dee8e8555409d3b1d333703581c6d62166cf83 (patch)
tree6096261b6d7aa2d15f1c51f8c3e671f19ff40782 /app
parentb16730fc8317b282d5dc86dbc8936c74303f5a36 (diff)
Test todos_count_format helper at the correct level to improve speed
Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/dashboard/todos_controller.rb5
-rw-r--r--app/helpers/todos_helper.rb2
2 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 623392c1240..28c90548cc1 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -47,11 +47,6 @@ class Dashboard::TodosController < Dashboard::ApplicationController
render json: todos_counts
end
- # Used in TodosHelper also
- def self.todos_count_format(count)
- count >= 100 ? '99+' : count
- end
-
private
def find_todos
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 19286fadb19..3d1b3a4711a 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -4,7 +4,7 @@ module TodosHelper
end
def todos_count_format(count)
- count > 99 ? '99+' : count
+ count > 99 ? '99+' : count.to_s
end
def todos_done_count