Download as
Browse Code »

Commit 0540de2c963dfc3cf3cfef6e528edc371df21f00

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent ee0f0a5e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem1276: published_article didn't show first paragraph

Showing 3 changed files with 17 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @0540de2
... ... @@ -286,7 +286,7 @@ class Article < ActiveRecord::Base
286 286 end
287 287  
288 288 def first_paragraph
289   - body =~ /(.*<\/p>)/
  289 + to_html =~ /(.*<\/p>)/
290 290 $1
291 291 end
292 292  
... ...
test/unit/article_test.rb
  Diff comments   View file @0540de2
... ... @@ -81,6 +81,13 @@ class ArticleTest &lt; Test::Unit::TestCase
81 81 assert_equal 'the body of the article', a.to_html
82 82 end
83 83  
  84 + should 'provide first paragraph of HTML version' do
  85 + profile = create_user('testinguser').person
  86 + a = Article.create!(:name => 'my article', :profile_id => profile.id)
  87 + a.expects(:body).returns('<p>the first paragraph of the article</p> The second paragraph')
  88 + assert_equal '<p>the first paragraph of the article</p>', a.first_paragraph
  89 + end
  90 +
84 91 should 'inform the icon to be used' do
85 92 assert_equal 'text-html', Article.new.icon_name
86 93 end
... ...
test/unit/published_article_test.rb
  Diff comments   View file @0540de2
... ... @@ -122,4 +122,13 @@ class PublishedArticleTest &lt; ActiveSupport::TestCase
122 122  
123 123 assert_equal p.parent, new_parent
124 124 end
  125 +
  126 + should 'provide first paragraph of HTML version' do
  127 + prof = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
  128 + a = Article.create!(:name => 'my article', :profile_id => prof.id)
  129 + a.expects(:body).returns('<p>the first paragraph of the article</p> The second paragraph')
  130 + p = PublishedArticle.create(:reference_article => a, :profile => prof)
  131 + assert_equal '<p>the first paragraph of the article</p>', p.first_paragraph
  132 + end
  133 +
125 134 end
... ...