Download as
Browse Code »

Commit e1db8da3c08b21fc00b7f120f76539e1719664ed

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 959d88c4
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

ActionItem1114: reorder entries in feed block 

fixed also a test in the feed_handler that relied in the order of the items
Showing 3 changed files with 10 additions and 2 deletions   Show diff stats
app/models/feed_reader_block.rb
  Diff comments   View file @e1db8da
@@ -41,7 +41,7 @@ class FeedReaderBlock < Block @@ -41,7 +41,7 @@ class FeedReaderBlock < Block
41 end 41 end
42 42
43 def add_item(title, link, date, content) 43 def add_item(title, link, date, content)
44 - self.feed_items << {:title => title, :link => link} 44 + self.feed_items.unshift( {:title => title, :link => link})
45 end 45 end
46 46
47 def clear 47 def clear
test/unit/feed_handler_test.rb
  Diff comments   View file @e1db8da
@@ -26,7 +26,7 @@ class FeedHandlerTest &lt; Test::Unit::TestCase @@ -26,7 +26,7 @@ class FeedHandlerTest &lt; Test::Unit::TestCase
26 should 'process feed and populate container' do 26 should 'process feed and populate container' do
27 handler.process(container) 27 handler.process(container)
28 assert_equal 'Feed for unit tests', container.feed_title 28 assert_equal 'Feed for unit tests', container.feed_title
29 - assert_equal ["First POST", "Second POST", "Last POST"], container.feed_items.map {|item| item[:title]} 29 + assert_equivalent ["First POST", "Second POST", "Last POST"], container.feed_items.map {|item| item[:title]}
30 end 30 end
31 31
32 should 'raise exception when parser nil' do 32 should 'raise exception when parser nil' do
test/unit/feed_reader_block_test.rb
  Diff comments   View file @e1db8da
@@ -73,4 +73,12 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase @@ -73,4 +73,12 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
73 feed.finish_fetch 73 feed.finish_fetch
74 end 74 end
75 75
  76 + should 'display the latest post first' do
  77 + %w[ first-post second-post last-post ].each do |i|
  78 + feed.add_item(i, "http://localhost/#{i}", Date.today, "some contet for #{i}")
  79 + end
  80 +
  81 + assert_equal %w[ last-post second-post first-post ], feed.feed_items.map{|i|i[:title]}
  82 + end
  83 +
76 end 84 end