Download as
Browse Code »

Commit 6bcae58c4c4f723f972ec8e3c68fc12d4e48b612

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 962cb352
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1200: Update feed block after reduce limit

Showing 2 changed files with 13 additions and 1 deletions   Show diff stats
app/models/feed_reader_block.rb
  Diff comments   View file @6bcae58
@@ -28,7 +28,7 @@ class FeedReaderBlock < Block @@ -28,7 +28,7 @@ class FeedReaderBlock < Block
28 28
29 def formatted_feed_content 29 def formatted_feed_content
30 return "<ul>\n" + 30 return "<ul>\n" +
31 - self.feed_items.map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n") + 31 + self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n") +
32 "</ul>" 32 "</ul>"
33 end 33 end
34 34
test/unit/feed_reader_block_test.rb
  Diff comments   View file @6bcae58
@@ -81,4 +81,16 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase @@ -81,4 +81,16 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
81 assert_equal %w[ last-post second-post first-post ], feed.feed_items.map{|i|i[:title]} 81 assert_equal %w[ last-post second-post first-post ], feed.feed_items.map{|i|i[:title]}
82 end 82 end
83 83
  84 + should 'display only limit posts' do
  85 + feed.limit = 1; feed.save!
  86 + %w[ first-post second-post ].each do |i|
  87 + feed.add_item(i, "http://localhost/#{i}", Date.today, "some contet for #{i}")
  88 + end
  89 +
  90 + assert_tag_in_string feed.formatted_feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/second-post' }, :content => 'second-post'
  91 + assert_no_tag_in_string feed.formatted_feed_content, :tag => 'a', :attributes => { :href => 'http://localhost/first-post' }, :content => 'first-post'
  92 + end
  93 +
  94 +
  95 +
84 end 96 end