Download as
Browse Code »

Commit 6c59ac4a8cfd8089927917718a312493c77a578a

Authored by Daniela Feitosa
1 parent 92746476
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix: avoid crashing when displaying articles 

On environments created before including =spam_comments_count=, the visualization
of number of comments was crashing because it was nil

Fixes #31
Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
app/helpers/content_viewer_helper.rb
  Diff comments   View file @6c59ac4
... ... @@ -10,7 +10,7 @@ module ContentViewerHelper
10 10 end
11 11  
12 12 def number_of_comments(article)
13   - display_number_of_comments(article.comments_count - article.spam_comments_count)
  13 + display_number_of_comments(article.comments_count - article.spam_comments_count.to_i)
14 14 end
15 15  
16 16 def article_title(article, args = {})
... ...
test/unit/content_viewer_helper_test.rb
  Diff comments   View file @6c59ac4
... ... @@ -83,6 +83,14 @@ class ContentViewerHelperTest < ActiveSupport::TestCase
83 83 assert_equal '', result
84 84 end
85 85  
  86 + should 'not crash if spam_comments_count is nil' do
  87 + article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
  88 + article.stubs(:comments_count).returns(10)
  89 + article.stubs(:spam_comments_count).returns(nil)
  90 + result = number_of_comments(article)
  91 + assert_match /10 comments/, result
  92 + end
  93 +
86 94 should 'not list feed article' do
87 95 profile.articles << Blog.new(:name => 'Blog test', :profile => profile)
88 96 assert_includes profile.blog.children.map{|i| i.class}, RssFeed
... ...