From 6c59ac4a8cfd8089927917718a312493c77a578a Mon Sep 17 00:00:00 2001 From: Daniela Feitosa Date: Tue, 23 Dec 2014 01:35:24 +0000 Subject: [PATCH] Fix: avoid crashing when displaying articles --- app/helpers/content_viewer_helper.rb | 2 +- test/unit/content_viewer_helper_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/helpers/content_viewer_helper.rb b/app/helpers/content_viewer_helper.rb index 2620b7f..d93c899 100644 --- a/app/helpers/content_viewer_helper.rb +++ b/app/helpers/content_viewer_helper.rb @@ -10,7 +10,7 @@ module ContentViewerHelper end def number_of_comments(article) - display_number_of_comments(article.comments_count - article.spam_comments_count) + display_number_of_comments(article.comments_count - article.spam_comments_count.to_i) end def article_title(article, args = {}) diff --git a/test/unit/content_viewer_helper_test.rb b/test/unit/content_viewer_helper_test.rb index 5f93fd0..31ddfd9 100644 --- a/test/unit/content_viewer_helper_test.rb +++ b/test/unit/content_viewer_helper_test.rb @@ -83,6 +83,14 @@ class ContentViewerHelperTest < ActiveSupport::TestCase assert_equal '', result end + should 'not crash if spam_comments_count is nil' do + article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile) + article.stubs(:comments_count).returns(10) + article.stubs(:spam_comments_count).returns(nil) + result = number_of_comments(article) + assert_match /10 comments/, result + end + should 'not list feed article' do profile.articles << Blog.new(:name => 'Blog test', :profile => profile) assert_includes profile.blog.children.map{|i| i.class}, RssFeed -- libgit2 0.21.2