Download as
Browse Code »

Commit 855e23ffb7becc3c47958eaf2124dfe25a0fd0b7

Authored by Rodrigo Souto
1 parent 33c30b1b
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

[tolerance-time] Making publication not crash if profile has no tolerance yet defined

Showing 2 changed files with 14 additions and 2 deletions   Show diff stats
plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb
  Diff comments   View file @855e23f
@@ -13,10 +13,12 @@ class ToleranceTimePlugin::Publication < Noosfero::Plugin::ActiveRecord @@ -13,10 +13,12 @@ class ToleranceTimePlugin::Publication < Noosfero::Plugin::ActiveRecord
13 def expired? 13 def expired?
14 profile = (target.kind_of?(Article) ? target.profile : target.article.profile) 14 profile = (target.kind_of?(Article) ? target.profile : target.article.profile)
15 profile_tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id) 15 profile_tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id)
  16 + content_tolerance = profile_tolerance ? profile_tolerance.content_tolerance : nil
  17 + comment_tolerance = profile_tolerance ? profile_tolerance.comment_tolerance : nil
16 if target.kind_of?(Article) 18 if target.kind_of?(Article)
17 - tolerance_time = profile_tolerance.content_tolerance || 1.0/0 19 + tolerance_time = content_tolerance || 1.0/0
18 elsif target.kind_of?(Comment) 20 elsif target.kind_of?(Comment)
19 - tolerance_time = profile_tolerance.comment_tolerance || 1.0/0 21 + tolerance_time = comment_tolerance || 1.0/0
20 else 22 else
21 tolerance_time = 1.0/0 23 tolerance_time = 1.0/0
22 end 24 end
plugins/tolerance_time/test/unit/tolerance_time_plugin/publication_test.rb
  Diff comments   View file @855e23f
@@ -65,4 +65,14 @@ class ToleranceTimePlugin::PublicationTest < ActiveSupport::TestCase @@ -65,4 +65,14 @@ class ToleranceTimePlugin::PublicationTest < ActiveSupport::TestCase
65 65
66 assert !article_publication.expired? 66 assert !article_publication.expired?
67 end 67 end
  68 +
  69 + should 'not crash if profile has no tolerance yet defined' do
  70 + profile = fast_create(Profile)
  71 + article = fast_create(Article, :profile_id => profile.id)
  72 + article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
  73 + article_publication.created_at = 1000.years.ago
  74 + article_publication.save!
  75 +
  76 + assert !article_publication.expired?
  77 + end
68 end 78 end