Merge branch 'stable'

Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb

Merge branch 'stable'
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb
Rodrigo Souto
2 parents 17071057 f8ed5a33
Showing 127 changed files with 562 additions and 495 deletions Show diff stats
AUTHORS
app/helpers/boxes_helper.rb
app/helpers/cms_helper.rb
app/models/action_tracker_notification.rb
app/models/article.rb
app/models/category.rb
app/models/featured_products_block.rb
app/models/person.rb
app/models/region.rb
app/sweepers/profile_sweeper.rb
app/views/cms/view.rhtml
app/views/profile/_person_profile.rhtml
app/views/profile_members/_members_list.rhtml
app/views/search/_full_article.html.erb
app/views/search/_full_blog.html.erb
app/views/search/_full_event.html.erb
app/views/search/_full_folder.html.erb
app/views/search/_full_forum.html.erb
app/views/search/_full_gallery.html.erb
app/views/search/_full_text_article.html.erb
@@ -44,6 +44,7 @@ Antonio Terceiro &lt;terceiro@colivre.coop.br&gt;
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
+Braulio Bhavamitra <braulio@eita.org.br>
 Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
 Caio Formiga <caio.formiga@gmail.com>
@@ -147,6 +148,7 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
@@ -99,9 +99,9 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-    if @controller.send(:content_editor?)
-      result = filter_html(result, block)
-    end
+
+    result = filter_html(result, block)
+
     box_decorator.block_target(block.box, block) +
       content_tag('div',
        content_tag('div',
@@ -28,7 +28,7 @@ module CmsHelper
   end
   def link_to_article(article)
-    article_name = short_filename(article.title, 30)
+    article_name = article.title
     if article.folder?
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
@@ -3,7 +3,7 @@ class ActionTrackerNotification &lt; ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
-  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+  delegate :comments, :to => :action_tracker, :allow_nil => true
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
@@ -57,7 +57,7 @@ class Article &lt; ActiveRecord::Base
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
-  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy
+  has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
   has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
   acts_as_having_settings :field => :setting
@@ -22,23 +22,15 @@ class Category &lt; ActiveRecord::Base
   named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
-  named_scope :sub_categories, lambda { |category|
-    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
-  }
-
-  named_scope :sub_tree, lambda { |category|
-    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
-  }
-
   acts_as_filesystem
-  has_many :article_categorizations, :dependent => :destroy
+  has_many :article_categorizations
   has_many :articles, :through => :article_categorizations
   has_many :comments, :through => :articles
   has_many :events, :through => :article_categorizations, :class_name => 'Event', :source => :article
-  has_many :profile_categorizations, :dependent => :destroy
+  has_many :profile_categorizations
   has_many :profiles, :through => :profile_categorizations, :source => :profile
   has_many :enterprises, :through => :profile_categorizations, :source => :profile, :class_name => 'Enterprise'
   has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
@@ -7,8 +7,9 @@ class FeaturedProductsBlock &lt; Block
   before_save do |block|
     if block.owner.kind_of?(Environment) && block.product_ids.blank?
-      seed = block.owner.products.count
-      block.product_ids = block.owner.highlighted_products_with_image(:offset => (rand(seed) % (seed - block.groups_of * 3)), :limit => block.groups_of * 3).map(&:id)
+      total = block.owner.products.count
+      offset = rand([(total - block.groups_of * 3) + 1, 1].max)
+      block.product_ids = block.owner.highlighted_products_with_image(:offset => offset, :limit => block.groups_of * 3).map(&:id)
     end
     block.groups_of = block.groups_of.to_i
   end
@@ -471,8 +471,9 @@ class Person &lt; Profile
     Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
   end
+  # by default, all fields are private
   def public_fields
-    self.fields_privacy.nil? ? self.active_fields : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
+    self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
   end
   protected
@@ -8,9 +8,9 @@ class Region &lt; Category
     validators.count > 0
   end
-  named_scope :with_validators, :group => 'id',
+  named_scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
     :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
-  
+
 end
 require_dependency 'city'
@@ -4,7 +4,7 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   include SweeperHelper
   def after_update(profile)
-    expire_caches(profile)
+    self.delay.expire_caches profile
   end
   def after_create(profile)
@@ -41,7 +41,7 @@
   <% end %>
   <% @articles.each do |article| article = FilePresenter.for article %>
-    <tr>
+    <tr title="<%= article.title%>" >
       <td class="article-name">
         <%= link_to_article(article) %>
       </td>
@@ -18,18 +18,6 @@
   <% cache_timeout(profile.relationships_cache_key, 4.hours) do %>
     <%= display_work_info profile %>
-    <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
-      <tr>
-        <th colspan='2'><%= __('Enterprises') %></th>
-      </tr>
-      <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
-        <tr>
-          <td></td>
-          <td><%= button 'menu-enterprise', item.name, item.url %></td>
-        </tr>
-      <% end %>
-    <% end %>
-
     <tr>
       <th colspan='2'><%= _('Network')%></th>
     </tr>
@@ -41,6 +29,12 @@
       <td><%= __('Communities') + ':' %></td>
       <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
     </tr>
+    <% if environment.disabled?('disable_asset_enterprises') %>
+      <tr id="person-profile-network-enterprises">
+        <td><%= __('Enterprises') + ':' %></td>
+        <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td>
+      </tr>
+    <% end %>
     <%= render :partial => 'common' %>
@@ -10,7 +10,7 @@
     <th><%= _('Actions') %></th>
   </tr>
   <% collection.each do |m| %>
-    <tr>
+    <tr title="<%= m.name %>">
       <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
       <td>
         <div class="members-buttons-cell">
 <li class="search-article-item article-item">
-  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => article %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => article %>
   </table>
 <li class="search-blog article-item">
-  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => blog %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-blog-items">
       <td class="search-field-label"><%= _("Last posts") %></td>
 <li class="search-event-item article-item">
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-<div class="search-content-first-column">
-  <%= render :partial => 'image', :object => event %>
-</div>
-<table class="noborder search-content-second-column">
-  <% if event.start_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('Start date') %></td>
-      <td class="article-item-date"><%= event.start_date %></td>
-    </tr>
-  <% end %>
-  <% if event.end_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('End date') %></td>
-      <td class="article-item-date"><%= event.end_date %></td>
-    </tr>
-  <% end %>
+  <div>
+    <%= link_to(event.title, event.url, :class => "search-result-title") %>
+  </div>
-  <%= render :partial => 'article_common', :object => event %>
-</table>
-<%= render :partial => 'article_last_change', :object => event %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => event %>
+  </div>
-<div style="clear: both"></div>
+  <table class="noborder search-content-second-column">
+    <% if event.start_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('Start date') %></td>
+        <td class="article-item-date"><%= event.start_date %></td>
+      </tr>
+    <% end %>
+    <% if event.end_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('End date') %></td>
+        <td class="article-item-date"><%= event.end_date %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_common', :object => event %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => event %>
+
+  <div style="clear: both"></div>
 </li>
 <li class="search-folder-item article-item">
-  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => folder %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-folder-items">
       <td class="search-field-label"><%= _("Last items") %></td>
 <li class="search-forum-item article-item">
-  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => forum %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-forum-items">
       <td class="search-field-label"><%= _("Last topics") %></td>
 <li class="search-gallery article-item">
-  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => gallery %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => gallery %>
   </table>
 <li class="search-text-article-item article-item">
-  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  </div>
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => text_article %>
 <li class="search-uploaded-file-item article-item">
-  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  </div>
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => uploaded_file %>
@@ -70,7 +70,7 @@ tinyMCE.init({
   paste_insert_word_content_callback : "convertWord",
   paste_use_dialog: false,
   apply_source_formatting : true,
-  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width]",
+  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width],audio[controls|autoplay],video[controls|autoplay],source[src|type]",
   content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
   language: <%= tinymce_language.inspect %>,
   entity_encoding: 'raw',
@@ -85,10 +85,10 @@ Rails::Initializer.run do |config|
   }
   # Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
-  config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder'
+  config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay'
    # Adds custom tags to the Set of allowed html tags for the #sanitize helper
-  config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe'
+  config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe', 'audio', 'video', 'source'
   # See Rails::Configuration for more options
@@ -221,7 +221,6 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
-    t.integer  "group_id"
   end
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+noosfero (0.44.4) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 07 Oct 2013 13:38:31 -0300
+
 noosfero (0.44.3) unstable; urgency=low
   * Bugfixes release
@@ -64,8 +64,8 @@ Feature: edit article
     And I fill in "Tag list" with "aurium, bug"
     And I press "Save"
     And I go to /joaosilva/article-with-tags
-    Then I should see "aurium" within "#article-tags a:first"
-    And I should see "bug" within "#article-tags a:last"
+    Then I should see "aurium" within "#article-tags"
+    And I should see "bug" within "#article-tags"
   Scenario: redirect to the created article
     Given I am on joaosilva's control panel
@@ -17,7 +17,7 @@ Feature: remove administrator role
   Scenario: the last administrator removes his administrator role and must choose the new administrator
     Given "Maria Souza" is a member of "Nice people"
     And I am on Nice people's members management
-    And I follow "Edit"
+    And I follow "Edit" within "tr[title='Joao Silva']"
     And I uncheck "Profile Administrator"
     When I press "Save changes"
     Then I should see "Since you are the last administrator, you must choose"
@@ -22,27 +22,27 @@ Feature: plugins
       | profile_tabs          | lambda { {:title => 'Test plugin tab', :id => 'test_plugin', :content => lambda {'Test plugin random content'} } } |
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I go to joaosilva's control panel
     Then I should see "Test plugin button"
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I am on joaosilva's profile
     Then I should see "Test plugin tab"
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
-    Given plugin TestPlugin is disabled on environment
+    Given plugin Test is disabled on environment
     And I go to joaosilva's control panel
     Then I should not see "Test plugin button"
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
-    Given plugin TestPlugin is disabled on environment
+    Given plugin Test is disabled on environment
     And I am on joaosilva's profile
     Then I should not see "Test plugin tab"
   Scenario: an admin should be able to deactivate a plugin
-    Given plugin TestPlugin is enabled on environment
+    Given plugin Test is enabled on environment
     And I am logged in as admin
     When I go to admin_user's control panel
     Then I should see "Test plugin button"
@@ -4,7 +4,8 @@ Feature: search communities
   In order to find ones that interest me
   Background:
-    Given the following category
+    Given plugin Solr is enabled on environment
+    And the following category
       | name           |
       | social network |
     And the following community
@@ -18,4 +18,4 @@ Feature: sitemap
   Scenario: view the CMS
     Given I am logged in as "joaosilva"
     When I am on /myprofile/joaosilva/cms
-    Then I should see "AGENDA_CULTURA_-_FEST(...).txt"
+    Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_(...).txt"
@@ -44,7 +44,7 @@ Given /^the following (community|communities|enterprises?|organizations?)$/ do |
     end
     if category && !category.blank?
       cat = Category.find_by_slug category
-      organization.categories << cat
+      ProfileCategorization.add_category_to_profile(cat, organization)
     end
     if img_name
       img = Image.create!(:uploaded_data => fixture_file_upload('/files/'+img_name+'.png', 'image/png'))
@@ -23,6 +23,7 @@ end
 Given /^plugin (.+) is (enabled|disabled) on environment$/ do |plugin, status|
   e = Environment.default
+  plugin = "#{plugin}Plugin"
   if status == 'enabled'
     e.enabled_plugins += [plugin]
   else
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.44.3'
+  VERSION = '0.44.4'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -64,6 +64,9 @@ class Noosfero::Plugin
         require init.gsub(/.rb$/, '') if File.file? init
       end
+      # load extensions
+      Dir[File.join(dir, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
+
       # load class
       klass(plugin_name)
     end
@@ -0,0 +1 @@
+raise "Not ready yet"
-require_dependency 'bsc_plugin/ext/enterprise'
-require_dependency 'bsc_plugin/ext/product'
-
 class BscPlugin < Noosfero::Plugin
   Bsc
-require_dependency 'comment_group_plugin/ext/article'
-require_dependency 'comment_group_plugin/ext/comment'
-
 class CommentGroupPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -1,21 +0,0 @@
-require_dependency 'article'
-
-class Article
-
-  #FIXME make this test
-  has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
-
-  #FIXME make this test
-  validate :not_empty_group_comments_removed
-
-  #FIXME make this test
-  def not_empty_group_comments_removed
-    if body
-      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
-      groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
-      errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
-    end
-  end
-
-end
-
@@ -1,12 +0,0 @@
-require_dependency 'comment'
-
-class Comment
-
-  named_scope :without_group, :conditions => {:group_id => nil }
-
-  named_scope :in_group, lambda { |group_id| {
-      :conditions => ['group_id = ?', group_id]
-    }
-  }
-
-end
@@ -0,0 +1,21 @@
+require_dependency 'article'
+
+class Article
+
+  #FIXME make this test
+  has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
+
+  #FIXME make this test
+  validate :not_empty_group_comments_removed
+
+  #FIXME make this test
+  def not_empty_group_comments_removed
+    if body
+      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
+      groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
+      errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
+    end
+  end
+
+end
+
@@ -0,0 +1,12 @@
+require_dependency 'comment'
+
+class Comment
+
+  named_scope :without_group, :conditions => {:group_id => nil }
+
+  named_scope :in_group, lambda { |group_id| {
+      :conditions => ['group_id = ?', group_id]
+    }
+  }
+
+end
@@ -10,15 +10,17 @@ class CommentGroupPluginTest &lt; ActiveSupport::TestCase
   attr_reader :environment
-  should 'filter_comments returns all the comments wihout group of an article passed as parameter' do
-    article = fast_create(Article)
-    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
-    c2 = fast_create(Comment, :source_id => article.id)
-    c3 = fast_create(Comment, :source_id => article.id)
-
-    plugin = CommentGroupPlugin.new
-    assert_equal [], [c2, c3] - plugin.filter_comments(article.comments)
-    assert_equal [], plugin.filter_comments(article.comments) - [c2, c3]
-  end
+#FIXME Obsolete test
+#
+#  should 'filter_comments returns all the comments wihout group of an article passed as parameter' do
+#    article = fast_create(Article)
+#    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
+#    c2 = fast_create(Comment, :source_id => article.id)
+#    c3 = fast_create(Comment, :source_id => article.id)
+#
+#    plugin = CommentGroupPlugin.new
+#    assert_equal [], [c2, c3] - plugin.filter_comments(article.comments)
+#    assert_equal [], plugin.filter_comments(article.comments) - [c2, c3]
+#  end
 end
@@ -0,0 +1,9 @@
+class SetPositionToExistentCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    update("UPDATE custom_forms_plugin_fields SET position = 0 WHERE position IS NULL")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
-require 'ext/role_assignment_trigger'
-
 class CustomFormsPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -15,8 +15,12 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
   before_create do |field|
     if field.form.fields.exists?
-      field.position = field.form.fields.order('position').last.position + 1
+      field.position = field.form.fields.order(:position).last.position + 1
     end
   end
+
+  def position
+    self[:position] || 0
+  end
 end
@@ -81,5 +81,17 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_equal 1, field_1.position
     assert_equal 2, field_2.position
   end
+
+  should 'not crash when adding new fields on a form with fields without position' do
+    form = CustomFormsPlugin::Form.create(:name => 'Free Software', :profile => fast_create(Profile))
+    field_0 = CustomFormsPlugin::Field.create(:name => 'License', :form => form)
+    field_0.position = nil
+    field_0.save
+
+    assert_nothing_raised do
+      field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+    end
+  end
+
 end
@@ -41,7 +41,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal [], json_response
+    assert_equivalent [], json_response
   end
   should 'index action returns an json with node content' do
@@ -53,7 +53,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -68,7 +68,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -84,7 +84,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'].merge!({'class' => 'jstree-undetermined'})
     expected_json['children'] = []
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node closed if the node has article with children' do
@@ -98,7 +98,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -121,7 +121,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
@@ -151,7 +151,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -173,7 +173,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
 end
@@ -41,7 +41,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal [], json_response
+    assert_equivalent [], json_response
   end
   should 'index action returns an json with node content' do
@@ -53,7 +53,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -68,7 +68,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -84,7 +84,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'].merge!({'class' => 'jstree-undetermined'})
     expected_json['children'] = []
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node closed if the node has article with children' do
@@ -99,7 +99,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -122,7 +122,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
-    assert_equal [expected_json], json_response
+    assert_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
@@ -152,7 +152,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -174,7 +174,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equal expected_json, json_response
+    assert_equivalent expected_json, json_response
   end
 end
@@ -0,0 +1,6 @@
+require_dependency 'profile'
+
+Profile.class_eval do
+  def bar
+  end
+end
-require_dependency 'foo_plugin/ext/profile'
-
 class FooPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -1,6 +0,0 @@
-require_dependency 'profile'
-
-Profile.class_eval do
-  def bar
-  end
-end
-require_dependency File.dirname(__FILE__) + '/ext/profile'
-
 class GoogleAnalyticsPlugin < Noosfero::Plugin
   include ActionView::Helpers::JavaScriptHelper
+require 'rubygems'
 require 'net/ldap'
@@ -0,0 +1,5 @@
+system "gem install --user-install net-ldap -v 0.3.1"
+puts "\nWARNING: This plugin is not setting up a ldap test server automatically.
+Some tests may not be running. If you want to fully test this plugin, please
+setup the ldap test server and make the proper configurations on
+fixtures/ldap.yml.\n\n"
-require_dependency File.dirname(__FILE__) + '/ext/environment'
 require File.dirname(__FILE__) + '/ldap_authentication.rb'
-
 class LdapPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -0,0 +1 @@
+raise "Not ready yet"
-require 'ext/active_record'
-
 class PgSearchPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -0,0 +1,5 @@
+require_dependency 'profile'
+
+class Profile
+  settings_items :allow_unauthenticated_comments, :type => :boolean
+end
-require_dependency 'require_auth_to_comment_plugin/ext/profile'
-
 class RequireAuthToCommentPlugin < Noosfero::Plugin
   include ActionView::Helpers::TagHelper
@@ -1,5 +0,0 @@
-require_dependency 'profile'
-
-class Profile
-  settings_items :allow_unauthenticated_comments, :type => :boolean
-end
@@ -7,7 +7,7 @@ Feature: send_email_plugin
     And I am logged in as "joaosilva"
   Scenario: expand macro in article content
-    Given plugin SendEmailPlugin is enabled on environment
+    Given plugin SendEmail is enabled on environment
     And the following articles
       | owner | name | body |
       | joaosilva | sample-article | URL path to {sendemail} action |
@@ -15,7 +15,7 @@ Feature: send_email_plugin
     Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action"
   Scenario: expand macro in block content
-    Given plugin SendEmailPlugin is enabled on environment
+    Given plugin SendEmail is enabled on environment
     And the following blocks
       | owner     | type         | html |
       | joaosilva | RawHTMLBlock | URL path to {sendemail} action |
@@ -63,6 +63,7 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
   def treat_delivery_options(params)
     result = {}
+    return result if params.nil? || params[:delivery_options].nil?
     params[:options].size.times do |counter|
       if params[:options][counter].present? && params[:prices][counter].present?
         result[params[:options][counter]] = params[:prices][counter]
@@ -0,0 +1,5 @@
+require_dependency 'enterprise'
+
+class Enterprise
+  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
+end
@@ -0,0 +1,5 @@
+require_dependency 'person'
+
+class Person
+  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
+end
-require_dependency 'shopping_cart_plugin/ext/enterprise'
-require_dependency 'shopping_cart_plugin/ext/person'
-
 class ShoppingCartPlugin < Noosfero::Plugin
   class << self
@@ -1,5 +0,0 @@
-require_dependency 'enterprise'
-
-class Enterprise
-  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
-end
@@ -1,5 +0,0 @@
-require_dependency 'person'
-
-class Person
-  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
-end
@@ -38,7 +38,7 @@ class ShoppingCartPlugin::CartHelperTest &lt; ActiveSupport::TestCase
     value = 13.7
     environment = Environment.default
-    assert_equal "#{environment.currency_unit} 13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
+    assert_equal "#{environment.currency_unit}13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
   end
 end
@@ -19,10 +19,9 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
   end
   should 'not add button if product unavailable' do
-    product = fast_create(Product, :available => false)
-    enterprise = mock()
+    enterprise = fast_create(:enterprise)
+    product = fast_create(Product, :available => false, :enterprise_id => enterprise.id)
     enterprise.stubs(:shopping_cart).returns(true)
-    product.stubs(:enterprise).returns(enterprise)
     assert_nil shopping_cart.add_to_cart_button(product)
   end
@@ -5,6 +5,7 @@ Feature: search contents
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following users
     Given the following users
       | login     | name       |
@@ -5,6 +5,7 @@ Feature: search enterprises
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following enterprises
       | identifier | name        | img |
       | shop1      | Shoes shop  | shoes |
@@ -12,6 +13,7 @@ Feature: search enterprises
     And the following categories as facets
       | name      |
       | Temáticas |
+
   Scenario: see default facets when searching
     When I go to the search enterprises page
     And I fill in "search-input" with "shoes"
@@ -34,10 +36,10 @@ Feature: search enterprises
     When I go to the search enterprises page
     And I fill in "search-input" with "Artesanato"
     And I press "Search"
-    Then I should see "Pres. Prudente" within "#facet-menu-f_region"
-    And I should see ", SP" within "#facet-menu-f_region"
-    And I should see "City" within ".search-enterprise-region-label"
-    And I should see "Pres. Prudente, SP" within ".search-enterprise-region-name"
+    Then I should see "Pres. Prudente" within "#facet-menu-solr_plugin_f_region"
+    And I should see ", SP" within "#facet-menu-solr_plugin_f_region"
+    And I should see "City" within ".facet-menu-label"
+    And I should see "Pres. Prudente, SP" within ".facet-menu-item"
   Scenario: find enterprise by region
     Given the following cities
@@ -5,6 +5,7 @@ Feature: search people
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And the following users
       | login      | name        |
       | joaosilva  | Joao Silva  |
@@ -5,6 +5,7 @@ Feature: search products
   Background:
     Given the search index is empty
+    And plugin Solr is enabled on environment
     And feature "disable_asset_products" is disabled on environment
     And the following enterprises
       | identifier  | name    |
@@ -13,6 +13,6 @@ Given /^the following categories as facets$/ do |table|
     ids << cat.id
   end
   env = Environment.default
-  env.top_level_category_as_facet_ids = ids
+  env.solr_plugin_top_level_category_as_facet_ids = ids
   env.save!
 end
@@ -0,0 +1,14 @@
+raise "Not ready yet. Some tests are failing."
+require 'rubygems'
+require 'rake'
+
+tasks_dir = File.join(File.dirname(__FILE__), 'vendor', 'plugins', 'acts_as_solr_reloaded', 'lib', 'tasks', '*.rake')
+
+Dir[tasks_dir].each do |file|
+  load file
+end
+
+begin
+  Rake::Task['solr:download'].invoke
+rescue Exception => exception
+end
@@ -6,8 +6,6 @@ class SolrPlugin &lt; Noosfero::Plugin
   include SolrPlugin::SearchHelper
-  delegate :params, :current_user, :to => :context
-
   def self.plugin_name
     "Solr"
   end
@@ -28,11 +26,16 @@ class SolrPlugin &lt; Noosfero::Plugin
     return if empty_query?(query, category) && klass != Product
     solr_options = solr_options(class_asset(klass), category)
-    user = context.send(:logged_in?) ? context.send(:user) : nil
     solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category)
     klass.find_by_contents(query, paginate_options, solr_options.merge(options))
   end
-end
+  def method_missing method, *args, &block
+    if self.context.respond_to? method
+      self.context.send method, *args, &block
+    else
+      super method, *args, &block
+    end
+  end
-Dir[File.join(SolrPlugin.root_path, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
+end
@@ -54,7 +54,7 @@ module SolrPlugin::SearchHelper
   end
   def results_only?
-    context.params[:action] == 'index'
+    params[:action] == 'index'
   end
   def empty_query?(query, category)
@@ -84,18 +84,18 @@ module SolrPlugin::SearchHelper
     solr_options = {}
     if !multiple_search?
       if !results_only? and asset_class.respond_to? :facets
-        solr_options.merge! asset_class.facets_find_options(context.params[:facet])
+        solr_options.merge! asset_class.facets_find_options(params[:facet])
         solr_options[:all_facets] = true
       end
       solr_options[:filter_queries] ||= []
       solr_options[:filter_queries] += filters(asset)
-      solr_options[:filter_queries] << "environment_id:#{context.environment.id}"
+      solr_options[:filter_queries] << "environment_id:#{environment.id}"
       solr_options[:filter_queries] << asset_class.facet_category_query.call(category) if category
       solr_options[:boost_functions] ||= []
-      context.params[:order_by] = nil if context.params[:order_by] == 'none'
-      if context.params[:order_by]
-        order = SortOptions[asset][context.params[:order_by].to_sym]
+      params[:order_by] = nil if params[:order_by] == 'none'
+      if params[:order_by]
+        order = SortOptions[asset][params[:order_by].to_sym]
         raise "Unknown order by" if order.nil?
         order[:solr_opts].each do |opt, value|
           solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
 .controller-search #search-column-right .search-field .formfield {
   width: 594px;
-  display: inline-block;
+  display: inline;
 }
 #search-column-right .search-customize-options {
-  position: absolute;
   margin: 0;
   padding: 5px 0;
-  bottom: 0;
-  left: 0;
 }
 #search-column-right .search-results-box .vcard {
-<% if logged_in? %>
-  <% button_bar do %>
-    <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-    <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) if @asset == :communities %>
-    <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) if @asset == :enterprises && environment.enabled?('enterprise_registration') %>
-  <% end %>
-<% end %>
 <% if !@empty_query %>
   <%= facets_menu(@asset, @facets) %>
 <% end %>
+
@@ -3,17 +3,13 @@
 <%= search_page_title( @titles[@asset], @category ) %>
-<% if !@empty_query %>
-  <div id='search-column-left'>
-    <%= render :partial => 'facets' %>
-  </div>
+<div id='search-column-left'>
+  <%= render :partial => 'facets' if !@empty_query %>
+</div>
-  <div id='search-column-right'>
-    <%= render :partial => 'results' %>
-  </div>
-<% else %>
+<div id='search-column-right'>
   <%= render :partial => 'results' %>
-<% end %>
+</div>
 <div style="clear: both"></div>
@@ -70,17 +70,17 @@ class SpaminatorPlugin::Spaminator
     self.class.log("Starting to process all comments")
     comments = comments_to_process
     total = comments.count
-    pbar = ProgressBar.new("☢ Comments", total)
+    pbar = ProgressBar.new("☢ Comments", total) if Rails.env.development?
     comments.each do |comment|
       begin
         process_comment(comment)
       rescue
         register_fail(:comments, comment)
       end
-      pbar.inc
+      pbar.inc if Rails.env.development?
     end
     @report.processed_comments = total
-    pbar.finish
+    pbar.finish if Rails.env.development?
     self.class.log("All comments processed")
   end
@@ -88,14 +88,14 @@ class SpaminatorPlugin::Spaminator
     self.class.log("Starting to process all people")
     people = people_to_process
     total = people.count
-    pbar = ProgressBar.new("☢ People", total)
+    pbar = ProgressBar.new("☢ People", total) if Rails.env.development?
     people.find_each do |person|
       process_person_by_comments(person)
       process_person_by_no_network(person)
-      pbar.inc
+      pbar.inc if Rails.env.development?
     end
     @report.processed_people = total
-    pbar.finish
+    pbar.finish if Rails.env.development?
     self.class.log("All people processed")
   end
@@ -40,7 +40,7 @@ class StoaPluginController &lt; PublicController
   def check_cpf
     begin
-      render :text => { :exists => !StoaPlugin::UspUser.find_by_codpes(params[:usp_id]).cpf.blank? }.to_json
+      render :text => { :exists => StoaPlugin::UspUser.find_by_codpes(params[:usp_id]).cpf.present? }.to_json
     rescue Exception => exception
       render :text => { :exists => false, :error => {:message => exception.to_s, :backtrace => exception.backtrace} }.to_json
     end
@@ -0,0 +1,5 @@
+require 'fileutils'
+
+config_path = File.join('plugins', 'stoa', 'config.yml')
+config_template = File.join('plugins', 'stoa', 'config.yml.dist')
+FileUtils.cp(config_template, config_path) if !File.exist?(config_path)
@@ -16,7 +16,7 @@ class Person
   end
   def invitation_task
-    Task.pending.find(:first, :conditions => {:code => invitation_code}) ||
-    Task.finished.find(:first, :conditions => {:code => invitation_code, :target_id => id})
+    Task.pending.find(:first, :conditions => {:code => invitation_code.to_s}) ||
+    Task.finished.find(:first, :conditions => {:code => invitation_code.to_s, :target_id => id})
   end
 end
 require_dependency 'person'
-require_dependency 'ext/person'
 class StoaPlugin < Noosfero::Plugin
@@ -36,7 +36,7 @@ class StoaPluginProfileEditorControllerTest &lt; ActionController::TestCase
   end
   should 'not display field if profile is an organization' do
-    organization = fast_create(Organization)
+    organization = fast_create(Community)
     organization.add_admin @person
     get :edit, :profile => organization.identifier
     assert_no_tag_in_string @response.body, :tag => 'label', :content => /USP number/,  :attributes => { :for => 'usp_id_field' }
@@ -12,27 +12,12 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
     @controller = StoaPluginController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @db = Tempfile.new('stoa-test')
-    configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
-    ActiveRecord::Base.establish_connection(:stoa)
-    ActiveRecord::Schema.verbose = false
-    ActiveRecord::Schema.create_table "pessoa" do |t|
-      t.integer  "codpes"
-      t.text     "numcpf"
-      t.date     "dtanas"
-    end
-    ActiveRecord::Base.establish_connection(:test)
+    ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => ':memory:', :verbosity => 'quiet'}
     env = Environment.default
     env.enable_plugin(StoaPlugin.name)
     env.enable('skip_new_user_email_confirmation')
     env.save!
     @user = create_user_full('real_user', {:password => '123456', :password_confirmation => '123456'}, {:usp_id => 9999999})
-    StoaPlugin::UspUser.create!(:codpes => 12345678, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30')
-  end
-
-  def teardown
-    @db.unlink
-    @user.destroy
   end
   attr_accessor :user
@@ -70,23 +55,39 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'check valid usp id' do
-    get :check_usp_id, :usp_id => '12345678'
+    usp_id = '12345678'
+    StoaPlugin::UspUser.stubs(:exists?).with(usp_id).returns(true)
+    get :check_usp_id, :usp_id => usp_id
     assert json_response['exists']
   end
   should 'check invalid usp id' do
-    get :check_usp_id, :usp_id => '87654321'
+    usp_id = '87654321'
+    StoaPlugin::UspUser.stubs(:exists?).with(usp_id).returns(false)
+    get :check_usp_id, :usp_id => usp_id
     assert !json_response['exists']
   end
   should 'check existent cpf' do
-    get :check_cpf, :usp_id => '12345678'
+    usp_id = '12345678'
+    user = mock
+    user.stubs(:cpf).returns('12345678')
+    StoaPlugin::UspUser.stubs(:find_by_codpes).with(usp_id).returns(user)
+    get :check_cpf, :usp_id => usp_id
     assert json_response['exists']
   end
   should 'check not existent cpf' do
-    StoaPlugin::UspUser.create(:codpes => 87654321, :birth_date => '1970-01-30')
-    get :check_cpf, :usp_id => '87654321'
+    usp_id_with_cpf = '12345678'
+    user_with_cpf = mock
+    user_with_cpf.stubs(:cpf).returns('12345678')
+    StoaPlugin::UspUser.stubs(:find_by_codpes).with(usp_id_with_cpf).returns(user_with_cpf)
+    get :check_cpf, :usp_id => usp_id_with_cpf
+    usp_id_without_cpf = '87654321'
+    user_without_cpf = mock
+    user_with_cpf.stubs(:cpf).returns(nil)
+    StoaPlugin::UspUser.stubs(:find_by_codpes).with(usp_id_without_cpf).returns(user_without_cpf)
+    get :check_cpf, :usp_id => usp_id_without_cpf
     assert !json_response['exists']
   end
@@ -0,0 +1,5 @@
+require_dependency 'create_enterprise'
+
+class CreateEnterprise
+  settings_items :sub_organizations_plugin_parent_to_be
+end
@@ -0,0 +1,13 @@
+require_dependency 'organization'
+class Organization
+  settings_items :sub_organizations_plugin_parent_to_be
+
+  after_create do |organization|
+    if organization.sub_organizations_plugin_parent_to_be.present?
+      parent = Organization.find(organization.sub_organizations_plugin_parent_to_be)
+      SubOrganizationsPlugin::Relation.add_children(parent,organization)
+    end
+  end
+
+  FIELDS << 'sub_organizations_plugin_parent_to_be'
+end
-require_dependency 'sub_organizations_plugin/ext/organization'
-require_dependency 'sub_organizations_plugin/ext/create_enterprise'
-
 class SubOrganizationsPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -1,5 +0,0 @@
-require_dependency 'create_enterprise'
-
-class CreateEnterprise
-  settings_items :sub_organizations_plugin_parent_to_be
-end
@@ -1,13 +0,0 @@
-require_dependency 'organization'
-class Organization
-  settings_items :sub_organizations_plugin_parent_to_be
-
-  after_create do |organization|
-    if organization.sub_organizations_plugin_parent_to_be.present?
-      parent = Organization.find(organization.sub_organizations_plugin_parent_to_be)
-      SubOrganizationsPlugin::Relation.add_children(parent,organization)
-    end
-  end
-
-  FIELDS << 'sub_organizations_plugin_parent_to_be'
-end
-require_dependency 'ext/article'
-require_dependency 'ext/comment'
-
 class ToleranceTimePlugin < Noosfero::Plugin
   def self.plugin_name
-require_dependency 'ext/uploaded_file'
-
 class WorkAssignmentPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -32,7 +30,9 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   end
   def content_remove_upload(content)
-    !content.profile.members.include?(context.send(:user))
+    if content.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+      !content.profile.members.include?(context.send(:user))
+    end
   end
   def content_viewer_controller_filters
@@ -10,6 +10,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @controller = ContentViewerController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @profile = create_user('testinguser').person
     @organization = fast_create(Organization)
     @work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => @organization)
@@ -19,7 +20,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @environment.save!
     login_as(:test_user)
   end
-  attr_reader :organization, :person, :work_assignment
+  attr_reader :organization, :person, :profile, :work_assignment
   should 'can download work_assignment' do
     random_member = fast_create(Person)
@@ -38,4 +39,11 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_response :success
   end
+  should "display 'Upload files' when create children of image gallery" do
+    login_as(profile.identifier)
+    f = Gallery.create!(:name => 'gallery', :profile => profile)
+    xhr :get, :view_page, :profile => profile.identifier, :page => f.explode_path, :toolbar => true
+    assert_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{f.id}/}
+  end
+
 end
@@ -1448,7 +1448,9 @@ a.comment-picture {
   display: inline;
 }
 #content #boxes .box-1 .article-block img,
-#content #article .article-body img {
+#content #article .article-body img,
+#content #article .article-body video,
+#content #article .article-body audio {
   max-width: 100%;
   height: auto;
 }
@@ -3099,15 +3101,38 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 /* ==> public/stylesheets/controller_cms.css <== */
+table.cms-articles {
+  table-layout: fixed;
+  width: 100%;
+}
+
+table.cms-articles td:first-child,
+table.cms-articles th:first-child {
+  width: 50%;
+}
+
+table.cms-articles td:nth-child(2) {
+  font-size: 10px;
+}
+
+table.cms-articles td:last-child,
+table.cms-articles th:last-child {
+  width: 121px;
+}
 table.cms-articles img {
   width: 16px;
   height: 16px;
 }
+
 table.cms-articles a.icon {
   display: block;
   border: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
+
 table.cms-articles a.icon, table.cms-articles a.icon-parent-folder {
   padding: 0px 0px 3px 20px;
   background-repeat: no-repeat;
@@ -3116,6 +3141,17 @@ table.cms-articles .icon:hover {
   background-color: transparent;
 }
+#content table.cms-articles .button:hover,
+#content table.cms-articles .button {
+  margin: 0;
+  float: left;
+  border-right: none;
+}
+
+#content table.cms-articles .button:last-child {
+  border-right: 1px solid #ccc;
+}
+
 .select-article-type {
   padding: 5px 20px;
   width: 455px;
@@ -753,19 +753,13 @@ li.search-product-item hr {
 .search-content-first-column {
   width: 130px;
   min-height: 98px;
-  position: absolute;
-}
-.search-gallery .search-content-first-column {
-  width: 190px;
+  float: left;
 }
 .search-content-second-column {
   margin-left: 140px;
   width: auto;
 }
-.search-gallery .search-content-second-column {
-  margin-left: 200px;
-}
 .search-content-second-column tr:hover {
   background-color: none;
@@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column {
   width:795px;
 }
 ul.clean-list .search-gallery-content {
-  width:655px
+  width:655px;
 }
 a.search-image-pic {
   border: 1px solid #F2F2F2;
@@ -819,7 +813,7 @@ a.search-image-pic {
   font-weight: bold;
   text-transform: uppercase;
   letter-spacing: 1px;
-  user-select: none;       
+  user-select: none;
   border-radius: 5px;
   -moz-user-select: none;
   -khtml-user-select: none;
@@ -844,8 +838,9 @@ a.search-image-pic {
 .search-gallery .search-gallery-items {
   float: left;
   margin: 0;
-  min-width: 130px;
+  width: 130px;
   position: relative;
+  overflow: hidden;
 }
 .search-gallery .search-gallery-items a.search-image-pic {
@@ -4,7 +4,7 @@ run sudo apt-get -y install $runtime_dependencies
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
 # needed for development
-run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
+run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql
 gem which bundler >/dev/null 2>&1 || gem_install bundler
 setup_rubygems_path
 run bundle install
@@ -86,12 +86,18 @@ _enable(){
       echo "E: $plugin plugin does not exist!"
       return
     fi
-    dependencies_ok=true
-    dependencies_file="$source/dependencies.rb"
-    if ! run $dependencies_file; then
-      dependencies_ok=false
+    installation_ok=true
+    installation_file="$source/install.rb"
+    if ! run $installation_file; then
+      installation_ok=false
+    else
+      dependencies_ok=true
+      dependencies_file="$source/dependencies.rb"
+      if ! run $dependencies_file; then
+        dependencies_ok=false
+      fi
     fi
-    if [ "$dependencies_ok" = true ]; then
+    if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
       ln -s "$source" "$target"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
@@ -100,7 +106,9 @@ _enable(){
       _say "$plugin enabled"
       run "$source/after_enable.rb"
       needs_migrate=true
-    else
+    elif [ "$installation_ok" = false ]; then
+      echo "W: failed to install $plugin; not enabling"
+    elif [ "$dependencies_ok" = false ]; then
       echo "W: failed to load dependencies for $plugin; not enabling"
     fi
   fi
@@ -67,7 +67,10 @@ else
 fi
 # create the database with sample data
-run cp config/database.yml.sqlite3 config/database.yml
+run cp config/database.yml.pgsql config/database.yml
+sudo -u postgres createuser $USER --no-superuser --createdb --no-createrole
+sed -ri "s/username: noosfero/username: $USER/"
+sudo -u postgres createdb noosfero_development -O $USER
 run rake db:schema:load
 run rake db:data:minimal
 run rake db:test:prepare
@@ -190,7 +190,7 @@ class AccountControllerTest &lt; ActionController::TestCase
     post :change_password, :current_password => 'test', :new_password => 'blabla', :new_password_confirmation => 'blabla'
     assert_response :redirect
     assert_redirected_to :action => 'index'
-    assert User.find_by_login('ze').authenticated?('blabla')
+    assert assigns(:current_user).authenticated?('blabla')
     assert_equal users(:ze), @controller.send(:current_user)
   end
@@ -308,7 +308,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'not display contact us for non-enterprises' do
     @profile.boxes.first.blocks << block = ProfileInfoBlock.create!
-    get :profile_info, :profile => @profile, :block_id => block.id
+    get :profile_info, :profile => @profile.identifier, :block_id => block.id
     assert_no_match /\/contact\/#{@profile.identifier}\/new/, @response.body
   end
@@ -987,12 +987,12 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     get :index, :profile => c.identifier
-    assert_equal [s2,s3], assigns(:activities)
+    assert_equivalent [s2,s3], assigns(:activities)
   end
   should 'the activities be paginated in people profiles' do
     p1 = Person.first
-    40.times{fast_create(Scrap, :sender_id => p1.id, :created_at => Time.now)}
+    40.times{fast_create(Scrap, :receiver_id => p1.id, :created_at => Time.now)}
     @controller.stubs(:logged_in?).returns(true)
     user = mock()
@@ -1606,4 +1606,25 @@ class ProfileControllerTest &lt; ActionController::TestCase
       assert_no_match /Test enterprise_2/, links.to_s
     end
   end
+
+  should 'show enterprises field if enterprises are enabled on environment' do
+    person = fast_create(Person)
+    environment = person.environment
+    environment.disable('disable_asset_enterprises')
+    environment.save!
+
+    get :index, :profile => person.identifier
+    assert_tag :tag => 'tr', :attributes => { :id => "person-profile-network-enterprises" }
+  end
+
+  should 'not show enterprises field if enterprises are disabled on environment' do
+    person = fast_create(Person)
+    environment = person.environment
+    environment.enable('disable_asset_enterprises')
+    environment.save!
+
+    get :index, :profile => person.identifier
+    assert_no_tag :tag => 'tr', :attributes => { :id => "person-profile-network-enterprises" }
+  end
+
 end
@@ -425,7 +425,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'show link to article asset in the see all foot link of the articles block in the category page' do
 	(1..SearchController::MULTIPLE_SEARCH_LIMIT+1).each do |i|
 	  a = create_user("test#{i}").person.articles.create!(:name => "article #{i} to be found")
-      a.categories << @category
+      ArticleCategorization.add_category_to_article(@category, a)
     end
     get :category_index, :category_path => [ 'my-category' ]
@@ -608,11 +608,11 @@ class SearchControllerTest &lt; ActionController::TestCase
 		get :tag, :tag => 'two'
-    assert_equal [a, a2], assigns(:searches)[:tag][:results]
+    assert_equivalent [a, a2], assigns(:searches)[:tag][:results]
 		get :tag, :tag => 'one'
-    assert_equal [a], assigns(:searches)[:tag][:results]
+    assert_equivalent [a], assigns(:searches)[:tag][:results]
   end
   should 'not show assets from other environments' do
@@ -17,7 +17,8 @@ class AssetsMenuTest &lt; ActionController::IntegrationTest
   should 'link to assets inside category root' do
 	(1..SearchController::MULTIPLE_SEARCH_LIMIT+1).each do |i|
-      ent = @category.enterprises.create! :identifier => "ent#{i}", :name => "enterprise#{i}"
+      enterprise = Enterprise.create! :identifier => "ent#{i}", :name => "enterprise#{i}"
+      ProfileCategorization.add_category_to_profile(@category, enterprise)
     end
     get '/cat/parent-category/category-a'
@@ -52,28 +52,6 @@ class PerformanceTest &lt; ActionController::IntegrationTest
     a2 = (time2.total - time1.total)/50.0
     assert a1 > a2*FACTOR, "#{a1} should be larger than #{a2} by at least a factor of #{FACTOR}"
   end
-
-  should 'not have a linear increase in time to save enterprise due to amount of products' do
-    $DISABLE_DELAYED_JOB_TEST_ENV_RUN = true
-    enterprise0 = Enterprise.create!(:name => 'Enterprise 0', :identifier => 'enterprise0')
-    enterprise1 = Enterprise.create!(:name => 'Enterprise 1', :identifier => 'enterprise1')
-    enterprise2 = Enterprise.create!(:name => 'Enterprise 2', :identifier => 'enterprise2')
-
-    create_products(enterprise1,25)
-    create_products(enterprise2,50)
-
-    enterprise0.reload
-    enterprise1.reload
-    enterprise2.reload
-
-    time0 = (Benchmark.measure { 10.times { enterprise0.save! } }).total
-    time1 = (Benchmark.measure { 10.times { enterprise1.save! } }).total
-    time2 = (Benchmark.measure { 10.times { enterprise2.save! } }).total
-
-    assert (time1 - time0) < time0*0.5
-    assert (time2 - time0) < time0*0.5
-  end
-
   protected
   def create_profile(name)
@@ -91,13 +69,5 @@ class PerformanceTest &lt; ActionController::IntegrationTest
     end
   end
-  def create_products(enterprise,n)
-    number = Product.all.count
-    pc = ProductCategory.create!(:name => "Any Category #{n}", :environment => Environment.default)
-    n.times do |i|
-      Product.create!(:enterprise => enterprise, :product_category => pc, :name => "Product #{i+number+1}")
-    end
-  end
-
 end
@@ -80,7 +80,11 @@ class ActsAsFilesystemTest &lt; ActiveSupport::TestCase
     article2 = Article.create!(:name => 'article 2', :profile => profile, :parent => folder)
     folder.reload
-    assert_equal [folder, article1, article2], folder.map_traversal
+    items = folder.map_traversal
+
+    assert_includes items, folder
+    assert_includes items, article1
+    assert_includes items, article2
   end
   should 'allow dots in slug' do
@@ -165,21 +165,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'search for recent documents' do
-    other_profile = create_user('otherpropfile').person
-
-    first = fast_create(TextArticle, :profile_id => profile.id, :name => 'first')
-    second = fast_create(TextArticle, :profile_id => profile.id, :name => 'second')
-    third = fast_create(TextArticle, :profile_id => profile.id, :name => 'third')
-    fourth = fast_create(TextArticle, :profile_id => profile.id, :name => 'fourth')
-    fifth = fast_create(TextArticle, :profile_id => profile.id, :name => 'fifth')
-
-    other_first = other_profile.articles.build(:name => 'first'); other_first.save!
-
-    assert_equal [other_first, fifth, fourth], Article.recent(3)
-    assert_equal [other_first, fifth, fourth, third, second, first], Article.recent(6)
-  end
-
   should 'not show private documents as recent' do
     p = create_user('usr1').person
     Article.destroy_all
@@ -342,16 +327,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'list most commented articles' do
     Article.delete_all
-    (1..4).each do |n|
-      create(TextileArticle, :name => "art #{n}", :profile_id => profile.id)
-    end
-    first_article = profile.articles.first
-    2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => first_article).save! }
+    a1 = create(TextileArticle, :name => "art 1", :profile_id => profile.id)
+    a2 = create(TextileArticle, :name => "art 2", :profile_id => profile.id)
+    a3 = create(TextileArticle, :name => "art 3", :profile_id => profile.id)
+
+    2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a2).save! }
+    4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a3).save! }
-    last_article = profile.articles.last
-    4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => last_article).save! }
     # should respect the order (more commented comes first)
-    assert_equal [last_article, first_article], profile.articles.most_commented(2)
+    assert_equal [a3, a2, a1], profile.articles.most_commented(3)
   end
   should 'identify itself as a non-folder' do
@@ -449,8 +433,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     owner = create_user('testuser').person
     art = owner.articles.create!(:name => 'ytest')
     art.category_ids = [c2,c3,c3].map(&:id)
-    assert_equal [c2, c3], art.categories(true)
-    assert_equal [c2, c1, c3], art.categories_including_virtual(true)
+
+    categories = art.categories(true)
+    categories_including_virtual = art.categories_including_virtual(true)
+    assert_not_includes categories, c1
+    assert_includes categories, c2
+    assert_includes categories, c3
+    assert_includes categories_including_virtual, c1
+    assert_includes categories_including_virtual, c2
+    assert_includes categories_including_virtual, c3
   end
   should 'not accept Product category as category' do
@@ -1305,11 +1296,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'rotate translations when root article is destroyed' do
     native_article = fast_create(Article, :language => 'pt', :profile_id => @profile.id)
-    translation1 = fast_create(Article, :language => 'en', :translation_of_id => native_article.id, :profile_id => @profile.id)
-    translation2 = fast_create(Article, :language => 'es', :translation_of_id => native_article.id, :profile_id => @profile.id)
+    fast_create(Article, :language => 'en', :translation_of_id => native_article.id, :profile_id => @profile.id)
+    fast_create(Article, :language => 'es', :translation_of_id => native_article.id, :profile_id => @profile.id)
+
+    new_root = native_article.translations.first
+    child = (native_article.translations - [new_root]).first
     native_article.destroy
-    assert translation1.translation_of.nil?
-    assert translation1.translations.include?(translation2)
+
+    assert new_root.translation_of.nil?
+    assert new_root.translations.include?(child)
   end
   should 'rotate one translation when root article is destroyed' do
@@ -1569,7 +1564,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
     c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
-    assert_equal [c1,c2,c5], Article.text_articles
+    assert_equivalent [c1,c2,c5], Article.text_articles
   end
   should 'delegate region info to profile' do
@@ -350,7 +350,7 @@ class CategoryTest &lt; ActiveSupport::TestCase
     p1.add_category c
     p2 = create_user('testuser_2').person
     p2.add_category c
-    assert_equal [p1, p2], c.people
+    assert_equivalent [p1, p2], c.people
   end
   should 'have communities' do
@@ -359,7 +359,7 @@ class CategoryTest &lt; ActiveSupport::TestCase
     c1.add_category c
     c2 = fast_create(Community, :name => 'testcommunity_2')
     c2.add_category c
-    assert_equal [c1, c2], c.communities
+    assert_equivalent [c1, c2], c.communities
   end
   should 'have products through enteprises' do
@@ -488,12 +488,16 @@ class CategoryTest &lt; ActiveSupport::TestCase
   end
   should 'paginate upcoming events' do
+    Event.destroy_all
     category = Category.create!(:name => 'category1', :environment_id => Environment.default.id)
     profile = fast_create(Profile)
-    event1 = category.events.build(:name => 'event1', :start_date => Time.now, :profile => profile)	
-    event2 = category.events.build(:name => 'event2', :start_date => Time.now + 1.hour, :profile => profile)	
-    event3 = category.events.build(:name => 'event3', :start_date => Time.now + 1.day, :profile => profile)
-    category.save!
+    event1 = Event.create!(:name => 'event1', :profile => profile, :start_date => Time.now)
+    event2 = Event.create!(:name => 'event2', :profile => profile, :start_date => Time.now + 1.day)
+    event3 = Event.create!(:name => 'event3', :profile => profile, :start_date => Time.now + 2.days)
+    ArticleCategorization.add_category_to_article(category, event1)
+    ArticleCategorization.add_category_to_article(category, event2)
+    ArticleCategorization.add_category_to_article(category, event3)
+
     assert_equal [event1, event2], category.upcoming_events(2)
   end
@@ -537,38 +541,4 @@ class CategoryTest &lt; ActiveSupport::TestCase
     assert_includes Category.on_level(parent.id), category
   end
-  should 'list category sub-categories' do
-    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
-    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
-    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
-    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
-    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
-
-    sub_categories = Category.sub_categories(c1)
-
-    assert ActiveRecord::NamedScope::Scope, sub_categories.class
-    assert_not_includes sub_categories, c1
-    assert_not_includes sub_categories, c2
-    assert_includes sub_categories, c3
-    assert_includes sub_categories, c4
-    assert_includes sub_categories, c5
-  end
-
-  should 'list category sub-tree' do
-    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
-    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
-    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
-    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
-    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
-
-    sub_tree = Category.sub_tree(c1)
-
-    assert ActiveRecord::NamedScope::Scope, sub_tree.class
-    assert_includes sub_tree, c1
-    assert_not_includes sub_tree, c2
-    assert_includes sub_tree, c3
-    assert_includes sub_tree, c4
-    assert_includes sub_tree, c5
-  end
-
 end
@@ -112,9 +112,6 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
     result = display_delete_button(article)
   end
-
-  def link_to(text, *args); puts text; puts args.inspect; text; end
-
 end
 module RssFeedHelper
@@ -129,7 +129,11 @@ class FeaturedProductsBlockTest &lt; ActiveSupport::TestCase
       })
     @environment.boxes.first.blocks<< block
-    assert_equal products, block.products_for_selection
+    products_for_selection = block.products_for_selection
+
+    products.each do |product|
+      assert_includes products_for_selection, product
+    end
   end
 end
@@ -124,6 +124,8 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
       # after disabled period, tries to process the container again
       last_error = Time.now
       Time.stubs(:now).returns(last_error + FeedHandler.disabled_period + 1.second)
+      handler.expects(:actually_process_container).with(container)
+      container.expects(:finish_fetch)
       handler.process(container)
       assert container.enabled, 'must reenable container after <disabled_period> (%s)' % container_class
@@ -408,8 +408,10 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     organization.affiliate(p1, role)
     organization.affiliate(p2, role)
+    json = organization.members_by_role_to_json(role)
-    assert_match [{:id => p1.id, :name => p1.name}, {:id => p2.id, :name => p2.name}].to_json, organization.members_by_role_to_json(role)
+    assert_match ({:id => p1.id, :name => p1.name}).to_json, json
+    assert_match ({:id => p2.id, :name => p2.name}).to_json, json
   end
   should 'disable organization' do
@@ -55,7 +55,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     p1 = u.person
     assert_equal u, p1.user
-    
+
     p2 = Person.new(:environment => Environment.default)
     p2.user = u
     assert !p2.valid?
@@ -202,7 +202,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'have friends' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-    
+
     p1.add_friend(p2)
     p1.friends.reload
@@ -237,7 +237,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     p2 = create_user('testuser2').person
     p3 = create_user('testuser3').person
     p4 = create_user('testuser4').person
-   
+
     p1.add_friend(p2, 'group1')
     p1.add_friend(p3, 'group2')
     p1.add_friend(p4, 'group1')
@@ -248,7 +248,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'not suggest duplicated friend groups' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-   
+
     p1.add_friend(p2, 'friends')
     assert_equal p1.suggested_friend_groups, p1.suggested_friend_groups.uniq
@@ -307,7 +307,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal 'my contact', person.contact_information
   end
-  should 'provide desired info fields' do 
+  should 'provide desired info fields' do
     p = Person.new(:environment => Environment.default)
     assert p.respond_to?(:photo)
     assert p.respond_to?(:address)
@@ -472,7 +472,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'require custom_area_of_study if area_of_study is others' do
     e = Environment.default
     e.expects(:required_person_fields).returns(['area_of_study', 'custom_area_of_study']).at_least_once
-  
+
     person = Person.new(:environment => e, :area_of_study => 'Others')
     assert !person.valid?
     assert person.errors.invalid?(:custom_area_of_study)
@@ -507,7 +507,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'not require custom_formation if formation is not others' do
     e = Environment.default
     e.expects(:required_person_fields).returns(['formation']).at_least_once
- 
+
     person = Person.new(:environment => e, :formation => 'Agrometeorology')
     assert !person.valid?
     assert ! person.errors.invalid?(:custom_formation)
@@ -819,7 +819,8 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should "the tracked action be notified to person friends and herself" do
-    p1 = Person.first
+    Person.destroy_all
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
     p4 = fast_create(Person)
@@ -829,14 +830,14 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert !p1.is_a_friend?(p3)
     p1.add_friend(p4)
     assert p1.is_a_friend?(p4)
-    
-    action_tracker = fast_create(ActionTracker::Record)
+
+    action_tracker = fast_create(ActionTracker::Record, :user_id => p1.id)
     ActionTrackerNotification.delete_all
-    count = ActionTrackerNotification.count
     Delayed::Job.destroy_all
-    Person.notify_activity(action_tracker)
-    process_delayed_job_queue 
-    assert_equal count + 3, ActionTrackerNotification.count
+    assert_difference ActionTrackerNotification, :count, 3 do
+      Person.notify_activity(action_tracker)
+      process_delayed_job_queue
+    end
     ActionTrackerNotification.all.map{|a|a.profile}.map do |profile|
       [p1,p2,p4].include?(profile)
     end
@@ -853,7 +854,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert !p1.is_a_friend?(p3)
     p1.add_friend(p4)
     assert p1.is_a_friend?(p4)
-    
+
     action_tracker = fast_create(ActionTracker::Record)
     assert_difference(Delayed::Job, :count, 1) do
@@ -862,7 +863,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should "the tracked action notify friends with one delayed job process" do
-    p1 = Person.first
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
     p4 = fast_create(Person)
@@ -872,8 +873,8 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert !p1.is_a_friend?(p3)
     p1.add_friend(p4)
     assert p1.is_a_friend?(p4)
-    
-    action_tracker = fast_create(ActionTracker::Record)
+
+    action_tracker = fast_create(ActionTracker::Record, :user_id => p1.id)
     Delayed::Job.delete_all
     assert_difference(Delayed::Job, :count, 1) do
@@ -885,8 +886,9 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should "the community tracked action be notified to the author and to community members" do
-    p1 = Person.first
+    Person.destroy_all
     community = fast_create(Community)
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person)
@@ -896,7 +898,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert p3.is_member_of?(community)
     assert !p2.is_member_of?(community)
     process_delayed_job_queue
-    
+
     action_tracker = fast_create(ActionTracker::Record, :verb => 'create_article')
     action_tracker.target = community
     action_tracker.save!
@@ -924,7 +926,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     community.add_member(p4)
     assert p4.is_member_of?(community)
     assert !p2.is_member_of?(community)
-      
+
     action_tracker = fast_create(ActionTracker::Record)
     article = mock()
     action_tracker.stubs(:target).returns(article)
@@ -1048,8 +1050,8 @@ class PersonTest &lt; ActiveSupport::TestCase
     person_1.add_friend(person_2)
     person_1.add_friend(person_3)
     person_1.add_friend(person_4)
-    assert_equal [person_2, person_3, person_4], person_1.friends
-    assert_equal [person_2, person_4], person_1.friends.online
+    assert_equivalent [person_2, person_3, person_4], person_1.friends
+    assert_equivalent [person_2, person_4], person_1.friends.online
   end
   should 'compose bare jabber id by login plus default hostname' do
@@ -1222,9 +1224,11 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should 'return tracked_actions and scraps as activities' do
+    ActionTracker::Record.destroy_all
     person = fast_create(Person)
     another_person = fast_create(Person)
+    UserStampSweeper.any_instance.stubs(:current_user).returns(another_person)
     scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => person, :content => 'A scrap'))
     UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
     article = TinyMceArticle.create!(:profile => person, :name => 'An article about free software')
@@ -1233,12 +1237,14 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should 'not return tracked_actions and scraps from others as activities' do
+    ActionTracker::Record.destroy_all
     person = fast_create(Person)
     another_person = fast_create(Person)
     person_scrap = Scrap.create!(defaults_for_scrap(:sender => person, :receiver => person, :content => 'A scrap from person'))
     another_person_scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => another_person, :content => 'A scrap from another person'))
+    UserStampSweeper.any_instance.stubs(:current_user).returns(another_person)
     TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software from another person')
     another_person_activity = ActionTracker::Record.last
@@ -1271,12 +1277,10 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert person.has_permission?('bli', Profile.new)
   end
-  should 'active fields are public if fields privacy is nil' do
+  should 'active fields are private if fields privacy is nil' do
     p = fast_create(Person)
     p.expects(:fields_privacy).returns(nil)
-    f = %w(sex birth_date)
-    p.expects(:active_fields).returns(f)
-    assert_equal f, p.public_fields
+    assert_equal [], p.public_fields
   end
   should 'return public fields' do
@@ -28,25 +28,6 @@ class PluginTest &lt; ActiveSupport::TestCase
     assert_equal({:controller => 'plugin_test/plugin1_admin', :action => 'index'}, Plugin1.admin_url)
   end
-  should 'filter comments with scope defined by plugin' do
-    class Plugin1 < Noosfero::Plugin
-      def filter_comments(scope)
-        scope.without_spam
-      end
-    end
-
-    article = fast_create(Article)
-    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
-    c2 = fast_create(Comment, :source_id => article.id)
-    c3 = fast_create(Comment, :source_id => article.id, :spam => true)
-
-    plugin = Plugin1.new
-    comments = plugin.filter_comments(article.comments)
-    assert_includes comments, c1
-    assert_includes comments, c2
-    assert_not_includes comments, c3
-  end
-
   should 'returns empty hash for class method extra_blocks by default if no blocks are defined on plugin' do
     class SomePlugin1 < Noosfero::Plugin
@@ -517,7 +517,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'be able to create a profile with categories' do
     pcat = create(Category)
-    c1 = create(Category, :parent_id => pcat)
+    c1 = create(Category, :parent_id => pcat.id)
     c2 = create(Category)
     profile = create(Profile, :category_ids => [c1.id, c2.id])
@@ -713,8 +713,8 @@ class ProfileTest &lt; ActiveSupport::TestCase
     c3 = fast_create(Category, :parent_id => c1.id)
     profile = fast_create(Profile)
     profile.category_ids = [c2,c3,c3].map(&:id)
-    assert_equal [c2, c3], profile.categories(true)
-    assert_equal [c2, c1, c3], profile.categories_including_virtual(true)
+    assert_equivalent [c2, c3], profile.categories(true)
+    assert_equivalent [c1, c2, c3], profile.categories_including_virtual(true)
   end
   should 'not return nil members when a member is removed from system' do
@@ -4,6 +4,7 @@ class RecentDocumentsBlockTest &lt; ActiveSupport::TestCase
   def setup
     @profile = create_user('testinguser').person
+    @profile.articles.destroy_all
     ['first', 'second', 'third', 'fourth', 'fifth'].each do |name|
       @profile.articles << TextArticle.create(:name => name)
     end
@@ -24,7 +25,7 @@ class RecentDocumentsBlockTest &lt; ActiveSupport::TestCase
   should 'output list with links to recent documents' do
     output = block.content
-    
+
     assert_match /href=.*\/testinguser\/first/, output
     assert_match /href=.*\/testinguser\/second/, output
     assert_match /href=.*\/testinguser\/third/, output
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class ScrapTest < ActiveSupport::TestCase
+
+  def setup
+    Person.delete_all
+    Scrap.delete_all
+  end
+
   should "have the content" do
     s = Scrap.new
     s.valid?
@@ -81,7 +87,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "create the leave_scrap action tracker verb on scrap creation of one user to another" do
-    p1 = ActionTracker::Record.current_user_from_model
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     s = Scrap.new
     s.sender= p1
@@ -98,7 +104,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "create the leave_scrap action tracker verb on scrap creation of one user to community" do
-    p = Person.first
+    p = fast_create(Person)
     c = fast_create(Community)
     s = Scrap.new
     s.sender= p
@@ -116,11 +122,11 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "notify leave_scrap action tracker verb to friends and itself" do
-    p1 = ActionTracker::Record.current_user_from_model
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p1.add_friend(p2)
-    ActionTrackerNotification.destroy_all
-    Delayed::Job.destroy_all
+    ActionTrackerNotification.delete_all
+    Delayed::Job.delete_all
     s = Scrap.new
     s.sender= p1
     s.receiver= p2
@@ -134,11 +140,11 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "notify leave_scrap action tracker verb to members of the communities and the community itself" do
-    p = Person.first
+    p = fast_create(Person)
     c = fast_create(Community)
     c.add_member(p)
-    ActionTrackerNotification.destroy_all
-    Delayed::Job.destroy_all
+    ActionTrackerNotification.delete_all
+    Delayed::Job.delete_all
     s = Scrap.new
     s.sender= p
     s.receiver= c
@@ -152,25 +158,25 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "create the leave_scrap_to_self action tracker verb on scrap creation of one user to itself" do
-    p1 = Person.first
+    p = fast_create(Person)
     s = Scrap.new
-    s.sender= p1
-    s.receiver= p1
+    s.sender= p
+    s.receiver= p
     s.content = 'some content'
     s.save!
     ta = ActionTracker::Record.last
     assert_equal s.content, ta.params['content']
     assert_equal s.sender.name, ta.params['sender_name']
     assert_equal 'leave_scrap_to_self', ta.verb
-    assert_equal p1, ta.user
+    assert_equal p, ta.user
   end
   should "notify leave_scrap_to_self action tracker verb to friends and itself" do
-    p1 = Person.first
+    p1 = fast_create(Person)
     p2 = fast_create(Person)
     p1.add_friend(p2)
-    ActionTrackerNotification.destroy_all
-    Delayed::Job.destroy_all
+    ActionTrackerNotification.delete_all
+    Delayed::Job.delete_all
     s = Scrap.new
     s.sender= p1
     s.receiver= p1
@@ -200,7 +206,6 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "remove the replies is the root is removed" do
-    Scrap.delete_all
     s = fast_create(Scrap)
     s1 = fast_create(Scrap, :scrap_id => s.id)
     s2 = fast_create(Scrap, :scrap_id => s.id)
@@ -211,11 +216,10 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
   should "update the scrap on reply creation" do
-    Scrap.delete_all
+    person = fast_create(Person)
     s = fast_create(Scrap, :updated_at => DateTime.parse('2010-01-01'))
     assert_equal DateTime.parse('2010-01-01'), s.updated_at.strftime('%Y-%m-%d')
-    DateTime.stubs(:now).returns(DateTime.parse('2010-09-07'))
-    s1 = Scrap.create(defaults_for_scrap(:scrap_id => s.id))
+    s1 = Scrap.create!(:content => 'some content', :sender => person, :receiver => person, :scrap_id => s.id)
     s.reload
     assert_not_equal DateTime.parse('2010-01-01'), s.updated_at.strftime('%Y-%m-%d')
   end
@@ -182,7 +182,7 @@ class TaskTest &lt; ActiveSupport::TestCase
     t2.finish
     t3 = Task.create!
-    assert_equal [t1,t3], Task.pending
+    assert_equivalent [t1,t3], Task.pending
   end
   should 'be able to list finished tasks' do
@@ -324,10 +324,10 @@ class TaskTest &lt; ActiveSupport::TestCase
   should 'order tasks by some attribute correctly' do
     Task.destroy_all
-    t1 = fast_create(Task, :status => 4, :created_at => 1)
-    t2 = fast_create(Task, :status => 3, :created_at => 2)
-    t3 = fast_create(Task, :status => 2, :created_at => 3)
-    t4 = fast_create(Task, :status => 1, :created_at => 4)
+    t1 = fast_create(Task, :status => 4, :created_at => Time.now + 1.hour)
+    t2 = fast_create(Task, :status => 3, :created_at => Time.now + 2.hour)
+    t3 = fast_create(Task, :status => 2, :created_at => Time.now + 3.hour)
+    t4 = fast_create(Task, :status => 1, :created_at => Time.now + 4.hour)
     assert_equal [t1,t2,t3,t4], Task.order_by('created_at', 'asc')
     assert_equal [t4,t3,t2,t1], Task.order_by('created_at', 'desc')
@@ -224,4 +224,16 @@ end
     assert TinyMceArticle.new.tiny_mce?
   end
+  should 'not sanitize html5 audio tag on body' do
+    article = TinyMceArticle.create!(:name => 'html5 audio', :body => "Audio: <audio controls='controls'><source src='http://example.ogg' type='audio/ogg' />Audio not playing?.</audio>", :profile => profile)
+    assert_tag_in_string article.body, :tag => 'audio', :attributes => {:controls => 'controls'}
+    assert_tag_in_string article.body, :tag => 'source', :attributes => {:src => 'http://example.ogg', :type => 'audio/ogg'}
+  end
+
+  should 'not sanitize html5 video tag on body' do
+    article = TinyMceArticle.create!(:name => 'html5 video', :body => "Video: <video controls='controls' autoplay='autoplay'><source src='http://example.ogv' type='video/ogg' />Video not playing?</video>", :profile => profile)
+    assert_tag_in_string article.body, :tag => 'video', :attributes => {:controls => 'controls', :autoplay => 'autoplay'}
+    assert_tag_in_string article.body, :tag => 'source', :attributes => {:src => 'http://example.ogv', :type => 'video/ogg'}
+  end
+
 end
@@ -11,11 +11,9 @@ class UserMailerTest &lt; ActiveSupport::TestCase
   end
-
   should 'deliver activation email notify' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      u = Person.find(:first).user
-      u.environment = Environment.default
+      u = create_user('some_user')
       User::Mailer.deliver_activation_email_notify(u)
     end
   end
@@ -296,7 +296,8 @@ class UserTest &lt; ActiveSupport::TestCase
   end
   should 'be able to use [] operator to find users by login' do
-    assert_equal users(:ze), User['ze']
+    user = fast_create(User)
+    assert_equal user, User[user.login]
   end
   should 'user has presence status to know when online or offline' do
	@@ -28,7 +28,7 @@ module CmsHelper		@@ -28,7 +28,7 @@ module CmsHelper
28	end	28	end
29		29
30	def link_to_article(article)	30	def link_to_article(article)
31	- article_name = short_filename(article.title, 30)	31	+ article_name = article.title
32	if article.folder?	32	if article.folder?
33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	else	34	else
	@@ -3,7 +3,7 @@ class ActionTrackerNotification < ActiveRecord::Base		@@ -3,7 +3,7 @@ class ActionTrackerNotification < ActiveRecord::Base
3	belongs_to :profile	3	belongs_to :profile
4	belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'	4	belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
5		5
6	- has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'	6	+ delegate :comments, :to => :action_tracker, :allow_nil => true
7		7
8	validates_presence_of :profile_id, :action_tracker_id	8	validates_presence_of :profile_id, :action_tracker_id
9	validates_uniqueness_of :action_tracker_id, :scope => :profile_id	9	validates_uniqueness_of :action_tracker_id, :scope => :profile_id
	@@ -57,7 +57,7 @@ class Article < ActiveRecord::Base		@@ -57,7 +57,7 @@ class Article < ActiveRecord::Base
57	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]	57	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
58	has_many :categories, :through => :article_categorizations	58	has_many :categories, :through => :article_categorizations
59		59
60	- has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization', :dependent => :destroy	60	+ has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
61	has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category	61	has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
62		62
63	acts_as_having_settings :field => :setting	63	acts_as_having_settings :field => :setting
	@@ -8,9 +8,9 @@ class Region < Category		@@ -8,9 +8,9 @@ class Region < Category
8	validators.count > 0	8	validators.count > 0
9	end	9	end
10		10
11	- named_scope :with_validators, :group => 'id',	11	+ named_scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
12	:joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'	12	:joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
13	-	13	+
14	end	14	end
15		15
16	require_dependency 'city'	16	require_dependency 'city'
	@@ -4,7 +4,7 @@ class ProfileSweeper # < ActiveRecord::Observer		@@ -4,7 +4,7 @@ class ProfileSweeper # < ActiveRecord::Observer
4	include SweeperHelper	4	include SweeperHelper
5		5
6	def after_update(profile)	6	def after_update(profile)
7	- expire_caches(profile)	7	+ self.delay.expire_caches profile
8	end	8	end
9		9
10	def after_create(profile)	10	def after_create(profile)
	@@ -41,7 +41,7 @@		@@ -41,7 +41,7 @@
41	<% end %>	41	<% end %>
42		42
43	<% @articles.each do \|article\| article = FilePresenter.for article %>	43	<% @articles.each do \|article\| article = FilePresenter.for article %>
44	- <tr>	44	+ <tr title="<%= article.title%>" >
45	<td class="article-name">	45	<td class="article-name">
46	<%= link_to_article(article) %>	46	<%= link_to_article(article) %>
47	</td>	47	</td>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	<th><%= _('Actions') %></th>	10	<th><%= _('Actions') %></th>
11	</tr>	11	</tr>
12	<% collection.each do \|m\| %>	12	<% collection.each do \|m\| %>
13	- <tr>	13	+ <tr title="<%= m.name %>">
14	<td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>	14	<td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
15	<td>	15	<td>
16	<div class="members-buttons-cell">	16	<div class="members-buttons-cell">
1	<li class="search-text-article-item article-item">	1	<li class="search-text-article-item article-item">
2	- <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>	2	+ <div>
		3	+ <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
		4	+ </div>
3		5
4	<div class="search-content-first-column">	6	<div class="search-content-first-column">
5	<%= render :partial => 'image', :object => text_article %>	7	<%= render :partial => 'image', :object => text_article %>
1	<li class="search-uploaded-file-item article-item">	1	<li class="search-uploaded-file-item article-item">
2	- <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>	2	+ <div>
		3	+ <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
		4	+ </div>
3		5
4	<div class="search-content-first-column">	6	<div class="search-content-first-column">
5	<%= render :partial => 'image', :object => uploaded_file %>	7	<%= render :partial => 'image', :object => uploaded_file %>
	@@ -70,7 +70,7 @@ tinyMCE.init({		@@ -70,7 +70,7 @@ tinyMCE.init({
70	paste_insert_word_content_callback : "convertWord",	70	paste_insert_word_content_callback : "convertWord",
71	paste_use_dialog: false,	71	paste_use_dialog: false,
72	apply_source_formatting : true,	72	apply_source_formatting : true,
73	- extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height\|scrolling],embed[title\|src\|type\|height\|width]",	73	+ extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height\|scrolling],embed[title\|src\|type\|height\|width],audio[controls\|autoplay],video[controls\|autoplay],source[src\|type]",
74	content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',	74	content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
75	language: <%= tinymce_language.inspect %>,	75	language: <%= tinymce_language.inspect %>,
76	entity_encoding: 'raw',	76	entity_encoding: 'raw',