rails3: fix plugin tests

Victor Costa
1 parent 66ec5b45
Showing 22 changed files with 129 additions and 152 deletions Show diff stats
app/models/block.rb
plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
plugins/display_content/test/unit/display_content_block_test.rb
plugins/mark_comment_as_read/lib/mark_comment_as_read_plugin.rb
plugins/mark_comment_as_read/lib/mark_comment_as_read_plugin/read_comments.rb
plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb
plugins/relevant_content/lib/ext/article.rb
plugins/relevant_content/lib/relevant_content_plugin/relevant_content_block.rb
plugins/relevant_content/views/box_organizer/relevant_content_plugin/_relevant_content_block.html.erb
plugins/relevant_content/views/box_organizer/relevant_content_plugin/_relevant_content_block.rhtml
plugins/require_auth_to_comment/lib/require_auth_to_comment_plugin.rb
plugins/require_auth_to_comment/views/profile-editor-extras.html.erb
plugins/require_auth_to_comment/views/profile-editor-extras.rhtml
plugins/statistics/lib/statistics_block.rb
plugins/statistics/test/functional/statistics_plugin_environment_design_controller_test.rb
plugins/statistics/test/functional/statistics_plugin_home_controller_test.rb
plugins/statistics/test/functional/statistics_plugin_profile_design_controller_test.rb
plugins/statistics/test/unit/statistics_block_test.rb
plugins/statistics/views/box_organizer/_statistics_block.html.erb
plugins/statistics/views/box_organizer/_statistics_block.rhtml
 class Block < ActiveRecord::Base
-  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user
+  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -6,7 +6,9 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
   def setup
     @profile = fast_create(Community)
+    box = create(Box, :owner_type => 'Profile', :owner_id => @profile.id)
     @block = ContextContentPlugin::ContextContentBlock.new
+    @block.box = box
     @block.types = ['TinyMceArticle']
     @block.limit = 1
     @block.save!
@@ -548,6 +548,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     Article.delete_all
     a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     env = fast_create(Environment)
     env.enable_plugin(Plugin1)
@@ -19,14 +19,14 @@ class MarkCommentAsReadPlugin &lt; Noosfero::Plugin
   end
   def comment_actions(comment)
-    lambda do
-      [{:link => link_to_function(_('Mark as not read'), 'toggle_comment_read(this, %s, false);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_not_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-not-read-#{comment.id}")},
-      {:link => link_to_function(_('Mark as read'), 'toggle_comment_read(this, %s, true);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_read', :id => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-read-#{comment.id}")}] if user
+    proc do
+      [{:link => link_to_function(_('Mark as not read'), 'toggle_comment_read(this, \'%s\', false);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_not_read', :id => comment.id), :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-not-read-#{comment.id}")},
+      {:link => link_to_function(_('Mark as read'), 'toggle_comment_read(this, \'%s\', true);' % url_for(:controller => 'mark_comment_as_read_plugin_profile', :profile => profile.identifier, :action => 'mark_as_read', :id => comment.id), :class => 'comment-footer comment-footer-link comment-footer-hide comment-action-extra', :style => 'display: none', :id => "comment-action-mark-as-read-#{comment.id}")}] if user
     end
   end
   def check_comment_actions(comment)
-    lambda do
+    proc do
       if user
         comment.marked_as_read?(user) ? "#comment-action-mark-as-not-read-#{comment.id}" : "#comment-action-mark-as-read-#{comment.id}"
       end
@@ -34,7 +34,7 @@ class MarkCommentAsReadPlugin &lt; Noosfero::Plugin
   end
   def article_extra_contents(article)
-    lambda do
+    proc do
       if user
         ids = article.comments.marked_as_read(user).collect { |comment| comment.id}
         "<script type=\"text/javascript\">mark_comments_as_read(#{ids.to_json});</script>" if !ids.empty?
-class MarkCommentAsReadPlugin::ReadComments < Noosfero::Plugin::ActiveRecord
+class MarkCommentAsReadPlugin::ReadComments < ActiveRecord::Base
   set_table_name 'mark_comment_as_read_plugin'
   belongs_to :comment
   belongs_to :person
@@ -5,7 +5,7 @@ class MarkCommentAsReadPlugin::CommentTest &lt; ActiveSupport::TestCase
   def setup
     @person = create_user('user').person
     @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
-    @comment = Comment.create!(:title => 'title', :body => 'body', :author_id => @person.id, :source => @article)
+    @comment = Comment.create!(:title => 'title', :body => 'body', :author => @person, :source => @article)
   end
   should 'mark comment as read' do
@@ -16,7 +16,7 @@ class MarkCommentAsReadPlugin::CommentTest &lt; ActiveSupport::TestCase
   should 'do not mark a comment as read again' do
     @comment.mark_as_read(@person)
-    assert_raise ActiveRecord::StatementInvalid do
+    assert_raise ActiveRecord::RecordNotUnique do
       @comment.mark_as_read(@person)
     end
   end
@@ -2,7 +2,7 @@ require_dependency &#39;article&#39;
 class Article
-  named_scope :relevant_content, :conditions => ["articles.published = true and (articles.type != 'UploadedFile' and articles.type != 'Blog' and articles.type != 'RssFeed') OR articles.type is NULL"]
+  scope :relevant_content, :conditions => ["articles.published = true and (articles.type != 'UploadedFile' and articles.type != 'Blog' and articles.type != 'RssFeed') OR articles.type is NULL"]
   def self.articles_columns
     Article.column_names.map {|c| "articles.#{c}"} .join(",")
@@ -18,7 +18,9 @@ class RelevantContentPlugin::RelevantContentBlock &lt; Block
   settings_items :show_most_disliked,   :type => :boolean, :default => 0
   settings_items :show_most_voted,      :type => :boolean, :default => 1
-  include ActionController::UrlWriter
+  include ActionView::Helpers
+  include Rails.application.routes.url_helpers
+
   def content(args={})
     content = block_title(title)
@@ -90,4 +92,4 @@ class RelevantContentPlugin::RelevantContentBlock &lt; Block
       { :profile => [:article], :environment => [:article] }
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,8 @@
+<div id='edit-relevant-content-block'>
+  <%= labelled_form_field _('Limit of items per category'), text_field(:block, :limit, :size => 3) %>
+  <%= labelled_check_box _('Display most accessed content'), "block[show_most_read]", 1 ,@block.show_most_read %><BR>
+  <%= labelled_check_box _('Display most commented content'), "block[show_most_commented]", 1 ,@block.show_most_commented %><BR>
+  <%= labelled_check_box _('Display most liked content'), "block[show_most_liked]", 1 ,@block.show_most_liked %><BR>
+  <%= labelled_check_box _('Display most voted content'), "block[show_most_voted]", 1 ,@block.show_most_voted %><BR>
+  <%= labelled_check_box _('Display most disliked content'), "block[show_most_disliked]", 1 , @block.show_most_disliked %><BR>
+</div>
 \ No newline at end of file
@@ -1,8 +0,0 @@
-<div id='edit-relevant-content-block'>
-  <%= labelled_form_field _('Limit of items per category'), text_field(:block, :limit, :size => 3) %>
-  <%= labelled_check_box _('Display most accessed content'), "block[show_most_read]", 1 ,@block.show_most_read %><BR>
-  <%= labelled_check_box _('Display most commented content'), "block[show_most_commented]", 1 ,@block.show_most_commented %><BR>
-  <%= labelled_check_box _('Display most liked content'), "block[show_most_liked]", 1 ,@block.show_most_liked %><BR>
-  <%= labelled_check_box _('Display most voted content'), "block[show_most_voted]", 1 ,@block.show_most_voted %><BR>
-  <%= labelled_check_box _('Display most disliked content'), "block[show_most_disliked]", 1 , @block.show_most_disliked %><BR>
-</div>
 \ No newline at end of file
@@ -17,7 +17,7 @@ class RequireAuthToCommentPlugin &lt; Noosfero::Plugin
   end
   def profile_editor_extras
-    expanded_template('profile-editor-extras.rhtml')
+    expanded_template('profile-editor-extras.html.erb')
   end
   def stylesheet?
@@ -0,0 +1,4 @@
+<h2><%= _('Comments') %></h2>
+<div>
+<%= labelled_check_box(_('Accept comments from unauthenticated users'), 'profile_data[allow_unauthenticated_comments]', true, context.profile.allow_unauthenticated_comments) %>
+</div>
@@ -1,4 +0,0 @@
-<h2><%= _('Comments') %></h2>
-<div>
-<%= labelled_check_box(_('Accept comments from unauthenticated users'), 'profile_data[allow_unauthenticated_comments]', true, context.profile.allow_unauthenticated_comments) %>
-</div>
@@ -9,6 +9,8 @@ class StatisticsBlock &lt; Block
   settings_items :hit_counter, :default => false
   settings_items :templates_ids_counter, Hash, :default => {}
+  attr_accessible :comment_counter, :community_counter, :user_counter, :enterprise_counter, :category_counter, :tag_counter, :hit_counter, :templates_ids_counter
+
   USER_COUNTERS = [:community_counter, :user_counter, :enterprise_counter, :tag_counter, :comment_counter, :hit_counter]
   COMMUNITY_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
   ENTERPRISE_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
@@ -138,7 +140,7 @@ class StatisticsBlock &lt; Block
   def content(args={})
     block = self
-    lambda do
+    proc do
       render :file => 'statistics_block', :locals => { :block => block }
     end
   end
@@ -6,13 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
 class EnvironmentDesignControllerTest < ActionController::TestCase
   def setup
-    @controller = EnvironmentDesignController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    Environment.delete_all
-
-    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment = Environment.default
     @environment.enabled_plugins = ['StatisticsPlugin']
     @environment.save!
@@ -6,13 +6,7 @@ class HomeController; def rescue_action(e) raise e end; end
 class HomeControllerTest < ActionController::TestCase
   def setup
-    @controller = HomeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    Environment.delete_all
-
-    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment = Environment.default
     @environment.enabled_plugins = ['StatisticsPlugin']
     @environment.save!
@@ -6,13 +6,7 @@ class ProfileDesignController; def rescue_action(e) raise e end; end
 class ProfileDesignControllerTest < ActionController::TestCase
   def setup
-    @controller = ProfileDesignController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    Environment.delete_all
-
-    @environment = Environment.create(:name => 'testenv', :is_default => true)
+    @environment = Environment.default
     @environment.enabled_plugins = ['StatisticsPlugin']
     @environment.save!
@@ -22,7 +16,6 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     StatisticsBlock.delete_all
     @box1 = Box.create!(:owner => @person)
-    @environment.boxes = [@box1]
     @block = StatisticsBlock.new
     @block.box = @box1
@@ -144,15 +144,11 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => p1.id)
-    t1 = fast_create(Tag, :name => 'T1')
-    t2 = fast_create(Tag, :name => 'T2')
-    a1.tags << t1
-    a1.tags << t2
+    a1.tag_list.add('T1', 'T2')
+    a1.save!
     a2 = fast_create(Article, :profile_id => p1.id)
-    t3 = fast_create(Tag, :name => 'T3')
-    t4 = fast_create(Tag, :name => 'T4')
-    a2.tags << t3
-    a2.tags << t4
+    a2.tag_list.add('T3', 'T4')
+    a2.save!
     b.expects(:owner).at_least_once.returns(e)
@@ -165,15 +161,11 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     c1 = fast_create(Community, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => c1.id)
-    t1 = fast_create(Tag, :name => 'T1')
-    t2 = fast_create(Tag, :name => 'T2')
-    a1.tags << t1
-    a1.tags << t2
+    a1.tag_list.add('T1', 'T2')
+    a1.save!
     a2 = fast_create(Article, :profile_id => c1.id)
-    t3 = fast_create(Tag, :name => 'T3')
-    t4 = fast_create(Tag, :name => 'T4')
-    a2.tags << t3
-    a2.tags << t4
+    a2.tag_list.add('T3', 'T4')
+    a2.save!
     b.expects(:owner).at_least_once.returns(c1)
@@ -186,15 +178,11 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => p1.id)
-    t1 = fast_create(Tag, :name => 'T1')
-    t2 = fast_create(Tag, :name => 'T2')
-    a1.tags << t1
-    a1.tags << t2
+    a1.tag_list.add('T1', 'T2')
+    a1.save!
     a2 = fast_create(Article, :profile_id => p1.id)
-    t3 = fast_create(Tag, :name => 'T3')
-    t4 = fast_create(Tag, :name => 'T4')
-    a2.tags << t3
-    a2.tags << t4
+    a2.tag_list.add('T3', 'T4')
+    a2.save!
     b.expects(:owner).at_least_once.returns(p1)
@@ -208,12 +196,12 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => p1.id)
-    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
-    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C1', :author => p1)
+    Comment.create!(:source => a1, :body => 'C2', :author => p1)
     a2 = fast_create(Article, :profile_id => p1.id)
-    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
-    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C3', :author => p1)
+    Comment.create!(:source => a2, :body => 'C4', :author => p1)
     b.expects(:owner).at_least_once.returns(e)
@@ -224,14 +212,15 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     b = StatisticsBlock.new
     e = Environment.default
+    p1 = fast_create(Person, :environment_id => e.id)
     c1 = fast_create(Community, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => c1.id)
-    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
-    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C1', :author => p1)
+    Comment.create!(:source => a1, :body => 'C2', :author => p1)
     a2 = fast_create(Article, :profile_id => c1.id)
-    Comment.create!(:source => a2, :body => 'C3', :author_id => 1)
-    Comment.create!(:source => a2, :body => 'C4', :author_id => 1)
+    Comment.create!(:source => a2, :body => 'C3', :author => p1)
+    Comment.create!(:source => a2, :body => 'C4', :author => p1)
     b.expects(:owner).at_least_once.returns(c1)
@@ -244,12 +233,12 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
     p1 = fast_create(Person, :environment_id => e.id)
     a1 = fast_create(Article, :profile_id => p1.id)
-    Comment.create!(:source => a1, :body => 'C1', :author_id => 1)
-    Comment.create!(:source => a1, :body => 'C2', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C1', :author => p1)
+    Comment.create!(:source => a1, :body => 'C2', :author => p1)
     a2 = fast_create(Article, :profile_id => p1.id)
-    Comment.create!(:source => a1, :body => 'C3', :author_id => 1)
-    Comment.create!(:source => a1, :body => 'C4', :author_id => 1)
+    Comment.create!(:source => a1, :body => 'C3', :author => p1)
+    Comment.create!(:source => a1, :body => 'C4', :author => p1)
     b.expects(:owner).at_least_once.returns(p1)
@@ -0,0 +1,32 @@
+<%= labelled_form_field check_box(:block, :user_counter) + _('Show user counter'), '' %>
+
+<% if @block.is_counter_available?(:community_counter) %>
+<%= labelled_form_field check_box(:block, :community_counter) + _('Show community counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:enterprise_counter) %>
+<%= labelled_form_field check_box(:block, :enterprise_counter) + _('Show enterprise counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:category_counter) %>
+<%= labelled_form_field check_box(:block, :category_counter) + _('Show category counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:tag_counter) %>
+<%= labelled_form_field check_box(:block, :tag_counter) + _('Show tag counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:comment_counter) %>
+<%= labelled_form_field check_box(:block, :comment_counter) + _('Show comment counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:hit_counter) %>
+<%= labelled_form_field check_box(:block, :hit_counter) + _('Show hit counter'), '' %>
+<% end %>
+
+<% if @block.is_counter_available?(:templates_ids_counter) %>
+<%   @block.templates.map do |item|%>
+   <%= hidden_field_tag("block[templates_ids_counter][#{item.id}]", false)%>
+   <%= labelled_form_field check_box_tag("block[templates_ids_counter][#{item.id}]", true, @block.is_template_counter_active?(item.id)) + _("Show counter for communities with template %s" % item.name), '' %>
+<%   end %>
+<% end %>
@@ -1,32 +0,0 @@
-<%= labelled_form_field check_box(:block, :user_counter) + _('Show user counter'), '' %>
-
-<% if @block.is_counter_available?(:community_counter) %>
-<%= labelled_form_field check_box(:block, :community_counter) + _('Show community counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:enterprise_counter) %>
-<%= labelled_form_field check_box(:block, :enterprise_counter) + _('Show enterprise counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:category_counter) %>
-<%= labelled_form_field check_box(:block, :category_counter) + _('Show category counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:tag_counter) %>
-<%= labelled_form_field check_box(:block, :tag_counter) + _('Show tag counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:comment_counter) %>
-<%= labelled_form_field check_box(:block, :comment_counter) + _('Show comment counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:hit_counter) %>
-<%= labelled_form_field check_box(:block, :hit_counter) + _('Show hit counter'), '' %>
-<% end %>
-
-<% if @block.is_counter_available?(:templates_ids_counter) %>
-<%   @block.templates.map do |item|%>
-   <%= hidden_field_tag("block[templates_ids_counter][#{item.id}]", false)%>
-   <%= labelled_form_field check_box_tag("block[templates_ids_counter][#{item.id}]", true, @block.is_template_counter_active?(item.id)) + _("Show counter for communities with template %s" % item.name), '' %>
-<%   end %>
-<% end %>
@@ -0,0 +1,36 @@
+<h3 class="block-title">
+  <span><%=block.title%></span>
+</h3>
+<div class="statistics-block-data">
+  <ul>
+    <% if block.is_visible?('user_counter') %>
+      <li class="users"><span class="amount"><%= block.users%> </span><span class="label"><%= _('users')%></span></li>
+    <% end %>
+    <% if block.is_visible?('enterprise_counter') && !block.environment.enabled?('disable_asset_enterprises') %>
+      <li class="enterprises"><span class="amount"><%= block.enterprises%> </span><span class="label"><%= _('enterprises')%></span></li>
+    <% end %>
+    <% if block.is_visible?('community_counter') %>
+      <li class="communities"><span class="amount"><%= block.communities%> </span><span class="label"><%= _('communities')%></span></li>
+    <% end %>
+    <% if block.is_visible?('category_counter') %>
+      <li class="categories"><span class="amount"><%= block.categories%> </span><span class="label"><%= _('categories')%></span></li>
+    <% end %>
+    <% if block.is_visible?('tag_counter') %>
+      <li class="tags"><span class="amount"><%= block.tags%> </span><span class="label"><%= _('tags')%></span></li>
+    <% end %>
+    <% if block.is_visible?('comment_counter') %>
+      <li class="comments"><span class="amount"><%= block.comments%> </span><span class="label"><%= _('comments')%></span></li>
+    <% end %>
+    <% if block.is_visible?('hit_counter') %>
+      <li class="hits"><span class="amount"><%= block.hits%> </span><span class="label"><%= _('hits')%></span></li>
+    <% end %>
+
+    <% if block.owner.kind_of?(Environment) then %>
+      <% block.templates.each do |item|  %>
+        <% if block.is_template_counter_active? item.id %>
+          <li class="<%= item.name.to_slug%>"><span class="amount"><%= block.template_counter_count(item.id)%> </span><span class="label"><%= item.name%></span></li>
+        <% end %>
+      <% end %>
+    <% end %>
+  </ul>
+</div>
@@ -1,36 +0,0 @@
-<h3 class="block-title">
-  <span><%=block.title%></span>
-</h3>
-<div class="statistics-block-data">
-  <ul>
-    <% if block.is_visible?('user_counter') %>
-      <li class="users"><span class="amount"><%= block.users%> </span><span class="label"><%= _('users')%></span></li>
-    <% end %>
-    <% if block.is_visible?('enterprise_counter') && !block.environment.enabled?('disable_asset_enterprises') %>
-      <li class="enterprises"><span class="amount"><%= block.enterprises%> </span><span class="label"><%= _('enterprises')%></span></li>
-    <% end %>
-    <% if block.is_visible?('community_counter') %>
-      <li class="communities"><span class="amount"><%= block.communities%> </span><span class="label"><%= _('communities')%></span></li>
-    <% end %>
-    <% if block.is_visible?('category_counter') %>
-      <li class="categories"><span class="amount"><%= block.categories%> </span><span class="label"><%= _('categories')%></span></li>
-    <% end %>
-    <% if block.is_visible?('tag_counter') %>
-      <li class="tags"><span class="amount"><%= block.tags%> </span><span class="label"><%= _('tags')%></span></li>
-    <% end %>
-    <% if block.is_visible?('comment_counter') %>
-      <li class="comments"><span class="amount"><%= block.comments%> </span><span class="label"><%= _('comments')%></span></li>
-    <% end %>
-    <% if block.is_visible?('hit_counter') %>
-      <li class="hits"><span class="amount"><%= block.hits%> </span><span class="label"><%= _('hits')%></span></li>
-    <% end %>
-
-    <% if block.owner.kind_of?(Environment) then %>
-      <% block.templates.each do |item|  %>
-        <% if block.is_template_counter_active? item.id %>
-          <li class="<%= item.name.to_slug%>"><span class="amount"><%= block.template_counter_count(item.id)%> </span><span class="label"><%= item.name%></span></li>
-        <% end %>
-      <% end %>
-    <% end %>
-  </ul>
-</div>
1	class Block < ActiveRecord::Base	1	class Block < ActiveRecord::Base
2		2
3	- attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user	3	+ attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box
4		4
5	# to be able to generate HTML	5	# to be able to generate HTML
6	include ActionView::Helpers::UrlHelper	6	include ActionView::Helpers::UrlHelper
	@@ -548,6 +548,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase		@@ -548,6 +548,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase
548	Article.delete_all	548	Article.delete_all
549	a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)	549	a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
550		550
		551	+ Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
551	env = fast_create(Environment)	552	env = fast_create(Environment)
552	env.enable_plugin(Plugin1)	553	env.enable_plugin(Plugin1)
553		554
1	-class MarkCommentAsReadPlugin::ReadComments < Noosfero::Plugin::ActiveRecord	1	+class MarkCommentAsReadPlugin::ReadComments < ActiveRecord::Base
2	set_table_name 'mark_comment_as_read_plugin'	2	set_table_name 'mark_comment_as_read_plugin'
3	belongs_to :comment	3	belongs_to :comment
4	belongs_to :person	4	belongs_to :person
	@@ -5,7 +5,7 @@ class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase		@@ -5,7 +5,7 @@ class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase
5	def setup	5	def setup
6	@person = create_user('user').person	6	@person = create_user('user').person
7	@article = TinyMceArticle.create!(:profile => @person, :name => 'An article')	7	@article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
8	- @comment = Comment.create!(:title => 'title', :body => 'body', :author_id => @person.id, :source => @article)	8	+ @comment = Comment.create!(:title => 'title', :body => 'body', :author => @person, :source => @article)
9	end	9	end
10		10
11	should 'mark comment as read' do	11	should 'mark comment as read' do
	@@ -16,7 +16,7 @@ class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase		@@ -16,7 +16,7 @@ class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase
16		16
17	should 'do not mark a comment as read again' do	17	should 'do not mark a comment as read again' do
18	@comment.mark_as_read(@person)	18	@comment.mark_as_read(@person)
19	- assert_raise ActiveRecord::StatementInvalid do	19	+ assert_raise ActiveRecord::RecordNotUnique do
20	@comment.mark_as_read(@person)	20	@comment.mark_as_read(@person)
21	end	21	end
22	end	22	end
	@@ -2,7 +2,7 @@ require_dependency 'article'		@@ -2,7 +2,7 @@ require_dependency 'article'
2		2
3	class Article	3	class Article
4		4
5	- named_scope :relevant_content, :conditions => ["articles.published = true and (articles.type != 'UploadedFile' and articles.type != 'Blog' and articles.type != 'RssFeed') OR articles.type is NULL"]	5	+ scope :relevant_content, :conditions => ["articles.published = true and (articles.type != 'UploadedFile' and articles.type != 'Blog' and articles.type != 'RssFeed') OR articles.type is NULL"]
6		6
7	def self.articles_columns	7	def self.articles_columns
8	Article.column_names.map {\|c\| "articles.#{c}"} .join(",")	8	Article.column_names.map {\|c\| "articles.#{c}"} .join(",")
	@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
		1	+<div id='edit-relevant-content-block'>
		2	+ <%= labelled_form_field _('Limit of items per category'), text_field(:block, :limit, :size => 3) %>
		3	+ <%= labelled_check_box _('Display most accessed content'), "block[show_most_read]", 1 ,@block.show_most_read %><BR>
		4	+ <%= labelled_check_box _('Display most commented content'), "block[show_most_commented]", 1 ,@block.show_most_commented %><BR>
		5	+ <%= labelled_check_box _('Display most liked content'), "block[show_most_liked]", 1 ,@block.show_most_liked %><BR>
		6	+ <%= labelled_check_box _('Display most voted content'), "block[show_most_voted]", 1 ,@block.show_most_voted %><BR>
		7	+ <%= labelled_check_box _('Display most disliked content'), "block[show_most_disliked]", 1 , @block.show_most_disliked %><BR>
		8	+</div>
0	\ No newline at end of file	9	\ No newline at end of file
	@@ -1,8 +0,0 @@		@@ -1,8 +0,0 @@
1	-<div id='edit-relevant-content-block'>
2	- <%= labelled_form_field _('Limit of items per category'), text_field(:block, :limit, :size => 3) %>
3	- <%= labelled_check_box _('Display most accessed content'), "block[show_most_read]", 1 ,@block.show_most_read %><BR>
4	- <%= labelled_check_box _('Display most commented content'), "block[show_most_commented]", 1 ,@block.show_most_commented %><BR>
5	- <%= labelled_check_box _('Display most liked content'), "block[show_most_liked]", 1 ,@block.show_most_liked %><BR>
6	- <%= labelled_check_box _('Display most voted content'), "block[show_most_voted]", 1 ,@block.show_most_voted %><BR>
7	- <%= labelled_check_box _('Display most disliked content'), "block[show_most_disliked]", 1 , @block.show_most_disliked %><BR>
8	-</div>
9	\ No newline at end of file	0	\ No newline at end of file
	@@ -17,7 +17,7 @@ class RequireAuthToCommentPlugin < Noosfero::Plugin		@@ -17,7 +17,7 @@ class RequireAuthToCommentPlugin < Noosfero::Plugin
17	end	17	end
18		18
19	def profile_editor_extras	19	def profile_editor_extras
20	- expanded_template('profile-editor-extras.rhtml')	20	+ expanded_template('profile-editor-extras.html.erb')
21	end	21	end
22		22
23	def stylesheet?	23	def stylesheet?
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+<h2><%= _('Comments') %></h2>
	2	+<div>
	3	+<%= labelled_check_box(_('Accept comments from unauthenticated users'), 'profile_data[allow_unauthenticated_comments]', true, context.profile.allow_unauthenticated_comments) %>
	4	+</div>
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-<h2><%= _('Comments') %></h2>
2	-<div>
3	-<%= labelled_check_box(_('Accept comments from unauthenticated users'), 'profile_data[allow_unauthenticated_comments]', true, context.profile.allow_unauthenticated_comments) %>
4	-</div>