Merge branch 'fix_role_edition' into stable

Victor Costa
2 parents 141aded0 f6e59824
Showing 19 changed files with 204 additions and 124 deletions Show diff stats
AUTHORS.md
app/helpers/role_helper.rb
app/views/role/_form.html.erb
app/views/role/edit.html.erb
app/views/role/new.html.erb
debian/bundle/config
debian/changelog
debian/filter-gemfile
debian/noosfero.install
debian/rules
features/gallery_navigation.feature
features/signup.feature
lib/noosfero/version.rb
lib/tasks/plugins_tests.rake
test/functional/role_controller_test.rb
util/debian-install/.gitignore
util/debian-install/README.md
util/debian-install/Vagrantfile
util/debian-install/install
@@ -198,6 +198,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt;
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
 module RoleHelper
+
+  def role_available_permissions(role)
+    role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
+  end
+
 end
@@ -6,10 +6,14 @@
   <%= required f.text_field(:name) %>
-  <p><%= _('Permissions:') %><p>
-  <% permissions.keys.each do |p| %>
-    <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
-    <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+  <% permissions.each do |key| %>
+  <div class="permissions <%= key.downcase %>">
+    <h4><%= _('%s Permissions:' % key) %></h4>
+    <% ActiveRecord::Base::PERMISSIONS[key].keys.each do |p| %>
+      <%= check_box_tag("role[permissions][]", p, role.has_permission?(p), { :id => p }) %>
+      <%= content_tag(:label, permission_name(p), { :for => p }) %><br/>
+    <% end %>
+  </div>
   <% end %>
   <% button_bar do %>
 <h2> <%= _("Editing #{@role.name}") %> </h2>
-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
 <h2> <%= _("Create a new role") %> </h2>
-<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => role_available_permissions(@role) } %>
@@ -1,3 +0,0 @@
----
-BUNDLE_WITHOUT: test:cucumber
-
+noosfero (1.0~rc4) wheezy-test; urgency=low
+
+  * Fourth release candidate
+
+ -- Antonio Terceiro <vagrant@wheezy-base>  Wed, 19 Nov 2014 10:31:16 -0300
+
 noosfero (1.0~rc3) wheezy-test; urgency=low
   * Third release candidate to Noosfero 1.0
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+sed -e '/^group\s*:\(test\|cucumber\)/,/^end/ d' Gemfile
@@ -7,9 +7,6 @@ util                              usr/share/noosfero
 Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
-Gemfile                           usr/share/noosfero
-debian/bundle/config              usr/share/noosfero/.bundle
-
 config/application.rb             usr/share/noosfero/config
 config/boot.rb                    usr/share/noosfero/config
 config/environment.rb             usr/share/noosfero/config
@@ -20,6 +20,10 @@ override_dh_link:
 		dh_link usr/lib/noosfero/dbinstall usr/share/dbconfig-common/scripts/noosfero/install/$$db; \
 	done
+override_dh_auto_install:
+	dh_auto_install
+	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
+
 override_dh_installinit:
 	dh_installinit -pnoosfero --onlyscripts
@@ -1,86 +0,0 @@
-Feature: gallery_navigation
-  As a noosfero user
-  I want to navigate over image gallery
-
-  Background:
-    Given the following users
-      | login       |
-      | marciopunk  |
-    And the following galleries
-      | owner      | name          |
-      | marciopunk | my-gallery    |
-      | marciopunk | other-gallery |
-    And the following files
-      | owner      | file          | mime       | parent        |
-      | marciopunk | rails.png     | image/png  | my-gallery    |
-      | marciopunk | rails.png     | image/png  | other-gallery |
-      | marciopunk | other-pic.jpg | image/jpeg | my-gallery    |
-
-  Scenario: provide link to go to next image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »"
-
-  @selenium
-  Scenario: view next image when follow next link
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    When I follow "Next »"
-    Then I should see "rails.png" within ".title"
-
-  Scenario: not link to next when in last image
-    When I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "« Previous" within ".gallery-navigation a"
-    And I should not see "Next »" within ".gallery-navigation a"
-
-  Scenario: provide link to go to previous image
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "« Previous"
-
-  @selenium
-  Scenario: view previous image when follow previous link
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    When I follow "« Previous"
-    Then I should see "other-pic.jpg" within ".title"
-
-  Scenario: not link to previous when in first image
-    When I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "Next »" within ".gallery-navigation a"
-    And I should not see "« Previous" within ".gallery-navigation a"
-
-  Scenario: display number of current and total of images
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: increment current number when follow next
-    Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-    When I follow "Next »"
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-
-  Scenario: decrement current number when follow next
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "image 2 of 2" within ".gallery-navigation"
-    When I follow "« Previous"
-    Then I should see "image 1 of 2" within ".gallery-navigation"
-
-  Scenario: provide button to go back to gallery
-    Given I am on /marciopunk/my-gallery/rails.png?view=true
-    Then I should see "Go back to my-gallery"
-    When I follow "Go back to my-gallery"
-    Then I should be on /marciopunk/my-gallery
-
-  # Looking for page title is problematic on selenium since it considers the
-  # title to be invibible. Checkout some information about this:
-  #   * https://github.com/jnicklas/capybara/issues/863
-  #   * https://github.com/jnicklas/capybara/pull/953
-  @selenium
-  Scenario: image title in window title
-    Given I am logged in as "marciopunk"
-    When I go to /marciopunk/other-gallery/rails.png?view=true
-    Then I should see "rails.png" within any "h1"
-#    And the page title should be "rails.png"
-    And I follow "Edit"
-    And I fill in "Title" with "Rails is cool"
-    And I press "Save"
-    When I go to /marciopunk/other-gallery/rails.png?view=true
-    Then I should see "Rails is cool" within any "h1"
-    #Then the page title should be "Rails is cool"
@@ -278,29 +278,6 @@ Feature: signup
     Then "José da Silva" should be a member of "Free Software"
   @selenium
-  Scenario: join community on direct signup
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner      |
-       | Free Software  | freesoftware  | mariasilva |
-    And feature "skip_new_user_email_confirmation" is enabled on environment
-    And I am on /freesoftware
-    When I follow "Join"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-Mail                | josesilva@example.com |
-      | Username              | josesilva             |
-      | Password              | secret                |
-      | Password confirmation | secret                |
-      | Full name             | José da Silva         |
-    And wait for the captcha signup time
-    And I press "Create my account"
-    Then I should see "Control panel"
-    And "José da Silva" should be a member of "Free Software"
-
-  @selenium
   Scenario: user registration is moderated by admin
     Given feature "admin_must_approve_new_users" is enabled on environment
     And feature "skip_new_user_email_confirmation" is disabled on environment
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.0~rc3'
+  VERSION = '1.0~rc4'
 end
+@broken_plugins = %w[
+  anti_spam
+  bsc
+  comment_classification
+  ldap
+  send_email
+  shopping_cart
+  solr
+  tolerance_time
+]
+
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
 @all_plugins.sort!
 @all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]
@@ -167,6 +178,7 @@ def test_sequence(plugins, tasks)
     end
   end
   rollback_plugins_state
+  yield(failed) if block_given?
   fail 'There are broken tests to be fixed!' if fail_flag
 end
@@ -195,13 +207,39 @@ namespace :test do
     @all_tasks.each do |taskname|
       desc "Run #{taskname} tests for all plugins"
       task taskname do
-        test_sequence(@all_plugins, taskname)
+        test_sequence(@all_plugins - @broken_plugins, taskname)
       end
     end
   end
   desc "Run all tests for all plugins"
   task :noosfero_plugins do
-    test_sequence(@all_plugins, @all_tasks)
+    test_sequence(@all_plugins - @broken_plugins, @all_tasks) do |failed|
+      plugins_status_report(failed)
+    end
   end
 end
+
+def plugins_status_report(failed)
+  w = @all_plugins.map { |s| s.size }.max
+
+  puts
+  printf ('=' * (w + 21)) + "\n"
+  puts 'Plugins status report'
+  printf ('=' * (w + 21)) + "\n"
+  printf "%-#{w}s %s\n", "Plugin", "Status"
+  printf ('-' * w) + ' ' + ('-' * 20) + "\n"
+
+  @all_plugins.each do |plugin|
+    if @broken_plugins.include?(plugin)
+      status = "SKIP"
+    elsif !failed[plugin] || failed[plugin].empty?
+      status = "PASS"
+    else
+      status = "FAIL: #{failed[plugin].join(', ')}"
+    end
+    printf "%-#{w}s %s\n", plugin, status
+  end
+  printf ('=' * (w + 21)) + "\n"
+  puts
+end
@@ -78,4 +78,24 @@ class RoleControllerTest &lt; ActionController::TestCase
       get :edit, :id => role.id
     end
   end
+
+  should 'display permissions for both environment and profile when editing a environment role' do
+    role = Role.create!(:name => 'environment_role', :key => 'environment_role', :environment => Environment.default)
+    get :edit, :id => role.id
+    ['Environment', 'Profile'].each do |key|
+      ActiveRecord::Base::PERMISSIONS[key].each do |permission, value|
+        assert_select ".permissions.#{key.downcase} input##{permission}"
+      end
+    end
+  end
+
+  should 'display permissions only for profile when editing a profile role' do
+    role = Role.create!(:name => 'profile_role', :key => 'profile_role', :environment => Environment.default)
+    get :edit, :id => role.id
+    ActiveRecord::Base::PERMISSIONS['Profile'].each do |permission, value|
+      assert_select "input##{permission}"
+    end
+    assert_select ".permissions.environment", false
+  end
+
 end
@@ -0,0 +1 @@
+*.deb
@@ -0,0 +1,3 @@
+This directory contains the basic structure to test the installation of
+Noosfero debian packages, using a fresh Vagrant VM and packages built in
+${NOOSFEROROOT}/pkg/.
@@ -0,0 +1,30 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+require 'fileutils'
+debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V | tail -2`.split
+if debs.empty?
+  puts "W: no debs built in ../../pkg/; will either install existing local"
+  puts "   ones, or the ones from the remote repository"
+else
+  local_debs = Dir.glob('*.deb')
+  debs.each do |f|
+    fn = File.basename(f)
+    if local_debs.include?(fn)
+      local_debs.delete(fn)
+    else
+      FileUtils::Verbose.ln f, '.'
+    end
+  end
+  local_debs.each do |f|
+    FileUtils::Verbose.rm_f f
+  end
+end
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "debian-wheezy"
+  config.vm.provision :shell, path: 'install'
+end
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+set -e
+sudo apt-get install -qy netcat-traditional
+
+# apt-cacher-ng running on the host
+# 10.0.2.2 = host ip on virtualbox/qemu
+# 192.168.122.1 = host ip on default libvirt bridge
+for ip in 10.0.2.2 192.168.122.1; do
+  if nc -z -w 1 $ip 3142; then
+    echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
+  fi
+done
+
+apt-key add - <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz
+=70DR
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+
+cat > /etc/apt/sources.list.d/noosfero.list <<EOF
+deb http://download.noosfero.org/debian/wheezy ./
+deb-src http://download.noosfero.org/debian/wheezy ./
+deb http://download.noosfero.org/debian/wheezy-test ./
+deb-src http://download.noosfero.org/debian/wheezy-test ./
+EOF
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+apt-get dist-upgrade -qy
+apt-get install -qy postgresql ruby1.8
+
+if dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb; then
+  apt-cache policy noosfero
+  apt-get install -qyf
+else
+  apt-cache policy noosfero
+  apt-get install -qy noosfero noosfero-apache
+fi
1	module RoleHelper	1	module RoleHelper
		2	+
		3	+ def role_available_permissions(role)
		4	+ role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
		5	+ end
		6	+
2	end	7	end
1	<h2> <%= _("Editing #{@role.name}") %> </h2>	1	<h2> <%= _("Editing #{@role.name}") %> </h2>
2		2
3	-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>	3	+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
1	<h2> <%= _("Create a new role") %> </h2>	1	<h2> <%= _("Create a new role") %> </h2>
2		2
3	-<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>	3	+<%= render :partial => 'form', :locals => { :mode => :create, :role => @role, :permissions => role_available_permissions(@role) } %>
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	----
2	-BUNDLE_WITHOUT: test:cucumber
3	-
		1	+noosfero (1.0~rc4) wheezy-test; urgency=low
		2	+
		3	+ * Fourth release candidate
		4	+
		5	+ -- Antonio Terceiro <vagrant@wheezy-base> Wed, 19 Nov 2014 10:31:16 -0300
		6	+
1	noosfero (1.0~rc3) wheezy-test; urgency=low	7	noosfero (1.0~rc3) wheezy-test; urgency=low
2		8
3	* Third release candidate to Noosfero 1.0	9	* Third release candidate to Noosfero 1.0
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+sed -e '/^group\s*:\(test\\|cucumber\)/,/^end/ d' Gemfile
	@@ -1,86 +0,0 @@	@@ -1,86 +0,0 @@
1	-Feature: gallery_navigation
2	- As a noosfero user
3	- I want to navigate over image gallery
4	-
5	- Background:
6	- Given the following users
7	- \| login \|
8	- \| marciopunk \|
9	- And the following galleries
10	- \| owner \| name \|
11	- \| marciopunk \| my-gallery \|
12	- \| marciopunk \| other-gallery \|
13	- And the following files
14	- \| owner \| file \| mime \| parent \|
15	- \| marciopunk \| rails.png \| image/png \| my-gallery \|
16	- \| marciopunk \| rails.png \| image/png \| other-gallery \|
17	- \| marciopunk \| other-pic.jpg \| image/jpeg \| my-gallery \|
18	-
19	- Scenario: provide link to go to next image
20	- Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
21	- Then I should see "Next »"
22	-
23	- @selenium
24	- Scenario: view next image when follow next link
25	- Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
26	- When I follow "Next »"
27	- Then I should see "rails.png" within ".title"
28	-
29	- Scenario: not link to next when in last image
30	- When I am on /marciopunk/my-gallery/rails.png?view=true
31	- Then I should see "« Previous" within ".gallery-navigation a"
32	- And I should not see "Next »" within ".gallery-navigation a"
33	-
34	- Scenario: provide link to go to previous image
35	- Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
36	- Then I should see "« Previous"
37	-
38	- @selenium
39	- Scenario: view previous image when follow previous link
40	- Given I am on /marciopunk/my-gallery/rails.png?view=true
41	- When I follow "« Previous"
42	- Then I should see "other-pic.jpg" within ".title"
43	-
44	- Scenario: not link to previous when in first image
45	- When I am on /marciopunk/my-gallery/other-pic.jpg?view=true
46	- Then I should see "Next »" within ".gallery-navigation a"
47	- And I should not see "« Previous" within ".gallery-navigation a"
48	-
49	- Scenario: display number of current and total of images
50	- Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
51	- Then I should see "image 1 of 2" within ".gallery-navigation"
52	-
53	- Scenario: increment current number when follow next
54	- Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
55	- Then I should see "image 1 of 2" within ".gallery-navigation"
56	- When I follow "Next »"
57	- Then I should see "image 2 of 2" within ".gallery-navigation"
58	-
59	- Scenario: decrement current number when follow next
60	- Given I am on /marciopunk/my-gallery/rails.png?view=true
61	- Then I should see "image 2 of 2" within ".gallery-navigation"
62	- When I follow "« Previous"
63	- Then I should see "image 1 of 2" within ".gallery-navigation"
64	-
65	- Scenario: provide button to go back to gallery
66	- Given I am on /marciopunk/my-gallery/rails.png?view=true
67	- Then I should see "Go back to my-gallery"
68	- When I follow "Go back to my-gallery"
69	- Then I should be on /marciopunk/my-gallery
70	-
71	- # Looking for page title is problematic on selenium since it considers the
72	- # title to be invibible. Checkout some information about this:
73	- # * https://github.com/jnicklas/capybara/issues/863
74	- # * https://github.com/jnicklas/capybara/pull/953
75	- @selenium
76	- Scenario: image title in window title
77	- Given I am logged in as "marciopunk"
78	- When I go to /marciopunk/other-gallery/rails.png?view=true
79	- Then I should see "rails.png" within any "h1"
80	-# And the page title should be "rails.png"
81	- And I follow "Edit"
82	- And I fill in "Title" with "Rails is cool"
83	- And I press "Save"
84	- When I go to /marciopunk/other-gallery/rails.png?view=true
85	- Then I should see "Rails is cool" within any "h1"
86	- #Then the page title should be "Rails is cool"
	@@ -278,29 +278,6 @@ Feature: signup		@@ -278,29 +278,6 @@ Feature: signup
278	Then "José da Silva" should be a member of "Free Software"	278	Then "José da Silva" should be a member of "Free Software"
279		279
280	@selenium	280	@selenium
281	- Scenario: join community on direct signup
282	- Given the following users
283	- \| login \| name \|
284	- \| mariasilva \| Maria Silva \|
285	- And the following communities
286	- \| name \| identifier \| owner \|
287	- \| Free Software \| freesoftware \| mariasilva \|
288	- And feature "skip_new_user_email_confirmation" is enabled on environment
289	- And I am on /freesoftware
290	- When I follow "Join"
291	- And I follow "New user"
292	- And I fill in the following within ".no-boxes":
293	- \| e-Mail \| josesilva@example.com \|
294	- \| Username \| josesilva \|
295	- \| Password \| secret \|
296	- \| Password confirmation \| secret \|
297	- \| Full name \| José da Silva \|
298	- And wait for the captcha signup time
299	- And I press "Create my account"
300	- Then I should see "Control panel"
301	- And "José da Silva" should be a member of "Free Software"
302	-
303	- @selenium
304	Scenario: user registration is moderated by admin	281	Scenario: user registration is moderated by admin
305	Given feature "admin_must_approve_new_users" is enabled on environment	282	Given feature "admin_must_approve_new_users" is enabled on environment
306	And feature "skip_new_user_email_confirmation" is disabled on environment	283	And feature "skip_new_user_email_confirmation" is disabled on environment
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '1.0~rc3'	3	+ VERSION = '1.0~rc4'
4	end	4	end
		1	+@broken_plugins = %w[
		2	+ anti_spam
		3	+ bsc
		4	+ comment_classification
		5	+ ldap
		6	+ send_email
		7	+ shopping_cart
		8	+ solr
		9	+ tolerance_time
		10	+]
		11	+
1	@all_plugins = Dir.glob('plugins/*').map { \|f\| File.basename(f) } - ['template']	12	@all_plugins = Dir.glob('plugins/*').map { \|f\| File.basename(f) } - ['template']
2	@all_plugins.sort!	13	@all_plugins.sort!
3	@all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]	14	@all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]
	@@ -167,6 +178,7 @@ def test_sequence(plugins, tasks)		@@ -167,6 +178,7 @@ def test_sequence(plugins, tasks)
167	end	178	end
168	end	179	end
169	rollback_plugins_state	180	rollback_plugins_state
		181	+ yield(failed) if block_given?
170	fail 'There are broken tests to be fixed!' if fail_flag	182	fail 'There are broken tests to be fixed!' if fail_flag
171	end	183	end
172		184
	@@ -195,13 +207,39 @@ namespace :test do		@@ -195,13 +207,39 @@ namespace :test do
195	@all_tasks.each do \|taskname\|	207	@all_tasks.each do \|taskname\|
196	desc "Run #{taskname} tests for all plugins"	208	desc "Run #{taskname} tests for all plugins"
197	task taskname do	209	task taskname do
198	- test_sequence(@all_plugins, taskname)	210	+ test_sequence(@all_plugins - @broken_plugins, taskname)
199	end	211	end
200	end	212	end
201	end	213	end
202		214
203	desc "Run all tests for all plugins"	215	desc "Run all tests for all plugins"
204	task :noosfero_plugins do	216	task :noosfero_plugins do
205	- test_sequence(@all_plugins, @all_tasks)	217	+ test_sequence(@all_plugins - @broken_plugins, @all_tasks) do \|failed\|
		218	+ plugins_status_report(failed)
		219	+ end
206	end	220	end
207	end	221	end
		222	+
		223	+def plugins_status_report(failed)
		224	+ w = @all_plugins.map { \|s\| s.size }.max
		225	+
		226	+ puts
		227	+ printf ('=' * (w + 21)) + "\n"
		228	+ puts 'Plugins status report'
		229	+ printf ('=' * (w + 21)) + "\n"
		230	+ printf "%-#{w}s %s\n", "Plugin", "Status"
		231	+ printf ('-' * w) + ' ' + ('-' * 20) + "\n"
		232	+
		233	+ @all_plugins.each do \|plugin\|
		234	+ if @broken_plugins.include?(plugin)
		235	+ status = "SKIP"
		236	+ elsif !failed[plugin] \|\| failed[plugin].empty?
		237	+ status = "PASS"
		238	+ else
		239	+ status = "FAIL: #{failed[plugin].join(', ')}"
		240	+ end
		241	+ printf "%-#{w}s %s\n", plugin, status
		242	+ end
		243	+ printf ('=' * (w + 21)) + "\n"
		244	+ puts
		245	+end