Merge branch 'stable' of gitlab.com:participa/noosfero into stable

Evandro Jr
2 parents 7e613b9f bf73d4ea
Showing 33 changed files with 123 additions and 35 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/layout_helper.rb
app/models/block.rb
app/models/profile.rb
app/models/user.rb
app/views/content_viewer/view_page.html.erb
app/views/layouts/application-ng.html.erb
app/views/profile/_profile_activities_list.html.erb
lib/tasks/ci.rake
lib/user_activation_job.rb
plugins/comment_paragraph/lib/ext/article.rb
plugins/community_track/lib/community_track_plugin.rb
plugins/community_track/test/unit/community_track_plugin_test.rb
plugins/oauth_client/public/style.css
plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb
plugins/oauth_provider/controllers/oauth_provider_authorizations_controller.rb
@@ -9,6 +9,11 @@ class ApplicationController &lt; ActionController::Base
   before_filter :allow_cross_domain_access
   before_filter :login_required, :if => :private_environment?
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
+  before_filter :log_user
+
+  def log_user
+    Rails.logger.info "Logged in: #{user.identifier}" if user
+  end
   def verify_members_whitelist
     render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
@@ -84,9 +84,9 @@ class BoxOrganizerController &lt; ApplicationController
     if request.xhr? and params[:query]
       search = params[:query]
       path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
-        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+        boxes_holder.portal_community.articles.find(:all, :conditions=>"articles.name ILIKE '%#{search}%' or articles.path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
       elsif boxes_holder.is_a?(Profile)
-        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+        boxes_holder.articles.find(:all, :conditions=>"articles.name ILIKE '%#{search}%' or articles.path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
       else
         []
       end
@@ -359,11 +359,11 @@ class AccountController &lt; ApplicationController
   end
   def get_signup_start_time
-    Rails.cache.read params[:signup_time_key]
+    Rails.cache.read params[:signup_time_key] if params[:signup_time_key].present?
   end
   def clear_signup_start_time
-    Rails.cache.delete params[:signup_time_key] if params[:signup_time_key]
+    Rails.cache.delete params[:signup_time_key] if params[:signup_time_key].present?
   end
   def may_be_a_bot
@@ -65,13 +65,13 @@ class ProfileController &lt; PublicController
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
     end
   end
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
     end
   end
@@ -907,13 +907,15 @@ module ApplicationHelper
   end
   def page_title
-    (@page ? @page.title + ' - ' : '') +
-    (@topic ? @topic.title + ' - ' : '') +
-    (@section ? @section.title + ' - ' : '') +
-    (@toc ? _('Online Manual') + ' - ' : '') +
-    (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    (profile ? profile.short_name : environment.name) +
-    (@category ? " - #{@category.full_name}" : '')
+    CGI.escapeHTML(
+      (@page ? @page.title + ' - ' : '') +
+      (@topic ? @topic.title + ' - ' : '') +
+      (@section ? @section.title + ' - ' : '') +
+      (@toc ? _('Online Manual') + ' - ' : '') +
+      (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
+      (profile ? profile.short_name : environment.name) +
+      (@category ? " - #{@category.full_name}" : '')
+    )
   end
   # DEPRECATED. Do not use this.
@@ -1285,11 +1287,13 @@ module ApplicationHelper
   end
   def delete_article_message(article)
-    if article.folder?
-      _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
-    else
-      _("Are you sure that you want to remove the item \"%s\"?") % article.name
-    end
+    CGI.escapeHTML(
+      if article.folder?
+        _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
+      else
+        _("Are you sure that you want to remove the item \"%s\"?") % article.name
+      end
+    )
   end
   def expirable_link_to(expired, content, url, options = {})
@@ -93,7 +93,7 @@ module LayoutHelper
   end
   def meta_description_tag(article=nil)
-    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+    article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
   end
 end
@@ -230,7 +230,7 @@ class Block &lt; ActiveRecord::Base
     duplicated_block.created_at = nil
     duplicated_block.updated_at = nil
     duplicated_block.save!
-    duplicated_block.insert_at(self.position + 1)
+    duplicated_block.insert_at((self.position || 0) + 1)
     duplicated_block
   end
@@ -135,7 +135,7 @@ class Profile &lt; ActiveRecord::Base
   end
   def members_by_name
-    members.order(:name)
+    members.order('profiles.name')
   end
   class << self
@@ -363,6 +363,7 @@ class User &lt; ActiveRecord::Base
     end
     def delay_activation_check
+      return if person.is_template?
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
     end
 end
@@ -72,7 +72,7 @@
 <div class="comments" id="comments_list">
-  <% if @page.accept_comments? || @comments_count > 0 %>
+  <% if @page.accept_comments? || (@comments_count.present? && @comments_count > 0) %>
     <h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
       <%= display_number_of_comments(@comments_count) %>
     </h3>
@@ -17,7 +17,7 @@
     <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
     <meta property="og:title" content="<%= h page_title %>">
     <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
-    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+    <meta property="og:description" content="<%= meta_description_tag(@page) %>">
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
@@ -2,6 +2,7 @@
   <% activities.each do |a| %>
     <% activity = a.klass.constantize.find(a.id) %>
     <% if activity.kind_of?(ActionTracker::Record) %>
+      <% next unless activity.target %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
       <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
@@ -35,7 +35,7 @@ namespace :ci do
     sh 'testrb', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
     changed_plugins.each do |plugin|
       task = "test:noosfero_plugins:#{plugin}"
 class UserActivationJob < Struct.new(:user_id)
   def perform
     user = User.find(user_id)
-    user.destroy unless user.activated?
+    user.destroy unless user.activated? || user.person.is_template?
   end
 end
@@ -8,7 +8,7 @@ class Article
   def body_change_with_comments
     if body && body_changed? && !self.comments.empty?
-      paragraphs_with_comments = self.comments.where("'paragraph_id' IS NOT NULL")
+      paragraphs_with_comments = self.comments.where("paragraph_id IS NOT NULL")
       errors[:base] << (N_('You are unable to change the body of the article when paragraphs are commented')) unless (paragraphs_with_comments).empty?
     end
   end
@@ -13,8 +13,7 @@ class CommunityTrackPlugin &lt; Noosfero::Plugin
   end
   def content_types
-    return [] if !context.kind_of?(CmsController)
-    if context.respond_to?(:params) && context.params
+    if context.kind_of?(CmsController) && context.respond_to?(:params) && context.params
       types = []
       parent_id = context.params[:parent_id]
       types << CommunityTrackPlugin::Track if context.profile.community? && !parent_id
@@ -7,6 +7,7 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
     @profile = fast_create(Community)
     @params = {}
     @context = mock
+    @context.stubs(:kind_of?).returns(CmsController)
     @context.stubs(:profile).returns(@profile)
     @context.stubs(:params).returns(@params)
     @plugin.stubs(:context).returns(@context)
@@ -10,6 +10,9 @@
 .oauth-login .provider a img {
   max-width: 40px;
 }
+.oauth-login .provider a:hover {
+  opacity: 0.7;
+}
 .oauth-login .provider .developer {
   display: none;
 }
@@ -19,3 +19,6 @@
     </tr>
   <% end %>
 </table>
+<div class="actions">
+  <%= button(:back, _('Go back'), {:controller => 'plugins', :action => 'index'}) %>
+</div>
@@ -0,0 +1,9 @@
+class OauthProviderAuthorizationsController < Doorkeeper::AuthorizationsController
+
+  no_design_blocks
+  layout :get_layout
+
+  def index
+  end
+
+end
@@ -8,6 +8,10 @@ class OauthProviderPlugin &lt; Noosfero::Plugin
     _("Oauth Provider.")
   end
+  def stylesheet?
+    true
+  end
+
   Doorkeeper.configure do
     orm :active_record
@@ -36,7 +40,8 @@ class OauthProviderPlugin &lt; Noosfero::Plugin
         use_doorkeeper do
           controllers ({
             :applications => 'oauth_provider_applications',
-            :authorized_applications => 'oauth_provider_authorized_applications'
+            :authorized_applications => 'oauth_provider_authorized_applications',
+            :authorizations => 'oauth_provider_authorizations'
           })
         end
       end
@@ -0,0 +1,13 @@
+.oauth-provider-authorize .actions form {
+  display: inline-block;
+}
+.oauth-provider-authorize .h4 {
+  font-size: 14px;
+  color: rgb(36, 36, 36)
+}
+.oauth-provider-authorize #oauth-permissions {
+  color: rgb(92, 92, 92);
+}
+.oauth-provider .actions {
+  margin-top: 10px;
+}
+<div class="oauth-provider">
 <div class="page-header">
   <h3><%= link_to _('Oauh Provider'), '/admin/plugin/oauth_provider' %></h3>
 </div>
@@ -24,3 +25,7 @@
   <% end %>
   </tbody>
 </table>
+<div class="actions">
+  <%= button(:back, _('Go back'), {:controller => 'oauth_provider_plugin_admin', :action => 'index'}) %>
+</div>
+</div>
+<div class="oauth-provider-authorize">
+
 <header class="page-header" role="banner">
   <h1><%= _('Authorize required') %></h1>
 </header>
@@ -26,7 +28,7 @@
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag _("Authorize"), class: "btn btn-success btn-lg btn-block" %>
+      <%= submit_button :ok, _("Authorize") %>
     <% end %>
     <%= form_tag oauth_authorization_path, method: :delete do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
@@ -34,7 +36,8 @@
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag _("Deny"), class: "btn btn-danger btn-lg btn-block" %>
+      <%= submit_button :cancel, _("Deny") %>
     <% end %>
   </div>
 </main>
+</div>
+<div class="oauth-provider">
 <header class="page-header">
   <h1>Your authorized applications</h1>
 </header>
@@ -23,3 +24,8 @@
     </tbody>
   </table>
 </main>
+
+<div class="actions">
+  <%= button(:back, _('Go back'), :back) %>
+</div>
+</div>
@@ -8,4 +8,7 @@
     <%= link_to _('Authorized Applications'), oauth_authorized_applications_path %>
   </div>
+  <div class="actions">
+    <%= button(:back, _('Go back'), {:controller => 'plugins', :action => 'index'}) %>
+  </div>
 </div>
@@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController &lt; ProfileController
     if is_cache_expired?(profile.members_cache_key(params))
       unless params[:role_key].blank?
         role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
-        @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members = profile.members.with_role(role.id)
         @members_title = role.name
       else
-        @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members = profile.members
         @members_title = 'members'
       end
+      @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
     end
     render "profile/members"
   end
@@ -35,4 +35,8 @@ class ProposalsDiscussionPlugin::Discussion &lt; Folder
     ProposalsDiscussionPlugin::Proposal.from_discussion(self)
   end
+  def accept_comments?
+    accept_comments
+  end
+
 end
@@ -67,4 +67,8 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
   end
   alias_method_chain :cache_key, :person
+  def accept_comments?
+    accept_comments
+  end
+
 end
 <div id="footer-links">
-  <a id="link-to-doc" class='icon-help'><%= link_to _('Manual'), '/doc' %></a>
+  <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>
 </div><!-- end id="footer-links" -->
 <div id="copyright">
   <p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
@@ -2007,7 +2007,7 @@ a.button.disabled, input.disabled {
 }
 #content .comment-header .comment-actions-reply {
   float: right;
-  background-image: url(../designs/icons/tango/Tango/16x16/actions/go-jump.png);
+  background-image: url(/designs/icons/tango/Tango/16x16/actions/go-jump.png);
   height: 12px;
 }
 #content .comment-header ul {
@@ -29,6 +29,17 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not destroy user if not activated but is template' do
+    user = new_user :login => 'test3'
+    user.person.is_template = true
+    user.person.save
+    job = UserActivationJob.new(user.id)
+    assert_no_difference 'User.count' do
+      job.perform
+      process_delayed_job_queue
+    end
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
@@ -525,6 +525,13 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_match /UserActivationJob/, Delayed::Job.last.handler
   end
+  should 'not create job to check activation to template users' do
+    Person.any_instance.stubs(:is_template?).returns(true)
+
+    user = new_user
+    assert_equal 0, Delayed::Job.by_handler("--- !ruby/struct:UserActivationJob\nuser_id: #{user.id}\n").count
+  end
+
   should 'deactivate an user' do
     user = new_user
     user.activate
	@@ -84,9 +84,9 @@ class BoxOrganizerController < ApplicationController		@@ -84,9 +84,9 @@ class BoxOrganizerController < ApplicationController
84	if request.xhr? and params[:query]	84	if request.xhr? and params[:query]
85	search = params[:query]	85	search = params[:query]
86	path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community	86	path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
87	- boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }	87	+ boxes_holder.portal_community.articles.find(:all, :conditions=>"articles.name ILIKE '%#{search}%' or articles.path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{portal}/"+content.path }
88	elsif boxes_holder.is_a?(Profile)	88	elsif boxes_holder.is_a?(Profile)
89	- boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }	89	+ boxes_holder.articles.find(:all, :conditions=>"articles.name ILIKE '%#{search}%' or articles.path ILIKE '%#{search}%'", :limit=>20).map { \|content\| "/{profile}/"+content.path }
90	else	90	else
91	[]	91	[]
92	end	92	end
	@@ -359,11 +359,11 @@ class AccountController < ApplicationController		@@ -359,11 +359,11 @@ class AccountController < ApplicationController
359	end	359	end
360		360
361	def get_signup_start_time	361	def get_signup_start_time
362	- Rails.cache.read params[:signup_time_key]	362	+ Rails.cache.read params[:signup_time_key] if params[:signup_time_key].present?
363	end	363	end
364		364
365	def clear_signup_start_time	365	def clear_signup_start_time
366	- Rails.cache.delete params[:signup_time_key] if params[:signup_time_key]	366	+ Rails.cache.delete params[:signup_time_key] if params[:signup_time_key].present?
367	end	367	end
368		368
369	def may_be_a_bot	369	def may_be_a_bot
	@@ -65,13 +65,13 @@ class ProfileController < PublicController		@@ -65,13 +65,13 @@ class ProfileController < PublicController
65		65
66	def friends	66	def friends
67	if is_cache_expired?(profile.friends_cache_key(params))	67	if is_cache_expired?(profile.friends_cache_key(params))
68	- @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])	68	+ @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
69	end	69	end
70	end	70	end
71		71
72	def members	72	def members
73	if is_cache_expired?(profile.members_cache_key(params))	73	if is_cache_expired?(profile.members_cache_key(params))
74	- @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])	74	+ @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
75	end	75	end
76	end	76	end
77		77
	@@ -93,7 +93,7 @@ module LayoutHelper		@@ -93,7 +93,7 @@ module LayoutHelper
93	end	93	end
94		94
95	def meta_description_tag(article=nil)	95	def meta_description_tag(article=nil)
96	- article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name	96	+ article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
97	end	97	end
98	end	98	end
99		99
	@@ -230,7 +230,7 @@ class Block < ActiveRecord::Base		@@ -230,7 +230,7 @@ class Block < ActiveRecord::Base
230	duplicated_block.created_at = nil	230	duplicated_block.created_at = nil
231	duplicated_block.updated_at = nil	231	duplicated_block.updated_at = nil
232	duplicated_block.save!	232	duplicated_block.save!
233	- duplicated_block.insert_at(self.position + 1)	233	+ duplicated_block.insert_at((self.position \|\| 0) + 1)
234	duplicated_block	234	duplicated_block
235	end	235	end
236		236
	@@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base		@@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base
135	end	135	end
136		136
137	def members_by_name	137	def members_by_name
138	- members.order(:name)	138	+ members.order('profiles.name')
139	end	139	end
140		140
141	class << self	141	class << self
	@@ -363,6 +363,7 @@ class User < ActiveRecord::Base		@@ -363,6 +363,7 @@ class User < ActiveRecord::Base
363	end	363	end
364		364
365	def delay_activation_check	365	def delay_activation_check
		366	+ return if person.is_template?
366	Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})	367	Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
367	end	368	end
368	end	369	end
	@@ -72,7 +72,7 @@		@@ -72,7 +72,7 @@
72		72
73	<div class="comments" id="comments_list">	73	<div class="comments" id="comments_list">
74		74
75	- <% if @page.accept_comments? \|\| @comments_count > 0 %>	75	+ <% if @page.accept_comments? \|\| (@comments_count.present? && @comments_count > 0) %>
76	<h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>	76	<h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
77	<%= display_number_of_comments(@comments_count) %>	77	<%= display_number_of_comments(@comments_count) %>
78	</h3>	78	</h3>
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">	17	<meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
18	<meta property="og:title" content="<%= h page_title %>">	18	<meta property="og:title" content="<%= h page_title %>">
19	<meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">	19	<meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
20	- <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">	20	+ <meta property="og:description" content="<%= meta_description_tag(@page) %>">
21		21
22	<!-- site root -->	22	<!-- site root -->
23	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>	23	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>
	@@ -35,7 +35,7 @@ namespace :ci do		@@ -35,7 +35,7 @@ namespace :ci do
35		35
36	sh 'testrb', '-Itest', *tests unless tests.empty?	36	sh 'testrb', '-Itest', *tests unless tests.empty?
37	sh 'cucumber', *features unless features.empty?	37	sh 'cucumber', *features unless features.empty?
38	- sh 'cucumber', '-p', 'selenium', *features unless features.empty?	38	+ sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
39		39
40	changed_plugins.each do \|plugin\|	40	changed_plugins.each do \|plugin\|
41	task = "test:noosfero_plugins:#{plugin}"	41	task = "test:noosfero_plugins:#{plugin}"