Download as
Browse Code »

Commit d8630870e9ef1f92e54acc3e7302ec684b2705e6

Authored by Antonio Terceiro
1 parent 93ad499d
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

ActionItem949: don't list RSS feeds in "recent content"

Showing 4 changed files with 11 additions and 24 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @d863087
@@ -98,7 +98,7 @@ class Article < ActiveRecord::Base @@ -98,7 +98,7 @@ class Article < ActiveRecord::Base
98 public_article = ? AND 98 public_article = ? AND
99 published = ? AND 99 published = ? AND
100 profiles.public_profile = ? AND 100 profiles.public_profile = ? AND
101 - (articles.type != ? OR articles.type is NULL)", true, true, true, true, 'UploadedFile' 101 + ((articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed'
102 ], 102 ],
103 :include => 'profile', 103 :include => 'profile',
104 :order => 'articles.updated_at desc, articles.id desc' 104 :order => 'articles.updated_at desc, articles.id desc'
test/functional/profile_controller_test.rb
  Diff comments   View file @d863087
@@ -154,14 +154,6 @@ class ProfileControllerTest < Test::Unit::TestCase @@ -154,14 +154,6 @@ class ProfileControllerTest < Test::Unit::TestCase
154 assert_tag :tag => 'div', :content => 'Recent content', :attributes => { :class => 'block recent-documents-block' }, :child => { :tag => 'ul', :content => /#{person.home_page.name}/ } 154 assert_tag :tag => 'div', :content => 'Recent content', :attributes => { :class => 'block recent-documents-block' }, :child => { :tag => 'ul', :content => /#{person.home_page.name}/ }
155 end 155 end
156 156
157 - should 'show feed on recent content after update' do  
158 - person = create_user('person_1').person  
159 - person.articles.find_by_path('feed').name = 'Changed name'  
160 - assert person.articles.find_by_path('feed').save!  
161 - get :index, :profile => person.identifier  
162 - assert_tag :tag => 'div', :content => 'Recent content', :attributes => { :class => 'block recent-documents-block' }, :child => { :tag => 'ul', :content => /#{person.articles.find_by_path('feed').name}/ }  
163 - end  
164 -  
165 should 'display tag for profile' do 157 should 'display tag for profile' do
166 @profile.articles.create!(:name => 'testarticle', :tag_list => 'tag1') 158 @profile.articles.create!(:name => 'testarticle', :tag_list => 'tag1')
167 159
test/unit/article_test.rb
  Diff comments   View file @d863087
@@ -207,6 +207,16 @@ class ArticleTest < Test::Unit::TestCase @@ -207,6 +207,16 @@ class ArticleTest < Test::Unit::TestCase
207 assert_equal [ second ], Article.recent(nil) 207 assert_equal [ second ], Article.recent(nil)
208 end 208 end
209 209
  210 + should 'not show RssFeed as recent' do
  211 + p = create_user('usr1').person
  212 + Article.destroy_all
  213 + first = RssFeed.create!(:profile => p, :name => 'my feed', :advertise => true)
  214 + first.limit = 10; first.save!
  215 + second = p.articles.build(:name => 'second'); second.save!
  216 +
  217 + assert_equal [ second ], Article.recent(nil)
  218 + end
  219 +
210 should 'require that subclasses define description' do 220 should 'require that subclasses define description' do
211 assert_raise NotImplementedError do 221 assert_raise NotImplementedError do
212 Article.description 222 Article.description
test/unit/recent_documents_block_test.rb
  Diff comments   View file @d863087
@@ -44,21 +44,6 @@ class RecentDocumentsBlockTest < Test::Unit::TestCase @@ -44,21 +44,6 @@ class RecentDocumentsBlockTest < Test::Unit::TestCase
44 assert_no_match /href=.*\/testinguser\/first/, output 44 assert_no_match /href=.*\/testinguser\/first/, output
45 end 45 end
46 46
47 - should 'not list rss feed articles automatically created' do  
48 - assert_equal 'feed', profile.articles.find_by_path('feed').name  
49 - output = block.content  
50 - assert_match /href=.*\/testinguser\/first/, output  
51 - assert_no_match /href=.*\/testinguser\/feed/, output  
52 - end  
53 -  
54 - should 'list rss feed articles after update' do  
55 - profile.articles.find_by_path('feed').name = 'chaged name'  
56 - assert profile.articles.find_by_path('feed').save!  
57 - output = block.content  
58 - assert_match /href=.*\/testinguser\/first/, output  
59 - assert_match /href=.*\/testinguser\/feed/, output  
60 - end  
61 -  
62 should 'display a link to sitemap with title "All content"' do 47 should 'display a link to sitemap with title "All content"' do
63 expects(:link_to).with('All content', :controller => 'profile', :action => 'sitemap', :profile => profile.identifier) 48 expects(:link_to).with('All content', :controller => 'profile', :action => 'sitemap', :profile => profile.identifier)
64 expects(:_).with('All content').returns('All content') 49 expects(:_).with('All content').returns('All content')