Download as
Browse Code »

Commit 2fe1ebd0f75c7a4224341d5b0f8ad6cada165f04

Authored by Rodrigo Souto
1 parent 9e0087a1
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix external_feed tests

Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
test/unit/external_feed_test.rb
  Diff comments   View file @2fe1ebd
... ... @@ -5,10 +5,10 @@ class ExternalFeedTest < ActiveSupport::TestCase
5 5 should 'require blog' do
6 6 e = ExternalFeed.new
7 7 e.valid?
8   - assert e.errors[:blog_id]
  8 + assert e.errors[:blog_id].present?
9 9 e.blog = create_blog
10 10 e.valid?
11   - assert !e.errors[:blog_id]
  11 + assert e.errors[:blog_id].blank?
12 12 end
13 13  
14 14 should 'belong to blog' do
... ... @@ -58,15 +58,15 @@ class ExternalFeedTest < ActiveSupport::TestCase
58 58 end
59 59  
60 60 should 'require address if enabled' do
61   - e = build(ExternalFeed, :enabled => true)
  61 + e = build(ExternalFeed, :enabled => true, :address => nil)
62 62 assert !e.valid?
63   - assert e.errors[:address]
  63 + assert e.errors[:address].present?
64 64 end
65 65  
66 66 should 'not require address if disabled' do
67 67 e = build(ExternalFeed, :enabled => false, :address => nil)
68 68 e.valid?
69   - assert !e.errors[:address]
  69 + assert e.errors[:address].blank?
70 70 end
71 71  
72 72 should 'list enabled external feeds' do
... ... @@ -161,6 +161,7 @@ class ExternalFeedTest < ActiveSupport::TestCase
161 161  
162 162 dd = []
163 163 Article.where(['parent_id = ?', blog.id]).all.each do |a|
  164 + next if a.kind_of?(RssFeed)
164 165 dd << a.body.to_s.strip.gsub(/\s+/, ' ')
165 166 end
166 167 assert_equal '<img src="noosfero.png" /><p>Html content 1.</p><p>Html content 2.</p>', dd.sort.join
... ...