Merge branch 'stable'

Conflicts: app/models/qualifier.rb db/schema.rb test/unit/manage_products_helper_test.rb test/unit/qualifier_test.rb

Merge branch 'stable'
Conflicts: app/models/qualifier.rb db/schema.rb test/unit/manage_products_helper_test.rb test/unit/qualifier_test.rb
Joenio Costa
2 parents edfe30e8 db1cdcce
Showing 46 changed files with 461 additions and 98 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/browse_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/change_password.rb
app/models/enterprise_activation.rb
app/models/folder.rb
app/models/invite_friend.rb
app/models/invite_member.rb
app/models/qualifier.rb
app/models/task_mailer.rb
app/views/profile_editor/header_footer.rhtml
db/migrate/20110222211802_remove_action_tracker_records_with_nil_users.rb
db/schema.rb
debian/changelog
lib/noosfero.rb
@@ -49,6 +49,9 @@ class CmsController &lt; MyProfileController
     if profile.enterprise?
       articles << EnterpriseHomepage
     end
+    if @parent && @parent.blog?
+      articles -= Article.folder_types.map(&:constantize)
+    end
     articles
   end
  
@@ -109,6 +112,7 @@ class CmsController &lt; MyProfileController
  
     # user must choose an article type first
  
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
     record_coming
     @type = params[:type]
     if @type.blank?
@@ -16,16 +16,18 @@ class TasksController &lt; MyProfileController
   def close
     failed = {}
  
-    params[:tasks].each do |id, value|
-      decision = value[:decision]
-      if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
-        task = profile.find_in_all_tasks(id)
-        task.update_attributes!(value[:task])
-        begin
-          task.send(decision)
-        rescue Exception => ex
-          message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
-          failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+    if params[:tasks]
+      params[:tasks].each do |id, value|
+        decision = value[:decision]
+        if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
+          task = profile.find_in_all_tasks(id)
+          begin
+            task.update_attributes(value[:task])
+            task.send(decision)
+          rescue Exception => ex
+            message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
+            failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
+          end
         end
       end
     end
@@ -8,17 +8,20 @@ class BrowseController &lt; PublicController
     more_popular
   )
  
+  def per_page
+    27
+  end
+
   def people
     @filter = filter
     @title = self.filter_description(params[:action] + '_' + @filter )
  
     @results = @environment.people.visible.send(@filter)
  
-    if params[:query].blank?
-      @results = @results.paginate(:per_page => 27, :page => params[:page])
-    else
-      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
     end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
  
   def communities
@@ -27,11 +30,10 @@ class BrowseController &lt; PublicController
  
     @results = @environment.communities.visible.send(@filter)
  
-    if params[:query].blank?
-      @results = @results.paginate(:per_page => 27, :page => params[:page])
-    else
-      @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
     end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
  
   protected
@@ -105,6 +105,8 @@ class ProfileController &lt; PublicController
       end
       if request.xhr?
         render :layout => false
+      else
+        redirect_to profile.url
       end
     end
   end
@@ -65,7 +65,7 @@ module SearchHelper
       data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
     end
     unless profile.products.empty?
-      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i)}.join(', ') + '<br/>'
+      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
     end
     if profile.respond_to?(:distance) and !profile.distance.nil?
       data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
@@ -339,8 +339,13 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
+  def self.folder_types
+    ['Folder', 'Blog', 'Forum', 'Gallery']
+  end
+
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, :conditions => { :type => ['Folder', 'Blog', 'Forum', 'Gallery'] }
+  named_scope :folders, :conditions => { :type => folder_types}
+  named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
  
@@ -2,6 +2,13 @@ class Blog &lt; Folder
  
   acts_as_having_posts
  
+  #FIXME This should be used until there is a migration to fix all blogs that
+  # already have folders inside them
+  def posts_with_no_folders
+    posts_without_no_folders.no_folders
+  end
+  alias_method_chain :posts, :no_folders
+
   def self.short_description
     _('Blog')
   end
@@ -17,7 +17,7 @@ class BlogArchivesBlock &lt; Block
   settings_items :blog_id, Integer
  
   def blog
-    blog_id ? owner.blogs.find(blog_id) : owner.blog
+    blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
  
   def content
@@ -68,6 +68,10 @@ class ChangePassword &lt; Task
     user.force_change_password!(self.password, self.password_confirmation)
   end
  
+  def target_notification_description
+    _('%{requestor} wants to change its password.') % {:requestor => requestor.name}
+  end
+
   # overriding messages
  
   def task_cancelled_message
@@ -35,4 +35,8 @@ class EnterpriseActivation &lt; Task
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
+  def target_notification_description
+    _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => requestor.name, :enterprise => enterprise.name}
+  end
+
 end
 class Folder < Article
  
+  validate :not_belong_to_blog
+
+  def not_belong_to_blog
+    errors.add(:parent, "A folder should not belong to a blog.") if parent && parent.blog?
+  end
+
   acts_as_having_settings :field => :setting
  
   xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
@@ -23,6 +23,10 @@ class InviteFriend &lt; Invitation
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
  
+  def target_notification_description
+    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name}
+  end
+
   def permission
     :manage_friends
   end
@@ -35,6 +35,10 @@ class InviteMember &lt; Invitation
     {:type => :profile_image, :profile => community, :url => community.url}
   end
  
+  def target_notification_description
+    _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
+  end
+
   def expanded_message
     super.gsub /<community>/, community.name
   end
@@ -8,6 +8,8 @@ class Qualifier &lt; ActiveRecord::Base
   validates_presence_of :environment_id
   validates_presence_of :name
  
+  has_many :product_qualifiers, :dependent => :destroy
+
   def <=>(b)
     self.name.downcase.transliterate <=> b.name.downcase.transliterate
   end
@@ -32,7 +32,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.friend_email
  
     from self.class.generate_from(task)
-    subject '[%s] %s' % [ task.requestor.environment.name, task.information ]
+    subject '[%s] %s' % [ task.requestor.environment.name, task.target_notification_description ]
     body :message => msg
   end
  
@@ -52,7 +52,7 @@ class TaskMailer &lt; ActionMailer::Base
  
     recipients task.requestor.notification_emails
     from self.class.generate_from(task)
-    subject '[%s] %s' % [task.requestor.environment.name, task.information]
+    subject '[%s] %s' % [task.requestor.environment.name, task.target_notification_description]
     body :requestor => task.requestor.name,
       :message => text,
       :environment => task.requestor.environment.name,
@@ -21,9 +21,9 @@
       </div>
     <% end %>
     <h2><%= _('Content for header ') %></h2>
-    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;') %>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
     <h2><%= _('Content for footer') %></h2>
-    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;') %>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -0,0 +1,10 @@
+class RemoveActionTrackerRecordsWithNilUsers < ActiveRecord::Migration
+  # This migration is a copy of 20110127174236_remove_action_tracker_record_with_nil_users.rb
+  def self.up
+    ActionTracker::Record.all.map {|record| record.destroy if record.user.nil?}
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20110221195242) do
+ActiveRecord::Schema.define(:version => 20110222211802) do
  
   create_table "action_tracker", :force => true do |t|
     t.integer  "user_id"
+noosfero (0.28.6) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1874 AI#1890 AI#1893 AI#1871 AI#1884 AI#1892 AI#1882 AI#1883 AI#1896 AI#1875 AI#1895 AI#1879)
+
+ -- Joenio Costa <joenio@perl.org.br>  Sun, 27 Feb 2011 23:56:51 -0300
+
 noosfero (0.28.5) unstable; urgency=low
  
   * Bugfixes Version release. (Closes: AI#1867 AI#1866 AI#1870 AI#1854 AI#1851 AI#1810 AI#1889 AI#1868 AI#1855 AI#1887)
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.28.5'
+  VERSION = '0.28.6'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -1314,8 +1314,8 @@ a.comment-picture {
 }
  
 .comment-replies .comment-picture img {
-  width: 32px;
-  height: 32px;
+  max-width: 32px;
+  max-height: 32px;
 }
  
 .article-comment .comment-replies .button-bar {
@@ -2137,8 +2137,8 @@ input.disabled {
  
 .common-profile-list-block img {
   border: none;
-  width: 50px;
-  height: 50px;
+  max-width: 50px;
+  max-height: 50px;
 }
  
 .box-2 .common-profile-list-block span,
@@ -4400,11 +4400,20 @@ h1#agenda-title {
   padding: 0px;
   list-style: none;
 }
-.controller-search #content .search-results-type-article li,
 .controller-search #content .search-results-type-event li {
   padding: 2px 0px 4px 0px;
 }
  
+.controller-search #content .search-results-type-article li {
+  padding: 0px 0px 4px 20px;
+  background-repeat: no-repeat;
+  border-color: transparent;
+}
+
+.controller-search #content .search-results-type-article li:hover {
+  background-color: transparent;
+}
+
 .controller-search .search-results-type-article .item_meta,
 .controller-search .search-results-type-event .item_meta {
   font-size: 10px;
@@ -5596,8 +5605,8 @@ h1#agenda-title {
   padding: 1px;
   border: 1px solid #ccc;
   margin: 4px 3px 0 0;
-  width: 20px;
-  height: 20px;
+  max-width: 20px;
+  max-height: 20px;
 }
  
 .profile-wall-image {
@@ -5625,8 +5634,8 @@ h1#agenda-title {
  
 #profile-network .upload_image .profile-network-text span img,
 #profile-activity .upload_image .profile-activity-text span img {
-  width: auto;
-  height: auto;
+  max-width: none;
+  max-height: none;
 }
  
 #profile-network .upload_image .profile-network-text img,
@@ -310,6 +310,8 @@ module Noosfero::Factory
     { }
   end
  
+  alias :defaults_for_blog_archives_block :defaults_for_block
+
   ###############################################
   # Task
   ###############################################
@@ -358,7 +360,9 @@ module Noosfero::Factory
   # Certifier
   ###############################################
  
-  alias :defaults_for_certifier :defaults_for_qualifier
+  def defaults_for_certifier
+    defaults_for_qualifier.merge({ :name => 'Certifier ' + factory_num_seq.to_s })
+  end
  
   ###############################################
   # Scrap
@@ -65,6 +65,25 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     assert_tag :a, '', :attributes => {:class => 'next_page'}
   end
  
+  should 'not return nil results in the more_active people list' do
+    Profile.delete_all
+    p1 = fast_create(Person)
+    p2 = fast_create(Person)
+    p3 = fast_create(Person)
+    fast_create(Article, :profile_id => p1, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => p2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => p2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => p2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => p3, :created_at => 1.day.ago)
+
+    per_page = 1
+    @controller.stubs(:per_page).returns(per_page)
+
+    get :people, :filter => 'more_active'
+
+    assert_equal Person.count/per_page, assigns(:results).total_pages
+  end
+
   should 'list all people filter by more active' do
     Person.delete_all
     p1 = create(Person, :name => 'Testing person 1', :user_id => 1)
@@ -160,6 +179,26 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     assert_tag :a, '', :attributes => {:class => 'next_page'}
   end
  
+  should 'not return nil results in the more_active communities list' do
+    Profile.delete_all
+    c1 = fast_create(Community)
+    c2 = fast_create(Community)
+    c3 = fast_create(Community)
+    fast_create(Article, :profile_id => c1, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => c2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => c2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => c2, :created_at => 1.day.ago)
+    fast_create(Article, :profile_id => c3, :created_at => 1.day.ago)
+
+    per_page = 1
+    @controller.stubs(:per_page).returns(per_page)
+
+    get :communities, :filter => 'more_active'
+
+    assert_equal Community.count/per_page, assigns(:results).total_pages
+  end
+
+
   should 'list all communities filter by more active' do
     c1 = create(Community, :name => 'Testing community 1')
     c2 = create(Community, :name => 'Testing community 2')
@@ -818,6 +818,15 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Forum"}
   end
  
+  should 'not offer folders if in a blog' do
+    blog = fast_create(Blog, :profile_id => profile.id)
+    get :new, :profile => profile.identifier, :parent_id => blog.id, :cms => true
+    types = assigns(:article_types).map {|t| t[:name]}
+    Article.folder_types.each do |type|
+      assert_not_includes types, type
+    end
+  end
+
   should 'offer to edit a blog' do
     profile.articles << Blog.new(:name => 'blog test', :profile => profile)
  
@@ -714,8 +714,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
  
   should 'add meta tag to rss feed on view post blog' do
     login_as(profile.identifier)
-    profile.articles << Blog.new(:name => 'Blog', :profile => profile)
-    profile.blog.posts << TextileArticle.new(:name => 'first post', :parent => profile.blog, :profile => profile)
+    blog = Blog.create!(:name => 'Blog', :profile => profile)
+    TextileArticle.create!(:name => 'first post', :parent => blog, :profile => profile)
     get :view_page, :profile => profile.identifier, :page => ['blog', 'first-post']
     assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'Blog', :href => "http://#{environment.default_hostname}/testinguser/blog/feed" }
   end
@@ -1215,9 +1215,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
     blog.stubs(:display_posts_in_current_language).returns(true)
-    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
-    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
-    blog.posts = [en_article, es_article]
+    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
  
     get :view_page, :profile => @profile.identifier, :page => blog.explode_path
     assert_tag :div, :attributes => { :id => "post-#{es_article.id}" }
@@ -1239,8 +1238,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
     blog.stubs(:display_posts_in_current_language).returns(true)
-    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
-    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
     blog.posts = [en_article, es_article]
  
     get :view_page, :profile => @profile.identifier, :page => blog.explode_path
@@ -482,9 +482,9 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
  
   should 'show number of published posts in index' do
     profile.articles << blog = Blog.create(:name => 'Blog', :profile_id => profile.id)
-    blog.posts << TextileArticle.new(:name => 'Published post', :parent => profile.blog, :profile => profile)
-    blog.posts << TextileArticle.new(:name => 'Other published post', :parent => profile.blog, :profile => profile)
-    blog.posts << TextileArticle.new(:name => 'Unpublished post', :parent => profile.blog, :profile => profile, :published => false)
+    fast_create(TextileArticle, :name => 'Published post', :parent_id => profile.blog.id, :profile_id => profile.id)
+    fast_create(TextileArticle, :name => 'Other published post', :parent_id => profile.blog.id, :profile_id => profile.id)
+    fast_create(TextileArticle, :name => 'Unpublished post', :parent_id => profile.blog.id, :profile_id => profile.id, :published => false)
  
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :content => '2 posts', :attributes => { :href => /\/testuser\/blog/ }
@@ -1159,4 +1159,13 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'div', :content => /#{plugin1_tab[:content]}/, :attributes => {:id => /#{plugin1_tab[:id]}/}
   end
  
+  should 'redirect to profile page when try to request join_not_logged via GET method' do
+    community = Community.create!(:name => 'my test community')
+    login_as(profile.identifier)
+    get :join_not_logged, :profile => community.identifier
+    assert_nothing_raised do
+      assert_redirected_to community.url
+    end
+  end
+
 end
@@ -498,6 +498,12 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'textarea', :content => 'my custom footer'
   end
  
+  should 'render TinyMce Editor for header and footer' do
+    get :header_footer, :profile => profile.identifier
+    assert_tag :tag => 'textarea', :attributes => { :id => 'custom_header', :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :attributes => { :id => 'custom_footer', :class => 'mceEditor' }
+  end
+
   should 'save footer and header' do
     person = profile
     post :header_footer, :profile => profile.identifier, :custom_header => 'new header', :custom_footer => 'new footer'
@@ -217,16 +217,18 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     assert_includes c_blog2.children(true), p_article
   end
  
-  should 'raise error if there is an enterprise with the same identifier and keep the task active' do
+  should 'display error if there is an enterprise with the same identifier and keep the task active' do
     e = Environment.default
     e.add_admin(profile)
     task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => profile, :target => e)
     enterprise = fast_create(Enterprise, :name => "My Enterprise", :identifier => "my-enterprise")
  
-    assert_raise ActiveRecord::RecordInvalid do
-      post :close, :tasks => {task.id => { :task => {:reject_explanation => "Bla bla"}, :decision => "cancel"}}
+    assert_nothing_raised do
+      post :close, :tasks => {task.id => {:decision => "finish"}}
     end
  
+    assert_match /Validation.failed/, @response.body
+
     task.reload
     assert_equal Task::Status::ACTIVE, task.status
   end
@@ -280,4 +282,22 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     assert_equal 'new source', TinyMceArticle.find(:first).source_name
   end
  
+  should "not crash if accessing close without tasks parameter" do
+    assert_nothing_raised do
+      post :close
+    end
+  end
+
+  should 'close create enterprise if trying to cancel even if there is already an existing identifier' do
+    identifier = "common-identifier"
+    task = CreateEnterprise.create!(:identifier => identifier, :name => identifier, :requestor => profile, :target => profile)
+    fast_create(Profile, :identifier => identifier)
+
+    assert_nothing_raised do
+      post :close, :tasks => {task.id => {:task => {:reject_explanation => "Some explanation"}, :decision => 'cancel'}}
+    end
+
+    task.reload
+    assert_equal Task::Status::CANCELLED, task.status
+  end
 end
@@ -189,7 +189,7 @@ end
  
 module NoosferoTestHelper
   def link_to(content, url, options = {})
-    "<a href='#{url.to_s}'>#{content}</a>"
+    "<a href='#{url.inspect}'>#{content}</a>"
   end
  
   def content_tag(tag, content, options = {})
@@ -362,6 +362,14 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} wants to publish the article: #{article.name}/, email.subject)
   end
  
+  should 'deliver target finished message' do
+    task = ApproveArticle.new(:article => article, :target => community, :requestor => profile)
+
+    email = TaskMailer.deliver_task_finished(task)
+
+    assert_match(/#{task.requestor.name} wants to publish the article: #{article.name}/, email.subject)
+  end
+
   should 'approve an event' do
     event = fast_create(Event, :profile_id => profile.id, :name => 'Event test', :slug => 'event-test', :abstract => 'Lead of article', :body => 'This is my event')
     task = ApproveArticle.create!(:name => 'Event test', :article => event, :target => community, :requestor => profile)
@@ -1444,4 +1444,34 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert !Article.new.tiny_mce?
   end
  
+  should 'return only folders' do
+    not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
+    folders = [Folder, Blog, Gallery, Forum]
+
+    not_folders.each do |klass|
+      item = fast_create(klass)
+      assert_not_includes Article.folders, item
+    end
+
+    folders.each do |klass|
+      item = fast_create(klass)
+      assert_includes Article.folders, item
+    end
+  end
+
+  should 'return no folders' do
+    not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
+    folders = [Folder, Blog, Gallery, Forum]
+
+    not_folders.each do |klass|
+      item = fast_create(klass)
+      assert_includes Article.no_folders, item
+    end
+
+    folders.each do |klass|
+      item = fast_create(klass)
+      assert_not_includes Article.no_folders, item
+    end
+  end
+
 end
@@ -134,4 +134,27 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     assert_tag_in_string block.content, :tag => 'a', :content => 'January (2)', :attributes => {:href => /^http:\/\/.*\/flatline\/blog-one\?month=01&year=2008$/ }
   end
  
+  should 'not try to load a removed blog' do
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_nil block.blog
+    end
+  end
+
+  should 'load next blog if configured blog was removed' do
+    other_blog = fast_create(Blog, :profile_id => profile.id)
+    block = fast_create(BlogArchivesBlock)
+    block.blog_id = profile.blog.id
+    block.save!
+    block.stubs(:owner).returns(profile)
+    profile.blog.destroy
+    assert_nothing_raised do
+      assert_equal other_blog, block.blog
+    end
+  end
+
 end
@@ -195,4 +195,15 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert !blog.reload.display_posts_in_current_language?
   end
  
+  #FIXME This should be used until there is a migration to fix all blogs that
+  # already have folders inside them
+  should 'not list folders in posts' do
+    blog = fast_create(Blog)
+    folder = fast_create(Folder, :parent_id => blog.id)
+    article = fast_create(TextileArticle, :parent_id => blog.id)
+
+    assert_not_includes blog.posts, folder
+    assert_includes blog.posts, article
+  end
+
 end
@@ -132,4 +132,21 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     assert_equal c2.requestor, p2
   end
  
+  should 'have target notification description' do
+    person = fast_create(Person, :identifier => 'testuser')
+
+    change = ChangePassword.create(:login => 'testuser', :email => 'test@example.com', :environment_id => Environment.default.id)
+
+    assert_match(/#{change.requestor.name} wants to change its password/, change.target_notification_description)
+  end
+
+  should 'deliver task created message' do
+    person = fast_create(Person, :identifier => 'testuser')
+
+    task = ChangePassword.create(:login => 'testuser', :email => 'test@example.com', :environment_id => Environment.default.id)
+
+    email = TaskMailer.deliver_task_created(task)
+    assert_match(/#{task.requestor.name} wants to change its password/, email.subject)
+  end
+
 end
@@ -49,4 +49,13 @@ class EmailActivationTest &lt; Test::Unit::TestCase
     assert !anothertask.save
   end
  
+  should 'deliver activation email notification' do
+    user = create_user('testuser', :environment_id => Environment.default.id)
+
+    task = EmailActivation.new(:requestor => user.person, :target => Environment.default)
+
+    email = User::Mailer.deliver_activation_email_notify(user)
+    assert_match(/Welcome to #{task.requestor.environment.name} mail!/, email.subject)
+  end
+
 end
@@ -64,5 +64,12 @@ class EnterpriseActivationTest &lt; ActiveSupport::TestCase
     t.finish
   end
  
+  should 'have target notification description' do
+    ent = fast_create(Enterprise, :enabled => false)
+    task = EnterpriseActivation.create!(:enterprise => ent, :requestor => profiles(:ze))
+
+   assert_match(/#{task.requestor.name} wants to activate enterprise #{ent.name}/, task.target_notification_description)
+  end
+
 end
  
@@ -132,4 +132,12 @@ class FolderTest &lt; ActiveSupport::TestCase
     assert_no_match /[<>]/, folder.body
   end
  
+  should 'not have a blog as parent' do
+    folder = Folder.new
+    folder.parent = Blog.new
+    folder.valid?
+
+    assert folder.errors.on(:parent)
+  end
+
 end
@@ -120,4 +120,22 @@ class InviteFriendTest &lt; ActiveSupport::TestCase
     assert !task2.save
   end
  
+  should 'have target notification description' do
+    person = create_user('testuser1').person
+
+    task = InviteFriend.create!(:person => person, :friend_email => 'test@test.com', :message => '<url>')
+
+    assert_match(/#{task.requestor.name} wants to be your friend./, task.target_notification_description)
+  end
+
+  should 'deliver invitation notification' do
+    person = create_user('testuser1').person
+
+    task = InviteFriend.create!(:person => person, :friend_email => 'test@test.com', :message => '<url>')
+
+    email = TaskMailer.deliver_invitation_notification(task)
+
+    assert_match(/#{task.requestor.name} wants to be your friend./, email.subject)
+  end
+
 end
@@ -95,5 +95,25 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     assert !task2.save
   end
  
+  should 'have target notification description' do
+    p = create_user('testuser1').person
+    community = fast_create(Community)
+
+    task = InviteMember.create!(:person => p, :friend_email => 'test@test.com', :message => '<url>', :community_id => community.id)
+
+    assert_match(/#{task.requestor.name} invited you to join #{community.name}/, task.target_notification_description)
+  end
+
+  should 'deliver invitation notification' do
+    person = create_user('testuser1').person
+    community = fast_create(Community)
+
+    task = InviteMember.create!(:person => person, :friend_email => 'test@test.com', :message => '<url>', :community_id => community.id)
+
+    email = TaskMailer.deliver_invitation_notification(task)
+
+    assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject)
+  end
+
 end
  
@@ -167,6 +167,38 @@ class ManageProductsHelperTest &lt; Test::Unit::TestCase
     assert_equal ["Self declared", "Colivre", "FBES"], result.map{|i| i[0]}
   end
  
+  should 'list qualifiers and certifiers of a product' do
+    product = fast_create(Product)
+    qualifier = fast_create(Qualifier)
+    certifier = fast_create(Certifier)
+    ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier)
+    assert_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product)
+  end
+
+  should 'product survive to a Qualifier deletation' do
+    product = fast_create(Product)
+    qualifier = fast_create(Qualifier)
+    certifier = fast_create(Certifier)
+    ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier)
+    qualifier.destroy
+    assert_nothing_raised do
+      assert_no_match /✔ Qualifier \d+ certified by Certifier \d+/, display_qualifiers(product)
+    end
+  end
+
+  should 'product consider its Qualifier self-declared when Certifier is deleted' do
+    product = fast_create(Product)
+    qualifier = fast_create(Qualifier)
+    certifier = fast_create(Certifier)
+    ProductQualifier.create!(:product => product, :qualifier => qualifier, :certifier => certifier)
+    certifier.destroy
+    assert_nothing_raised do
+      result = display_qualifiers(product)
+      assert_match /✔ Qualifier \d+ \(Self declared\)/, result
+      assert_no_match /certified by Certifier \d+/, result
+    end
+  end
+
   protected
   include NoosferoTestHelper
   include ActionView::Helpers::TextHelper
@@ -49,4 +49,16 @@ class QualifierTest &lt; Test::Unit::TestCase
     assert_equal [first, last], Qualifier.all.sort
   end
  
+  should 'clean all ProductQualifier when destroy a Qualifier' do
+    product1 = fast_create(Product)
+    product2 = fast_create(Product)
+    qualifier = fast_create(Qualifier, :name => 'Free Software')
+    certifier = fast_create(Certifier, :name => 'FSF')
+    ProductQualifier.create!(:product => product1, :qualifier => qualifier, :certifier => certifier)
+    ProductQualifier.create!(:product => product2, :qualifier => qualifier, :certifier => certifier)
+    assert_equal [['Free Software', 'FSF']], product1.product_qualifiers.map{|i| [i.qualifier.name, i.certifier.name]}
+    Qualifier.destroy_all
+    assert_equal [], product1.product_qualifiers(true)
+  end
+
 end
@@ -212,7 +212,10 @@ class RssFeedTest &lt; Test::Unit::TestCase
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => fast_create(Person))
     a.finish
  
-    blog.posts << published_article = article.class.last
+    published_article = article.class.last
+    published_article.parent = blog
+    published_article.save
+
     feed = RssFeed.new(:parent => blog, :profile => profile)
  
     assert_match "This is the content of the Sample Article", feed.data
@@ -10,25 +10,20 @@ class SearchHelperTest &lt; Test::Unit::TestCase
  
   def setup
     @profile = mock
+    self.stubs(:profile_image).returns('profileimage.png')
+    self.stubs(:url_for).returns('link to profile')
+    profile.stubs(:name).returns('Name of Profile')
+    profile.stubs(:url).returns('')
+    profile.stubs(:products).returns([Product.new(:name => 'product test')])
+    profile.stubs(:identifier).returns('name-of-profile')
+    profile.stubs(:region).returns(Region.new(:name => 'Brazil'))
   end
   attr_reader :profile
  
-  include ActionView::Helpers::FormOptionsHelper
-  include ActionView::Helpers::FormTagHelper
-  include ActionView::Helpers::TagHelper
   should 'display profile info' do
-    profile.stubs(:name).returns('Name of Profile')
     profile.stubs(:address).returns('Address of Profile')
     profile.stubs(:contact_email).returns('Email of Profile')
     profile.stubs(:contact_phone).returns('Phone of Profile')
-    profile.stubs(:url).returns('')
-    profile.stubs(:products).returns([Product.new(:name => 'product test')])
-    profile.stubs(:identifier).returns('name-of-profile')
-    profile.stubs(:region).returns(Region.new(:name => 'Brazil'))
-
-    self.stubs(:profile_image).returns('profileimage.png')
-    self.stubs(:url_for).returns('merda')
-    self.stubs(:link_to).returns('link to profile')
  
     result = self.display_profile_info(profile)
     assert_match /profileimage.png/, result
@@ -39,18 +34,9 @@ class SearchHelperTest &lt; Test::Unit::TestCase
   end
  
   should 'not display field if nil in profile info' do
-    profile.stubs(:name).returns('Name of Profile')
     profile.stubs(:address).returns('nil')
     profile.stubs(:contact_email).returns('nil')
     profile.stubs(:contact_phone).returns('nil')
-    profile.stubs(:url).returns('')
-    profile.stubs(:products).returns([Product.new(:name => 'product test')])
-    profile.stubs(:identifier).returns('name-of-profile')
-    profile.stubs(:region).returns(Region.new(:name => 'Brazil'))
-
-    self.stubs(:profile_image).returns('profileimage.png')
-    self.stubs(:url_for).returns('merda')
-    self.stubs(:link_to).returns('link to profile')
  
     result = self.display_profile_info(profile)
     assert_match /profileimage.png/, result
@@ -60,4 +46,16 @@ class SearchHelperTest &lt; Test::Unit::TestCase
     assert_no_match /Address of Profile/, result
   end
  
+  should 'link to products and services of an profile' do
+    enterprise = fast_create(Enterprise)
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    product2 = fast_create(Product, :enterprise_id => enterprise.id)
+    result = display_profile_info(enterprise)
+    assert_tag_in_string result, :tag => 'a', :attributes => {:href => /:id=>#{product1.id}/}, :content => product1.name
+    assert_tag_in_string result, :tag => 'a', :attributes => {:href => /:id=>#{product2.id}/}, :content => product2.name
+  end
+
+  protected
+  include NoosferoTestHelper
+
 end
@@ -17,7 +17,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
  
     task = Task.new
     task.expects(:task_finished_message).returns('the message')
-    task.expects(:information).returns('the task')
+    task.expects(:target_notification_description).returns('the task')
  
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -40,7 +40,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
  
     task = Task.new
     task.expects(:task_cancelled_message).returns('the message')
-    task.expects(:information).returns('the task')
+    task.expects(:target_notification_description).returns('the task')
  
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -64,7 +64,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
     task = Task.new
  
     task.expects(:task_created_message).returns('the message')
-    task.expects(:information).returns('the task')
+    task.expects(:target_notification_description).returns('the task')
  
     requestor = mock()
     requestor.expects(:notification_emails).returns(['requestor@example.com'])
@@ -129,6 +129,8 @@ class TaskMailerTest &lt; Test::Unit::TestCase
  
     mail = TaskMailer.create_invitation_notification(task)
  
+    assert_match(/#{task.target_notification_description}/, mail.subject)
+
     assert_equal "Hello friend name, my name invite you, please follow this link: http://example.com/account/signup?invitation_code=123456", mail.body
  
     TaskMailer.deliver(mail)
@@ -12,6 +12,11 @@ module ActionTracker
  
     validates_presence_of :verb
     validates_presence_of :user
+    validate :user_existence
+
+    def user_existence
+      errors.add(:user, "user doesn't exists") if user && !user.class.exists?(user)
+    end
  
     alias_method :subject, :user
  
@@ -67,9 +67,32 @@ class ActionTrackerModelTest &lt; ActiveSupport::TestCase
     end
   end
  
+  def test_user_is_mandatory
+    ta = ActionTracker::Record.new :user_type => 'SomeModel', :verb => :some_verb
+    ta.valid?
+    assert ta.errors.on(:user)
+    assert_raise ActiveRecord::RecordInvalid do
+      ta.save!
+    end
+
+    ta = ActionTracker::Record.new :user_id => 2, :verb => :some_verb
+    ta.valid?
+    assert ta.errors.on(:user)
+    assert_raise ActiveRecord::RecordInvalid do
+      ta.save!
+    end
+  end
+
   def test_user_exists_indeed
-    ta = ActionTracker::Record.new(:user_id => -1, :user_type => "SomeModel", :verb => :some_verb)
-    assert !ta.valid?
+    ta = ActionTracker::Record.new(:verb => :some_verb)
+    ta.valid?
+    assert ta.errors.on(:user)
+    user = SomeModel.create!
+    ta.user = user
+    assert ta.valid?
+    user.destroy
+    ta.valid?
+    assert ta.errors.on(:user)
   end
  
   def test_verb_must_be_declared_previously
@@ -333,24 +356,4 @@ class ActionTrackerModelTest &lt; ActiveSupport::TestCase
     assert_equal(["foo 1", "bar 2"], t.collect_group_with_index(:test){|x, i| "#{x} #{i+1}" })
   end
  
-  def test_user_id_is_mandatory
-    ActionTrackerConfig.verbs = { :some => { :description => "Some" } }
-    ta = ActionTracker::Record.new :user_type => 'SomeModel', :verb => :some
-    ta.valid?
-    assert ta.errors.on(:user_id)
-    assert_raise ActiveRecord::RecordInvalid do
-      ta.save!
-    end
-  end
-
-  def test_user_type_is_mandatory
-    ActionTrackerConfig.verbs = { :some => { :description => "Some" } }
-    ta = ActionTracker::Record.new :user_id => 2, :verb => :some
-    ta.valid?
-    assert ta.errors.on(:user_type)
-    assert_raise ActiveRecord::RecordInvalid do
-      ta.save!
-    end
-  end
-
 end
...	...	@@ -49,6 +49,9 @@ class CmsController < MyProfileController
49	49	if profile.enterprise?
50	50	articles << EnterpriseHomepage
51	51	end
	52	+ if @parent && @parent.blog?
	53	+ articles -= Article.folder_types.map(&:constantize)
	54	+ end
52	55	articles
53	56	end
54	57
...	...	@@ -109,6 +112,7 @@ class CmsController < MyProfileController
109	112
110	113	# user must choose an article type first
111	114
	115	+ @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
112	116	record_coming
113	117	@type = params[:type]
114	118	if @type.blank?
...	...
...	...	@@ -16,16 +16,18 @@ class TasksController < MyProfileController
16	16	def close
17	17	failed = {}
18	18
19		- params[:tasks].each do \|id, value\|
20		- decision = value[:decision]
21		- if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
22		- task = profile.find_in_all_tasks(id)
23		- task.update_attributes!(value[:task])
24		- begin
25		- task.send(decision)
26		- rescue Exception => ex
27		- message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
28		- failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
	19	+ if params[:tasks]
	20	+ params[:tasks].each do \|id, value\|
	21	+ decision = value[:decision]
	22	+ if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
	23	+ task = profile.find_in_all_tasks(id)
	24	+ begin
	25	+ task.update_attributes(value[:task])
	26	+ task.send(decision)
	27	+ rescue Exception => ex
	28	+ message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
	29	+ failed[ex.clean_message] ? failed[ex.clean_message] << message : failed[ex.clean_message] = [message]
	30	+ end
29	31	end
30	32	end
31	33	end
...	...
...	...	@@ -8,17 +8,20 @@ class BrowseController < PublicController
8	8	more_popular
9	9	)
10	10
	11	+ def per_page
	12	+ 27
	13	+ end
	14	+
11	15	def people
12	16	@filter = filter
13	17	@title = self.filter_description(params[:action] + '_' + @filter )
14	18
15	19	@results = @environment.people.visible.send(@filter)
16	20
17		- if params[:query].blank?
18		- @results = @results.paginate(:per_page => 27, :page => params[:page])
19		- else
20		- @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
	21	+ if !params[:query].blank?
	22	+ @results = @results.find_by_contents(params[:query])
21	23	end
	24	+ @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
22	25	end
23	26
24	27	def communities
...	...	@@ -27,11 +30,10 @@ class BrowseController < PublicController
27	30
28	31	@results = @environment.communities.visible.send(@filter)
29	32
30		- if params[:query].blank?
31		- @results = @results.paginate(:per_page => 27, :page => params[:page])
32		- else
33		- @results = @results.find_by_contents(params[:query]).paginate(:per_page => 27, :page => params[:page])
	33	+ if !params[:query].blank?
	34	+ @results = @results.find_by_contents(params[:query])
34	35	end
	36	+ @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
35	37	end
36	38
37	39	protected
...	...
...	...	@@ -105,6 +105,8 @@ class ProfileController < PublicController
105	105	end
106	106	if request.xhr?
107	107	render :layout => false
	108	+ else
	109	+ redirect_to profile.url
108	110	end
109	111	end
110	112	end
...	...
...	...	@@ -65,7 +65,7 @@ module SearchHelper
65	65	data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
66	66	end
67	67	unless profile.products.empty?
68		- data << content_tag('strong', _('Products/Services: ')) + profile.products.map{\|i\| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i)}.join(', ') + '<br/>'
	68	+ data << content_tag('strong', _('Products/Services: ')) + profile.products.map{\|i\| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
69	69	end
70	70	if profile.respond_to?(:distance) and !profile.distance.nil?
71	71	data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
...	...
...	...	@@ -339,8 +339,13 @@ class Article < ActiveRecord::Base
339	339	end
340	340	end
341	341
	342	+ def self.folder_types
	343	+ ['Folder', 'Blog', 'Forum', 'Gallery']
	344	+ end
	345	+
342	346	named_scope :published, :conditions => { :published => true }
343		- named_scope :folders, :conditions => { :type => ['Folder', 'Blog', 'Forum', 'Gallery'] }
	347	+ named_scope :folders, :conditions => { :type => folder_types}
	348	+ named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
344	349	named_scope :galleries, :conditions => { :type => 'Gallery' }
345	350	named_scope :images, :conditions => { :is_image => true }
346	351
...	...
...	...	@@ -2,6 +2,13 @@ class Blog < Folder
2	2
3	3	acts_as_having_posts
4	4
	5	+ #FIXME This should be used until there is a migration to fix all blogs that
	6	+ # already have folders inside them
	7	+ def posts_with_no_folders
	8	+ posts_without_no_folders.no_folders
	9	+ end
	10	+ alias_method_chain :posts, :no_folders
	11	+
5	12	def self.short_description
6	13	_('Blog')
7	14	end
...	...
...	...	@@ -17,7 +17,7 @@ class BlogArchivesBlock < Block
17	17	settings_items :blog_id, Integer
18	18
19	19	def blog
20		- blog_id ? owner.blogs.find(blog_id) : owner.blog
	20	+ blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
21	21	end
22	22
23	23	def content
...	...
...	...	@@ -68,6 +68,10 @@ class ChangePassword < Task
68	68	user.force_change_password!(self.password, self.password_confirmation)
69	69	end
70	70
	71	+ def target_notification_description
	72	+ _('%{requestor} wants to change its password.') % {:requestor => requestor.name}
	73	+ end
	74	+
71	75	# overriding messages
72	76
73	77	def task_cancelled_message
...	...
...	...	@@ -35,4 +35,8 @@ class EnterpriseActivation < Task
35	35	{:type => :profile_image, :profile => requestor, :url => requestor.url}
36	36	end
37	37
	38	+ def target_notification_description
	39	+ _('%{requestor} wants to activate enterprise %{enterprise}.') % {:requestor => requestor.name, :enterprise => enterprise.name}
	40	+ end
	41	+
38	42	end
...	...