Download as
Browse Code »

Commit 9493ec05d8858b4a001814b7620934600f2e0aab

Authored by JoenioCosta
1 parent 518f2836
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

ActionItem567: return only TextArticle in CategoryFinder.find(:articles) 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2278 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 41 additions and 3 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @9493ec0
... ... @@ -197,7 +197,7 @@ class SearchController < ApplicationController
197 197 [ :products, ('Products'), @finder.recent('products', limit) ],
198 198 [ :events, _('Upcoming events'), @finder.upcoming_events({:per_page => limit}) ],
199 199 [ :communities, _('Communities'), @finder.recent('communities', limit) ],
200   - [ :articles, _('Articles'), @finder.recent('articles', limit) ],
  200 + [ :articles, _('Articles'), @finder.recent('text_articles', limit) ],
201 201 [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles(limit) ]
202 202 ].each do |key, name, list|
203 203 @order << key
... ...
app/models/category_finder.rb
  Diff comments   View file @9493ec0
... ... @@ -8,7 +8,7 @@ class CategoryFinder
8 8 attr_reader :category_id
9 9  
10 10 def find(asset, query='', options={})
11   - @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
  11 + @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
12 12 if @region && options[:within]
13 13 options[:origin] = [@region.lat, @region.lng]
14 14 else
... ... @@ -99,7 +99,7 @@ class CategoryFinder
99 99 else
100 100 {:joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id = (?)', category_id]}.merge!(options)
101 101 end
102   - when 'Article'
  102 + when 'Article', 'TextArticle'
103 103 {:joins => 'inner join articles_categories on (articles_categories.article_id = articles.id)', :conditions => ['articles_categories.category_id = (?)', category_id]}.merge!(options)
104 104 when 'Event'
105 105 conditions =
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @9493ec0
... ... @@ -890,6 +890,15 @@ class SearchControllerTest &lt; Test::Unit::TestCase
890 890 assert_equal nil, assigns(:region)
891 891 end
892 892  
  893 + should 'found TextileArticle in articles' do
  894 + person = create_user('teste').person
  895 + art = TextileArticle.create!(:name => 'an text_article article to be found', :profile => person)
  896 +
  897 + get 'index', :query => 'article found', :find_in => [ 'articles' ]
  898 +
  899 + assert_includes assigns(:results)[:articles], art
  900 + end
  901 +
893 902 ##################################################################
894 903 ##################################################################
895 904  
... ...
test/unit/category_finder_test.rb
  Diff comments   View file @9493ec0
... ... @@ -446,5 +446,21 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
446 446 assert ents.index(ent2) < ents.index(ent1), "expected #{ents.index(ent2)} be smaller than #{ents.index(ent1)}"
447 447 assert ents.index(ent1) < ents.index(ent3), "expected #{ents.index(ent1)} be smaller than #{ents.index(ent3)}"
448 448 end
  449 +
  450 + should 'search for text articles in a specific category' do
  451 + person = create_user('teste').person
  452 +
  453 + # in category
  454 + art1 = TextileArticle.create!(:name => 'an article to be found', :profile => person)
  455 + art1.add_category(@category)
  456 + art1.save!
  457 +
  458 + # not in category
  459 + art2 = TextileArticle.create!(:name => 'another article to be found', :profile => person)
  460 +
  461 + list = @finder.find(:text_articles, 'found')
  462 + assert_includes list, art1
  463 + assert_not_includes list, art2
  464 + end
449 465  
450 466 end
... ...
test/unit/text_article_test.rb
  Diff comments   View file @9493ec0
... ... @@ -7,4 +7,17 @@ class TextArticleTest &lt; Test::Unit::TestCase
7 7 should 'inherit from Article' do
8 8 assert_kind_of Article, TextArticle.new
9 9 end
  10 +
  11 + should 'found TextileArticle by TextArticle class' do
  12 + person = create_user('testuser').person
  13 + article = TextileArticle.create!(:name => 'textile article test', :profile => person)
  14 + assert_includes TextArticle.find(:all), article
  15 + end
  16 +
  17 + should 'found TextileArticle by TextArticle indexes' do
  18 + person = create_user('testuser').person
  19 + article = TextileArticle.create!(:name => 'found article test', :profile => person)
  20 + assert_equal TextileArticle.find_by_contents('found'), TextArticle.find_by_contents('found')
  21 + end
  22 +
10 23 end
... ...