Download as
Browse Code »

Commit 289ca9e2577efa8eea64e63319dfd791f4382ce9

Authored by Victor Costa
1 parent 2978625c
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

rails3: fix html display for short format on articles

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @289ca9e
... ... @@ -262,7 +262,10 @@ class Article < ActiveRecord::Base
262 262 # (To override short format representation, override the lead method)
263 263 def to_html(options = {})
264 264 if options[:format] == 'short'
265   - display_short_format(self)
  265 + article = self
  266 + proc do
  267 + display_short_format(article)
  268 + end
266 269 else
267 270 body || ''
268 271 end
... ...
test/unit/article_test.rb
  Diff comments   View file @289ca9e
... ... @@ -100,7 +100,8 @@ class ArticleTest < ActiveSupport::TestCase
100 100  
101 101 should 'provide short html version' do
102 102 a = fast_create(Article, :body => 'full body', :abstract => 'lead', :profile_id => profile.id)
103   - assert_match /lead/, a.to_html(:format=>'short')
  103 + expects(:display_short_format).with(a).once
  104 + instance_eval(&a.to_html(:format=>'short'))
104 105 end
105 106  
106 107 should 'provide full html version' do
... ...