mergin with branch comment paragraph

Leandro Santos
2 parents c523fd74 7a99f216
Showing 18 changed files with 245 additions and 58 deletions Show diff stats
app/views/content_viewer/_article_toolbar.html.erb
lib/noosfero/plugin.rb
plugins/comment_paragraph/controllers/myprofile/comment_paragraph_plugin_myprofile_controller.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb
plugins/comment_paragraph/lib/ext/article.rb
plugins/comment_paragraph/public/style.css
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_admin_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_myprofile_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_public_controller_test.rb
plugins/comment_paragraph/test/functional/content_viewer_controller_test.rb
plugins/comment_paragraph/test/test_helper.rb
plugins/comment_paragraph/test/unit/allow_comment_test.rb
plugins/comment_paragraph/test/unit/article_test.rb
plugins/comment_paragraph/test/unit/comment_paragraph_plugin_test.rb
plugins/comment_paragraph/test/unit/comment_test.rb
plugins/comment_paragraph/views/comment_paragraph_plugin_admin/index.html.erb
@@ -50,6 +50,8 @@
     <%#*Adds extra buttons to the toolbar%>
     <%= @plugins.dispatch(:article_extra_toolbar_buttons, @page).collect { |content| instance_exec(&content) }.join("") %>
+    <%= @plugins.dispatch(:article_toolbar_actions, @page).collect { |content| instance_exec(&content) }.join("")%>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
   <div id="article-header">
@@ -448,6 +448,12 @@ class Noosfero::Plugin
     []
   end
+  # -> Adds aditional actions to article
+  # returns = lambda block that creates html code
+  def article_toolbar_actions article
+    nil
+  end
+
   # -> Adds adicional content to article
   # returns = lambda block that creates html code
   def article_extra_contents(article)
@@ -0,0 +1,18 @@
+class CommentParagraphPluginMyprofileController < MyProfileController
+
+  before_filter :check_permission
+
+  def toggle_activation
+    @article.comment_paragraph_plugin_activate = !@article.comment_paragraph_plugin_activate
+    @article.save!
+    redirect_to @article.view_url
+  end
+
+  protected
+
+  def check_permission
+    @article = profile.articles.find(params[:id])
+    render_access_denied unless @article.comment_paragraph_plugin_enabled? && @article.allow_edit?(user)
+  end
+
+end
@@ -41,7 +41,14 @@ class CommentParagraphPlugin &lt; Noosfero::Plugin
   end
   def self.activation_mode_default_setting
-    'auto'
+    'manual'
+  end
+
+  def article_toolbar_actions(article)
+    return unless article.comment_paragraph_plugin_enabled?
+    proc do
+      button :toggle_comment_paragraph, article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'), :controller => 'comment_paragraph_plugin_myprofile', :action => 'toggle_activation', :id => article.id if article.allow_edit?(user)
+    end
   end
 end
@@ -12,7 +12,7 @@ class CommentParagraphPlugin::AllowComment &lt; Noosfero::Plugin::Macro
     count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
     proc {
-      if controller.kind_of?(ContentViewerController)
+      if controller.kind_of?(ContentViewerController) && article.comment_paragraph_plugin_activated?
         render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
                :locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
       else
@@ -12,21 +12,21 @@ class Article
     environment.plugin_enabled?(CommentParagraphPlugin) && self.kind_of?(TextArticle)
   end
-  protected
-
-  def comment_paragraph_plugin_activate?
-      comment_paragraph_plugin_enabled? && comment_paragraph_plugin_settings.activation_mode == 'auto'
+  def comment_paragraph_plugin_activated?
+    comment_paragraph_plugin_activate && comment_paragraph_plugin_enabled?
   end
-  def comment_paragraph_plugin_parse_html
-    comment_paragraph_plugin_activate = comment_paragraph_plugin_activate?
-    return unless comment_paragraph_plugin_activate
+  protected
-    if body && body_changed?
+  def comment_paragraph_plugin_parse_html
+    comment_paragraph_plugin_set_initial_value unless persisted?
+    return unless comment_paragraph_plugin_activated?
+    if body && (body_changed? || setting_changed?(:comment_paragraph_plugin_activate))
       parsed_paragraphs = []
-      updated = body_change[1]
-      doc = Hpricot(updated)
-      doc.search("/*").each do |paragraph|
+      updated = body_changed? ? body_change[1] : body
+      doc =  Nokogiri::HTML(updated).css('body')
+      
+      doc.children.each do |paragraph|
         if paragraph.to_html =~ /^<div(.*)paragraph_comment(.*)$/ || paragraph.to_html =~ /^<p>\W<\/p>$/
           parsed_paragraphs << paragraph.to_html
         else
@@ -41,6 +41,11 @@ class Article
     end
   end
+  def comment_paragraph_plugin_set_initial_value
+    self.comment_paragraph_plugin_activate = comment_paragraph_plugin_enabled? &&
+      comment_paragraph_plugin_settings.activation_mode == 'auto'
+  end
+
   def comment_paragraph_plugin_settings
     @comment_paragraph_plugin_settings ||= Noosfero::Plugin::Settings.new(environment, CommentParagraphPlugin)
   end
@@ -48,8 +53,7 @@ class Article
   def comment_paragraph_plugin_parse_paragraph(paragraph_content, paragraph_uuid)
     "<div class='macro article_comments paragraph_comment' " +
       "data-macro='comment_paragraph_plugin/allow_comment' " +
-      "data-macro-paragraph_uuid='#{paragraph_uuid}'>#{paragraph_content}</div>\r\n" +
-      "<p>&nbsp;</p>"
+      "data-macro-paragraph_uuid='#{paragraph_uuid}'>#{paragraph_content}</div>\r\n"
   end
 end
+#content #article-toolbar .icon-toggle_comment_paragraph {
+  top: -71px;
+  border: 0;
+  background-color: transparent;
+  color: gray;
+}
+#content #article-toolbar .icon-toggle_comment_paragraph:hover {
+  color: black;
+}
+
+.icon-toggle_comment_paragraph{
+  background-image: url('/plugins/comment_paragraph/images/internet-group-chat.png');
+}
+
 #comment-bubble.visible {
   visibility: visible;
 }
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../controllers/comment_paragraph_plugin_admin_controller'
+require_relative '../../../../test/test_helper'
+require_relative '../../controllers/comment_paragraph_plugin_admin_controller'
 # Re-raise errors caught by the controller.
 class CommentParagraphPluginAdminController; def rescue_action(e) raise e end; end
@@ -22,10 +22,10 @@ class CommentParagraphPluginAdminControllerTest &lt; ActionController::TestCase
   end
   should 'update comment paragraph plugin settings' do
-    assert_not_equal 'manual', plugin_settings.get_setting(:activation_mode)
-    post :index, :settings => { :activation_mode => 'manual' }
+    assert_not_equal 'auto', plugin_settings.get_setting(:activation_mode)
+    post :index, :settings => { :activation_mode => 'auto' }
     environment.reload
-    assert_equal 'manual', plugin_settings.get_setting(:activation_mode)
+    assert_equal 'auto', plugin_settings.get_setting(:activation_mode)
   end
   should 'get article types previously selected' do
@@ -0,0 +1,35 @@
+require_relative '../test_helper'
+
+class CommentParagraphPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(CommentParagraphPlugin)
+    @profile = fast_create(Profile)
+    @user = create_user_with_permission('testuser', 'post_content', @profile)
+    login_as(@user.identifier)
+    @article = fast_create(TextArticle, :profile_id => profile.id, :author_id => @user.id)
+  end
+
+  attr_reader :article, :profile, :user, :environment
+
+  should 'toggle comment paragraph activation' do
+    assert !article.comment_paragraph_plugin_activate
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert article.reload.comment_paragraph_plugin_activate
+    assert_redirected_to article.view_url
+  end
+
+  should 'deny access to toggle activation for forbidden users' do
+    login_as(create_user('anotheruser').login)
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert_response :forbidden
+  end
+
+  should 'deny access to toggle activation if plugin is not enabled' do
+    environment.disable_plugin(CommentParagraphPlugin)
+    get :toggle_activation, :id => article.id, :profile => profile.identifier
+    assert_response :forbidden
+  end
+
+end
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/profile/comment_paragraph_plugin_profile_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/profile/comment_paragraph_plugin_profile_controller'
 # Re-raise errors caught by the controller.
 class CommentParagraphPluginProfileController; def rescue_action(e) raise e end; end
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/public/comment_paragraph_plugin_public_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/public/comment_paragraph_plugin_public_controller'
 # Re-raise errors caught by the controller.
@@ -9,8 +9,7 @@ class CommentParagraphPluginPublicControllerTest &lt; ActionController::TestCase
   def setup
     @profile = create_user('testuser').person
-    @article = profile.articles.build(:name => 'test')
-    @article.save!
+    @article = profile.articles.create!(:name => 'test')
   end
   attr_reader :article, :profile
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 class ContentViewerController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
@@ -10,10 +10,12 @@ end
 class ContentViewerControllerTest < ActionController::TestCase
   def setup
-    @profile = fast_create(Community)
-    @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-paragraph_uuid=\"0\" data-macro='comment_paragraph_plugin/allow_comment' ></div>")
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
+    @profile = fast_create(Community)
+    @page = fast_create(TextArticle, :profile_id => @profile.id, :body => "<p>inner text</p>")
+    @page.comment_paragraph_plugin_activate = true
+    @page.save!
   end
   attr_reader :page
-require File.dirname(__FILE__) + '/../../../test/test_helper'
+require_relative '../../../test/test_helper'
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 class AllowCommentTest < ActiveSupport::TestCase
   def setup
     @macro = CommentParagraphPlugin::AllowComment.new
+    @environment = Environment.default
+    @environment.enable_plugin(CommentParagraphPlugin)
+
+    @profile = fast_create(Community)
+
+    @article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    @article.comment_paragraph_plugin_activate = true
+    @article.save!
+
+    @comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
+    @controller = mock
   end
-  attr_reader :macro
+  attr_reader :macro, :profile, :article, :controller, :comment, :environment
   should 'have a configuration' do
     assert CommentParagraphPlugin::AllowComment.configuration
   end
   should 'parse contents to include comment paragraph view' do
-    profile = fast_create(Community)
-    article = fast_create(Article, :profile_id => profile.id)
-    comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
-    inner_html = 'inner'
-    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
-    expects(:controller).returns(ContentViewerController.new)
-
-    expects(:render).with({:partial => 'comment_paragraph_plugin_profile/comment_paragraph', :locals => {:paragraph_uuid => comment.paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(true)
+
+    expects(:render).with({:partial => 'comment_paragraph_plugin_profile/comment_paragraph', :locals => {:paragraph_uuid => comment.paragraph_uuid, :article_id => article.id, :inner_html => article.body, :count => 1, :profile_identifier => profile.identifier} })
     instance_eval(&content)
   end
   should 'not parse contents outside content viewer controller' do
-    profile = fast_create(Community)
-    article = fast_create(Article, :profile_id => profile.id)
-    comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
-    inner_html = 'inner'
-    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
-    expects(:controller).returns(HomeController.new)
+    article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(false)
+    assert_equal 'inner', instance_eval(&content)
+  end
+  should 'not parse contents if comment_paragraph is not activated' do
+    article = fast_create(TextArticle, :profile_id => profile.id, :body => 'inner')
+    article.expects(:comment_paragraph_plugin_activated?).returns(false)
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    controller.expects(:kind_of?).with(ContentViewerController).returns(true)
     assert_equal 'inner', instance_eval(&content)
   end
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 require 'benchmark'
 class ArticleTest < ActiveSupport::TestCase
   def setup
-    profile = fast_create(Community)
-    @article = fast_create(Article, :profile_id => profile.id)
+    @profile = fast_create(Community)
+    @article = fast_create(TextArticle, :profile_id => profile.id)
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
   end
-  attr_reader :article, :environment
+  attr_reader :article, :environment, :profile
   should 'return paragraph comments from article' do
     comment1 = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
@@ -34,9 +34,67 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'parse html if the plugin is not enabled' do
     article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
-    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.comment_paragraph_plugin_activate = true
     article.save!
-    assert_match /data-macro='comment_paragraph_plugin\/allow_comment'/, article.body
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'do not remove macro div when disable comment paragraph' do
+    article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
+    article.comment_paragraph_plugin_activate = true
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+    article.comment_paragraph_plugin_activate = false
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'parse html when activate comment paragraph' do
+    article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
+    article.comment_paragraph_plugin_activate = false
+    article.save!
+    assert_equal "<p>paragraph 1</p><p>paragraph 2</p>", article.body
+    article.comment_paragraph_plugin_activate = true
+    article.save!
+    assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
+  end
+
+  should 'be enabled if plugin is enabled and article is a kind of TextArticle' do
+    assert article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be enabled if plugin is not enabled' do
+    environment.disable_plugin(CommentParagraphPlugin)
+    assert !article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be enabled if article if not a kind of TextArticle' do
+    article = fast_create(Article, :profile_id => profile.id)
+    assert !article.comment_paragraph_plugin_enabled?
+  end
+
+  should 'not be activated by default' do
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert !article.comment_paragraph_plugin_activated?
+  end
+
+  should 'be activated by default if it is enabled and activation mode is auto' do
+    settings = Noosfero::Plugin::Settings.new(environment, CommentParagraphPlugin)
+    settings.activation_mode = 'auto'
+    settings.save!
+    article = TextArticle.create!(:profile => profile, :name => 'title')
+    assert article.comment_paragraph_plugin_activated?
+  end
+
+  should 'be activated when forced' do
+    article.comment_paragraph_plugin_activate = true
+    assert article.comment_paragraph_plugin_activated?
+  end
+
+  should 'not be activated if plugin is not enabled' do
+    article.comment_paragraph_plugin_activate = true
+    environment.disable_plugin(CommentParagraphPlugin)
+    assert !article.comment_paragraph_plugin_enabled?
   end
 end
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 include ActionView::Helpers::FormTagHelper
 class CommentParagraphPluginTest < ActiveSupport::TestCase
@@ -6,9 +6,10 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
   def setup
     @environment = Environment.default
     @plugin = CommentParagraphPlugin.new
+    @user = create_user('testuser').person
   end
-  attr_reader :environment, :plugin
+  attr_reader :environment, :plugin, :user
   should 'have a name' do
     assert_not_equal Noosfero::Plugin.plugin_name, CommentParagraphPlugin::plugin_name
@@ -35,4 +36,30 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
     assert_nil /comment_paragraph_selected_area/.match(prok.call.inspect)
   end
+  should 'display button to toggle comment paragraph for users which can edit the article' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(true)
+
+    content = plugin.article_header_extra_contents(article)
+    expects(:button).once
+    instance_eval(&content)
+  end
+
+  should 'not display button to toggle comment paragraph for users which can not edit the article' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(false)
+
+    content = plugin.article_header_extra_contents(article)
+    assert_equal nil, instance_eval(&content)
+  end
+
+  should 'not display button to toggle comment paragraph if plugin is not enabled' do
+    article = fast_create(Article)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(false)
+
+    assert_equal nil, plugin.article_header_extra_contents(article)
+  end
+
 end
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 class CommentTest < ActiveSupport::TestCase
@@ -6,10 +6,14 @@
     <div class="activation-mode">
       <h4><%= _('Activation Mode') %></h4>
       <div class="auto">
-        <%= f.radio_button(:activation_mode, 'auto') %> <%= _('Auto') %>
+        <%= f.radio_button(:activation_mode, 'auto') %>
+        <span class="name"><strong><%= _('Auto') %></strong></span>
+        <span class="detail"><%= _('(all text articles will be activated by default)') %></span>
       </div>
-      <div>
-        <%= f.radio_button(:activation_mode, 'manual') %> <%= _('Manual') %>
+      <div class="manual">
+        <%= f.radio_button(:activation_mode, 'manual') %>
+        <span class="name"><strong><%= _('Manual') %></strong></span>
+        <span class="detail"><%= _('(click on "Activate Comment Paragraph" )') %></span>
       </div>
     </div>
	@@ -448,6 +448,12 @@ class Noosfero::Plugin		@@ -448,6 +448,12 @@ class Noosfero::Plugin
448	[]	448	[]
449	end	449	end
450		450
		451	+ # -> Adds aditional actions to article
		452	+ # returns = lambda block that creates html code
		453	+ def article_toolbar_actions article
		454	+ nil
		455	+ end
		456	+
451	# -> Adds adicional content to article	457	# -> Adds adicional content to article
452	# returns = lambda block that creates html code	458	# returns = lambda block that creates html code
453	def article_extra_contents(article)	459	def article_extra_contents(article)
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class CommentParagraphPluginMyprofileController < MyProfileController
	2	+
	3	+ before_filter :check_permission
	4	+
	5	+ def toggle_activation
	6	+ @article.comment_paragraph_plugin_activate = !@article.comment_paragraph_plugin_activate
	7	+ @article.save!
	8	+ redirect_to @article.view_url
	9	+ end
	10	+
	11	+ protected
	12	+
	13	+ def check_permission
	14	+ @article = profile.articles.find(params[:id])
	15	+ render_access_denied unless @article.comment_paragraph_plugin_enabled? && @article.allow_edit?(user)
	16	+ end
	17	+
	18	+end
	@@ -41,7 +41,14 @@ class CommentParagraphPlugin < Noosfero::Plugin		@@ -41,7 +41,14 @@ class CommentParagraphPlugin < Noosfero::Plugin
41	end	41	end
42		42
43	def self.activation_mode_default_setting	43	def self.activation_mode_default_setting
44	- 'auto'	44	+ 'manual'
		45	+ end
		46	+
		47	+ def article_toolbar_actions(article)
		48	+ return unless article.comment_paragraph_plugin_enabled?
		49	+ proc do
		50	+ button :toggle_comment_paragraph, article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'), :controller => 'comment_paragraph_plugin_myprofile', :action => 'toggle_activation', :id => article.id if article.allow_edit?(user)
		51	+ end
45	end	52	end
46		53
47	end	54	end
	@@ -12,7 +12,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro		@@ -12,7 +12,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
12	count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count	12	count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
13		13
14	proc {	14	proc {
15	- if controller.kind_of?(ContentViewerController)	15	+ if controller.kind_of?(ContentViewerController) && article.comment_paragraph_plugin_activated?
16	render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',	16	render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
17	:locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }	17	:locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
18	else	18	else
		1	+#content #article-toolbar .icon-toggle_comment_paragraph {
		2	+ top: -71px;
		3	+ border: 0;
		4	+ background-color: transparent;
		5	+ color: gray;
		6	+}
		7	+#content #article-toolbar .icon-toggle_comment_paragraph:hover {
		8	+ color: black;
		9	+}
		10	+
		11	+.icon-toggle_comment_paragraph{
		12	+ background-image: url('/plugins/comment_paragraph/images/internet-group-chat.png');
		13	+}
		14	+
1	#comment-bubble.visible {	15	#comment-bubble.visible {
2	visibility: visible;	16	visibility: visible;
3	}	17	}
@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
	1	+require_relative '../test_helper'
	2	+
	3	+class CommentParagraphPluginMyprofileControllerTest < ActionController::TestCase
	4	+
	5	+ def setup
	6	+ @environment = Environment.default
	7	+ @environment.enable_plugin(CommentParagraphPlugin)
	8	+ @profile = fast_create(Profile)
	9	+ @user = create_user_with_permission('testuser', 'post_content', @profile)
	10	+ login_as(@user.identifier)
	11	+ @article = fast_create(TextArticle, :profile_id => profile.id, :author_id => @user.id)
	12	+ end
	13	+
	14	+ attr_reader :article, :profile, :user, :environment
	15	+
	16	+ should 'toggle comment paragraph activation' do
	17	+ assert !article.comment_paragraph_plugin_activate
	18	+ get :toggle_activation, :id => article.id, :profile => profile.identifier
	19	+ assert article.reload.comment_paragraph_plugin_activate
	20	+ assert_redirected_to article.view_url
	21	+ end
	22	+
	23	+ should 'deny access to toggle activation for forbidden users' do
	24	+ login_as(create_user('anotheruser').login)
	25	+ get :toggle_activation, :id => article.id, :profile => profile.identifier
	26	+ assert_response :forbidden
	27	+ end
	28	+
	29	+ should 'deny access to toggle activation if plugin is not enabled' do
	30	+ environment.disable_plugin(CommentParagraphPlugin)
	31	+ get :toggle_activation, :id => article.id, :profile => profile.identifier
	32	+ assert_response :forbidden
	33	+ end
	34	+
	35	+end
1	-require File.dirname(__FILE__) + '/../test_helper'
2	-require File.dirname(__FILE__) + '/../../controllers/profile/comment_paragraph_plugin_profile_controller'	1	+require_relative '../test_helper'
		2	+require_relative '../../controllers/profile/comment_paragraph_plugin_profile_controller'
3		3
4	# Re-raise errors caught by the controller.	4	# Re-raise errors caught by the controller.
5	class CommentParagraphPluginProfileController; def rescue_action(e) raise e end; end	5	class CommentParagraphPluginProfileController; def rescue_action(e) raise e end; end
1	-require File.dirname(__FILE__) + '/../test_helper'	1	+require_relative '../test_helper'
2		2
3	class ContentViewerController	3	class ContentViewerController
4	append_view_path File.join(File.dirname(__FILE__) + '/../../views')	4	append_view_path File.join(File.dirname(__FILE__) + '/../../views')
	@@ -10,10 +10,12 @@ end		@@ -10,10 +10,12 @@ end
10	class ContentViewerControllerTest < ActionController::TestCase	10	class ContentViewerControllerTest < ActionController::TestCase
11		11
12	def setup	12	def setup
13	- @profile = fast_create(Community)
14	- @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-paragraph_uuid=\"0\" data-macro='comment_paragraph_plugin/allow_comment' ></div>")
15	@environment = Environment.default	13	@environment = Environment.default
16	@environment.enable_plugin(CommentParagraphPlugin)	14	@environment.enable_plugin(CommentParagraphPlugin)
		15	+ @profile = fast_create(Community)
		16	+ @page = fast_create(TextArticle, :profile_id => @profile.id, :body => "<p>inner text</p>")
		17	+ @page.comment_paragraph_plugin_activate = true
		18	+ @page.save!
17	end	19	end
18		20
19	attr_reader :page	21	attr_reader :page
1	-require File.dirname(__FILE__) + '/../test_helper'	1	+require_relative '../test_helper'
2	require 'benchmark'	2	require 'benchmark'
3		3
4	class ArticleTest < ActiveSupport::TestCase	4	class ArticleTest < ActiveSupport::TestCase
5		5
6	def setup	6	def setup
7	- profile = fast_create(Community)
8	- @article = fast_create(Article, :profile_id => profile.id)	7	+ @profile = fast_create(Community)
		8	+ @article = fast_create(TextArticle, :profile_id => profile.id)
9	@environment = Environment.default	9	@environment = Environment.default
10	@environment.enable_plugin(CommentParagraphPlugin)	10	@environment.enable_plugin(CommentParagraphPlugin)
11	end	11	end
12		12
13	- attr_reader :article, :environment	13	+ attr_reader :article, :environment, :profile
14		14
15	should 'return paragraph comments from article' do	15	should 'return paragraph comments from article' do
16	comment1 = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)	16	comment1 = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
	@@ -34,9 +34,67 @@ class ArticleTest < ActiveSupport::TestCase		@@ -34,9 +34,67 @@ class ArticleTest < ActiveSupport::TestCase
34		34
35	should 'parse html if the plugin is not enabled' do	35	should 'parse html if the plugin is not enabled' do
36	article.body = "<p>paragraph 1</p><p>paragraph 2</p>"	36	article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
37	- article.expects(:comment_paragraph_plugin_enabled?).returns(true)	37	+ article.comment_paragraph_plugin_activate = true
38	article.save!	38	article.save!
39	- assert_match /data-macro='comment_paragraph_plugin\/allow_comment'/, article.body	39	+ assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
		40	+ end
		41	+
		42	+ should 'do not remove macro div when disable comment paragraph' do
		43	+ article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
		44	+ article.comment_paragraph_plugin_activate = true
		45	+ article.save!
		46	+ assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
		47	+ article.comment_paragraph_plugin_activate = false
		48	+ article.save!
		49	+ assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
		50	+ end
		51	+
		52	+ should 'parse html when activate comment paragraph' do
		53	+ article.body = "<p>paragraph 1</p><p>paragraph 2</p>"
		54	+ article.comment_paragraph_plugin_activate = false
		55	+ article.save!
		56	+ assert_equal "<p>paragraph 1</p><p>paragraph 2</p>", article.body
		57	+ article.comment_paragraph_plugin_activate = true
		58	+ article.save!
		59	+ assert_match /data-macro="comment_paragraph_plugin\/allow_comment"/, article.body
		60	+ end
		61	+
		62	+ should 'be enabled if plugin is enabled and article is a kind of TextArticle' do
		63	+ assert article.comment_paragraph_plugin_enabled?
		64	+ end
		65	+
		66	+ should 'not be enabled if plugin is not enabled' do
		67	+ environment.disable_plugin(CommentParagraphPlugin)
		68	+ assert !article.comment_paragraph_plugin_enabled?
		69	+ end
		70	+
		71	+ should 'not be enabled if article if not a kind of TextArticle' do
		72	+ article = fast_create(Article, :profile_id => profile.id)
		73	+ assert !article.comment_paragraph_plugin_enabled?
		74	+ end
		75	+
		76	+ should 'not be activated by default' do
		77	+ article = fast_create(TextArticle, :profile_id => profile.id)
		78	+ assert !article.comment_paragraph_plugin_activated?
		79	+ end
		80	+
		81	+ should 'be activated by default if it is enabled and activation mode is auto' do
		82	+ settings = Noosfero::Plugin::Settings.new(environment, CommentParagraphPlugin)
		83	+ settings.activation_mode = 'auto'
		84	+ settings.save!
		85	+ article = TextArticle.create!(:profile => profile, :name => 'title')
		86	+ assert article.comment_paragraph_plugin_activated?
		87	+ end
		88	+
		89	+ should 'be activated when forced' do
		90	+ article.comment_paragraph_plugin_activate = true
		91	+ assert article.comment_paragraph_plugin_activated?
		92	+ end
		93	+
		94	+ should 'not be activated if plugin is not enabled' do
		95	+ article.comment_paragraph_plugin_activate = true
		96	+ environment.disable_plugin(CommentParagraphPlugin)
		97	+ assert !article.comment_paragraph_plugin_enabled?
40	end	98	end
41		99
42	end	100	end
1	-require File.dirname(__FILE__) + '/../test_helper'	1	+require_relative '../test_helper'
2	include ActionView::Helpers::FormTagHelper	2	include ActionView::Helpers::FormTagHelper
3		3
4	class CommentParagraphPluginTest < ActiveSupport::TestCase	4	class CommentParagraphPluginTest < ActiveSupport::TestCase
	@@ -6,9 +6,10 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase		@@ -6,9 +6,10 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase
6	def setup	6	def setup
7	@environment = Environment.default	7	@environment = Environment.default
8	@plugin = CommentParagraphPlugin.new	8	@plugin = CommentParagraphPlugin.new
		9	+ @user = create_user('testuser').person
9	end	10	end
10		11
11	- attr_reader :environment, :plugin	12	+ attr_reader :environment, :plugin, :user
12		13
13	should 'have a name' do	14	should 'have a name' do
14	assert_not_equal Noosfero::Plugin.plugin_name, CommentParagraphPlugin::plugin_name	15	assert_not_equal Noosfero::Plugin.plugin_name, CommentParagraphPlugin::plugin_name
	@@ -35,4 +36,30 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase		@@ -35,4 +36,30 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase
35	assert_nil /comment_paragraph_selected_area/.match(prok.call.inspect)	36	assert_nil /comment_paragraph_selected_area/.match(prok.call.inspect)
36	end	37	end
37		38
		39	+ should 'display button to toggle comment paragraph for users which can edit the article' do
		40	+ article = fast_create(Article)
		41	+ article.expects(:comment_paragraph_plugin_enabled?).returns(true)
		42	+ article.expects(:allow_edit?).with(user).returns(true)
		43	+
		44	+ content = plugin.article_header_extra_contents(article)
		45	+ expects(:button).once
		46	+ instance_eval(&content)
		47	+ end
		48	+
		49	+ should 'not display button to toggle comment paragraph for users which can not edit the article' do
		50	+ article = fast_create(Article)
		51	+ article.expects(:comment_paragraph_plugin_enabled?).returns(true)
		52	+ article.expects(:allow_edit?).with(user).returns(false)
		53	+
		54	+ content = plugin.article_header_extra_contents(article)
		55	+ assert_equal nil, instance_eval(&content)
		56	+ end
		57	+
		58	+ should 'not display button to toggle comment paragraph if plugin is not enabled' do
		59	+ article = fast_create(Article)
		60	+ article.expects(:comment_paragraph_plugin_enabled?).returns(false)
		61	+
		62	+ assert_equal nil, plugin.article_header_extra_contents(article)
		63	+ end
		64	+
38	end	65	end