Download as
Browse Code »

Commit 33c7f4542be626b205e6f78219d3676eb1282d0a

Authored by Daniela Feitosa
1 parent 5a1f2908
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

Added missing test and translation markup 

(ActionItem2837)
Showing 3 changed files with 16 additions and 2 deletions   Show diff stats
plugins/community_track/lib/community_track_plugin/step.rb
  Diff comments   View file @33c7f45
@@ -7,7 +7,7 @@ class CommunityTrackPlugin::Step < Folder @@ -7,7 +7,7 @@ class CommunityTrackPlugin::Step < Folder
7 acts_as_list :scope => :parent 7 acts_as_list :scope => :parent
8 8
9 def belong_to_track 9 def belong_to_track
10 - errors.add(:parent, "Step not allowed at this parent.") if !parent.kind_of?(CommunityTrackPlugin::Track) 10 + errors.add(:parent, _("Step not allowed at this parent.")) unless parent.kind_of?(CommunityTrackPlugin::Track)
11 end 11 end
12 12
13 validate :belong_to_track 13 validate :belong_to_track
plugins/community_track/lib/community_track_plugin/track.rb
  Diff comments   View file @33c7f45
@@ -49,8 +49,8 @@ class CommunityTrackPlugin::Track < Folder @@ -49,8 +49,8 @@ class CommunityTrackPlugin::Track < Folder
49 "community-track-plugin-track" 49 "community-track-plugin-track"
50 end 50 end
51 51
52 - #FIXME make this test  
53 def first_paragraph 52 def first_paragraph
  53 + return '' if body.blank?
54 paragraphs = Hpricot(body).search('p') 54 paragraphs = Hpricot(body).search('p')
55 paragraphs.empty? ? '' : paragraphs.first.to_html 55 paragraphs.empty? ? '' : paragraphs.first.to_html
56 end 56 end
plugins/community_track/test/unit/community_track_plugin/track_test.rb
  Diff comments   View file @33c7f45
@@ -110,4 +110,18 @@ class TrackTest < ActiveSupport::TestCase @@ -110,4 +110,18 @@ class TrackTest < ActiveSupport::TestCase
110 assert_equal [hidden_step], @track.hidden_steps 110 assert_equal [hidden_step], @track.hidden_steps
111 end 111 end
112 112
  113 + should 'get first paragraph' do
  114 + @track.body = '<p>First</p><p>Second</p>'
  115 + assert_equal '<p>First</p>', @track.first_paragraph
  116 + end
  117 +
  118 + should 'provide first_paragraph even if body was not given' do
  119 + assert_equal '', @track.first_paragraph
  120 + end
  121 +
  122 + should 'provide first_paragraph even if body is nil' do
  123 + @track.body = nil
  124 + assert_equal '', @track.first_paragraph
  125 + end
  126 +
113 end 127 end