From 2fe1ebd0f75c7a4224341d5b0f8ad6cada165f04 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Tue, 24 Sep 2013 17:51:33 +0000
Subject: [PATCH] rails3: fix external_feed tests

---
 test/unit/external_feed_test.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/unit/external_feed_test.rb b/test/unit/external_feed_test.rb
index 836f4b6..e9f389b 100644
--- a/test/unit/external_feed_test.rb
+++ b/test/unit/external_feed_test.rb
@@ -5,10 +5,10 @@ class ExternalFeedTest < ActiveSupport::TestCase
   should 'require blog' do
     e = ExternalFeed.new
     e.valid?
-    assert e.errors[:blog_id]
+    assert e.errors[:blog_id].present?
     e.blog = create_blog
     e.valid?
-    assert !e.errors[:blog_id]
+    assert e.errors[:blog_id].blank?
   end
 
   should 'belong to blog' do
@@ -58,15 +58,15 @@ class ExternalFeedTest < ActiveSupport::TestCase
   end
 
   should 'require address if enabled' do
-    e = build(ExternalFeed, :enabled => true)
+    e = build(ExternalFeed, :enabled => true, :address => nil)
     assert !e.valid?
-    assert e.errors[:address]
+    assert e.errors[:address].present?
   end
 
   should 'not require address if disabled' do
     e = build(ExternalFeed, :enabled => false, :address => nil)
     e.valid?
-    assert !e.errors[:address]
+    assert e.errors[:address].blank?
   end
 
   should 'list enabled external feeds' do
@@ -161,6 +161,7 @@ class ExternalFeedTest < ActiveSupport::TestCase
 
     dd = []
     Article.where(['parent_id = ?', blog.id]).all.each do |a|
+      next if a.kind_of?(RssFeed)
       dd << a.body.to_s.strip.gsub(/\s+/, ' ')
     end
     assert_equal '<img src="noosfero.png" /><p>Html content 1.</p><p>Html content 2.</p>', dd.sort.join
--
libgit2 0.21.2