diff --git a/app/views/profile_search/_article.rhtml b/app/views/profile_search/_article.rhtml
new file mode 100644
index 0000000..45fea5c
--- /dev/null
+++ b/app/views/profile_search/_article.rhtml
@@ -0,0 +1,5 @@
+
+ <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %>
+ <%= link_to article.short_lead, article.url, {:class => 'article-details'} %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
diff --git a/app/views/profile_search/_folder.rhtml b/app/views/profile_search/_folder.rhtml
new file mode 100644
index 0000000..c9bfd26
--- /dev/null
+++ b/app/views/profile_search/_folder.rhtml
@@ -0,0 +1,5 @@
+
+ <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %>
+ <%= link_to article.body.to_s, article.url, {:class => 'article-details'} %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
diff --git a/app/views/profile_search/_uploaded_file.rhtml b/app/views/profile_search/_uploaded_file.rhtml
new file mode 100644
index 0000000..9e7ae4b
--- /dev/null
+++ b/app/views/profile_search/_uploaded_file.rhtml
@@ -0,0 +1,11 @@
+<% if article.image? %>
+
+ <%= link_to image_tag(article.public_filename(:thumb), :alt => article.display_title), article.view_url, :class => 'article-details' %>
+
+<% else %>
+
+ <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %>
+ <%= link_to article.title, article.short_lead, :class => 'article-details' %>
+ <%= link_to url_for(article.url), article.url, :class => 'article-url' %>
+
+<% end %>
diff --git a/app/views/profile_search/index.rhtml b/app/views/profile_search/index.rhtml
new file mode 100644
index 0000000..84ac4fa
--- /dev/null
+++ b/app/views/profile_search/index.rhtml
@@ -0,0 +1,18 @@
+
+
<%= _("Search results on %s's profile") % profile.short_name %>
+
+ <%= render :partial => 'shared/profile_search_form' %>
+
+
+ <%= _("%s results found") % @results.total_entries %>
+
+
+
+ <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
+ <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
+ <% end %>
+
+
+ <%= pagination_links @results %>
+
+
+
+ <%= text_field_tag 'q', @q, :title => _("Find %s's content") % profile.short_name %>
+
+ <%= submit_button(:search, _('Search')) %>
+
+ <%= labelled_radio_button __('on profile'), 'where', 'profile', true %>
+ <%= labelled_radio_button _('on %s') % environment.name, 'where', 'environment', false %>
+
+
Article to test profile search
', :profile_id => person.id)
+ article2 = fast_create(Article, :body => 'Another article to test profile search
', :profile_id => person.id)
+
+ get 'index', :profile => person.identifier, :q => 'article'
+
+ [article1, article2].each do |article|
+ assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article.short_lead, :attributes => { :class => /article-details/ }}
+ end
+ end
+
+ should 'paginate results listing' do
+ (1..11).each do |i|
+ TextileArticle.create!(:name => "Article #{i}", :profile => person, :language => 'en')
+ end
+
+ get 'index', :profile => person.identifier, :q => 'Article'
+
+ assert_equal 10, assigns(:results).size
+ assert_tag :tag => 'a', :attributes => { :href => "/profile/#{person.identifier}/search?page=2&q=Article", :rel => 'next' }
+ end
+
+ should 'display abstract if given' do
+ article1 = TextileArticle.create(:name => 'Article 1', :abstract => 'Abstract to test', :body => 'Article to test profile search', :profile => person)
+ article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person)
+
+ get 'index', :profile => person.identifier, :q => 'article profile'
+
+ assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.abstract, :attributes => { :class => /article-details/ }}
+ assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.body, :attributes => { :class => /article-details/ }}
+
+ assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article2.body, :attributes => { :class => /article-details/ }}
+ end
+
+ should 'display nothing if search is blank' do
+ article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person)
+ article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person)
+
+ get 'index', :profile => person.identifier, :q => ''
+
+ assert_no_tag :tag => 'ul', :attributes => { :id => 'profile-search-results'}, :descendant => { :tag => 'li' }
+ end
+
+ should 'not display private articles' do
+ article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person, :published => false)
+ article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person)
+
+ get 'index', :profile => person.identifier, :q => 'article profile'
+
+ assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.body, :attributes => { :class => /article-details/ }}
+
+ assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article2.body, :attributes => { :class => /article-details/ }}
+ end
+
+ should 'display number of results found' do
+ article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :body => 'Article to test profile search', :profile => person)
+ article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person)
+
+ get 'index', :profile => person.identifier, :q => 'article profile'
+
+ assert_tag :tag => 'div', :attributes => { :class => 'results-found-message' }, :content => /2 results found/
+ end
+
+end
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index a41f41b..a26c8e9 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -921,6 +921,16 @@ class ArticleTest < Test::Unit::TestCase
assert_equal '', a.lead
end
+ should 'have short lead' do
+ a = fast_create(TinyMceArticle, :body => '' + ('a' *180) + '
')
+ assert_equal 170, a.short_lead.length
+ end
+
+ should 'remove html from short lead' do
+ a = Article.new(:body => "an article with html that should be removed
")
+ assert_equal 'an article with html that should be removed', a.short_lead
+ end
+
should 'track action when a published article is created outside a community' do
article = TinyMceArticle.create! :name => 'Tracked Article', :profile_id => profile.id
assert article.published?
diff --git a/test/unit/profile_search_block_test.rb b/test/unit/profile_search_block_test.rb
new file mode 100644
index 0000000..c4f4a53
--- /dev/null
+++ b/test/unit/profile_search_block_test.rb
@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProfileSearchBlockTest < Test::Unit::TestCase
+
+ should 'describe itself' do
+ assert_not_equal Block.description, ProfileSearchBlock.description
+ end
+
+ should 'provide a default title' do
+ assert_not_equal Block.new.default_title, ProfileSearchBlock.new.default_title
+ end
+
+ should 'render profile search' do
+ person = fast_create(Person)
+
+ block = ProfileSearchBlock.new
+ block.stubs(:owner).returns(person)
+
+ self.expects(:render).with(:file => 'blocks/profile_search', :locals => { :title => block.title})
+ instance_eval(& block.content)
+ end
+
+ should 'provide view_title' do
+ person = fast_create(Person)
+ person.boxes << Box.new
+ block = ProfileSearchBlock.new(:title => 'Title from block')
+ person.boxes.first.blocks << block
+ block.save!
+ assert_equal 'Title from block', block.view_title
+ end
+
+end
diff --git a/test/unit/text_article_test.rb b/test/unit/text_article_test.rb
index e4ded47..34c5da7 100644
--- a/test/unit/text_article_test.rb
+++ b/test/unit/text_article_test.rb
@@ -43,4 +43,14 @@ class TextArticleTest < Test::Unit::TestCase
assert_kind_of Noosfero::TranslatableContent, TextArticle.new
end
+ should 'return article icon name' do
+ assert_equal Article.icon_name, TextArticle.icon_name
+ end
+
+ should 'return blog icon name if the article is a blog post' do
+ blog = fast_create(Blog)
+ article = TextArticle.new(:parent => blog)
+ assert_equal Blog.icon_name, TextArticle.icon_name(article)
+ end
+
end
--
libgit2 0.21.2