diff --git a/app/models/generation.rb b/app/models/generation.rb index 508c15e845a..9da1a6351cc 100644 --- a/app/models/generation.rb +++ b/app/models/generation.rb @@ -46,8 +46,6 @@ def target_users(target) end def count_classmates_by_target(target) - return classmates.students.count - classmates.hibernated.count if target == :students - classmates.send(target).count end end diff --git a/test/models/generation_test.rb b/test/models/generation_test.rb index ea3ec9883ce..8a18afbc868 100644 --- a/test/models/generation_test.rb +++ b/test/models/generation_test.rb @@ -31,7 +31,7 @@ class GenerationTest < ActiveSupport::TestCase end test '#count_classmates_by_target' do - assert_equal 13, Generation.new(5).count_classmates_by_target(:students) + assert_equal 14, Generation.new(5).count_classmates_by_target(:students) assert_equal 3, Generation.new(5).count_classmates_by_target(:trainees) assert_equal 1, Generation.new(5).count_classmates_by_target(:hibernated) assert_equal 2, Generation.new(5).count_classmates_by_target(:graduated) diff --git a/test/system/generations_test.rb b/test/system/generations_test.rb index f4a692d39ef..906dc55c57b 100644 --- a/test/system/generations_test.rb +++ b/test/system/generations_test.rb @@ -62,7 +62,7 @@ class GenerationsTest < ApplicationSystemTestCase assert_link '5期生' assert_text '2014年01月01日 ~ 2014年03月31日' assert_text '現役生' - assert_selector '.card-counts__item-value', text: '13' + assert_selector '.card-counts__item-value', text: '14' assert_text '研修生' assert_selector '.card-counts__item-value', text: '3' assert_text '休会'