[Git][noosfero/noosfero][master] 5 commits: update author name normalization script
Antonio Terceiro
gitlab at mg.gitlab.com
Thu Jan 28 15:48:24 BRST 2016
Antonio Terceiro pushed to branch master at Noosfero / noosfero
Commits:
cb05de3b by Antonio Terceiro at 2016-01-26T17:02:40-02:00
update author name normalization script
- - - - -
ca669513 by Antonio Terceiro at 2016-01-26T17:03:24-02:00
Updating authors file
- - - - -
be752827 by Antonio Terceiro at 2016-01-26T17:03:37-02:00
Bumping version 1.4~rc2
- - - - -
0e51eedb by Antonio Terceiro at 2016-01-28T15:46:54-02:00
Merge tag '1.4-rc2'
Noosfero 1.4~rc2
- - - - -
ac1747b4 by Antonio Terceiro at 2016-01-28T15:47:09-02:00
sub_organizations: fix cucumber/selenium tests
- - - - -
6 changed files:
- AUTHORS.md
- debian/changelog
- lib/noosfero/version.rb
- plugins/sub_organizations/features/sub_organizations_block.feature
- plugins/sub_organizations/features/sub_organizations_display.feature
- script/authors.sed
Changes:
=====================================
AUTHORS.md
=====================================
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -11,6 +11,7 @@ Developers
Ábner Silva de Oliveira <abner.oliveira at serpro.gov.br>
Alan Freihof Tygel <alantygel at gmail.com>
Alessandro Palmeira <alessandro.palmeira at gmail.com>
+Alexandre Barbosa <alexandreab at live.com>
Alexandre Torres <alexandrekry at gmail.com>
Alex Campelo <campelo.al1 at gmail.com>
Álvaro Fernando <alvarofernandoms at gmail.com>
@@ -120,6 +121,7 @@ Raquel <rcordioli at gmail.com>
Renan Costa <renan2727 at hotmail.com>
Renan Teruo <renanteruoc at gmail.com>
Rodrigo Medeiros <rodrigo.mss01 at gmail.com>
+Rodrigo Siqueira <siqueira at kuniri.org>
Rodrigo Souto <rodrigo at colivre.coop.br>
Ronnie Simon <ronniesimonf at gmail.com>
Ronny Kursawe <kursawe.ronny at googlemail.com>
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.4~rc2) jessie-test; urgency=medium
+
+ * Noosfero 1.4 RC2
+
+ -- Antonio Terceiro <terceiro at colivre.coop.br> Tue, 26 Jan 2016 17:03:34 -0200
+
noosfero (1.4~rc1) jessie-test; urgency=low
* Noosfero 1.4 RC 0
=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
module Noosfero
PROJECT = 'noosfero'
- VERSION = '1.4~rc1'
+ VERSION = '1.4~rc2'
end
root = File.expand_path(File.dirname(__FILE__) + '/../..')
=====================================
plugins/sub_organizations/features/sub_organizations_block.feature
=====================================
--- a/plugins/sub_organizations/features/sub_organizations_block.feature
+++ b/plugins/sub_organizations/features/sub_organizations_block.feature
@@ -20,29 +20,24 @@ Feature: related_organizations_block
And I am logged in as "homer"
And I go to springfield's control panel
- Scenario: display sub organizations block add option
- When I follow "Edit sideboxes"
- And I follow "Add a block"
- Then I should see "Related Organizations"
-
Scenario: display both sub types on block
+ Given the following blocks
+ | owner | type |
+ | springfield | RelatedOrganizationsBlock |
When I follow "Edit sideboxes"
- And I follow "Add a block"
- And I choose "Related Organizations"
- And I press "Add"
- Then I should see "Moe" within ".related-organizations-block"
- And I should see "Duff" within ".related-organizations-block"
+ Then I should see "Moe" within ".block.related-organizations-block"
+ And I should see "Duff" within ".block.related-organizations-block"
Scenario: display only sub-communities
Given the following blocks
| owner | type |
| springfield | RelatedOrganizationsBlock |
When I follow "Edit sideboxes"
- And I follow "Edit" within ".related-organizations-block"
+ And I follow "Edit" within ".block.related-organizations-block"
And I select "Community" from "block_organization_type"
And I press "Save"
- Then I should see "Moe" within ".related-organizations-block"
- And I should not see "Duff" within ".related-organizations-block"
+ Then I should see "Moe" within ".block.related-organizations-block"
+ And I should not see "Duff" within ".block.related-organizations-block"
Scenario: display both sub types on sub-organizations page
When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
@@ -54,9 +49,9 @@ Feature: related_organizations_block
| owner | type |
| springfield | RelatedOrganizationsBlock |
When I follow "Edit sideboxes"
- And I follow "Edit" within ".related-organizations-block"
+ And I follow "Edit" within ".block.related-organizations-block"
And I select "Community" from "block_organization_type"
And I press "Save"
- And I follow "View all" within ".related-organizations-block"
+ And I follow "View all" within ".block.related-organizations-block"
Then I should see "Moe" within ".profile-list"
And I should not see "Duff" within ".profile-list"
=====================================
plugins/sub_organizations/features/sub_organizations_display.feature
=====================================
--- a/plugins/sub_organizations/features/sub_organizations_display.feature
+++ b/plugins/sub_organizations/features/sub_organizations_display.feature
@@ -16,12 +16,12 @@ Feature: sub_organizations_display
And the following enterprise
| identifier | name | owner | description | city | state |
| school | School | nelson | School description | Terra do Nunca | Billy Jean |
+ And the following blocks
+ | owner | type |
+ | springfield | RelatedOrganizationsBlock |
And I am logged in as "nelson"
And I go to springfield's control panel
When I follow "Edit sideboxes"
- And I follow "Add a block"
- And I choose "Related Organizations"
- And I press "Add"
@selenium
Scenario: Display the sub organization block when there is a sub enterprise and communitys
@@ -76,6 +76,6 @@ Feature: sub_organizations_display
And I should see "Terra do Nunca, Billy Jean" within ".related-organizations-region-name"
Scenario: Display message when display full block are empty
- Given I follow "View all" within ".related-organizations-block"
+ Given I follow "View all" within ".block.related-organizations-block"
Then I should see "There are no sub-communities yet."
And I should see "There are no sub-enterprises yet."
=====================================
script/authors.sed
=====================================
--- a/script/authors.sed
+++ b/script/authors.sed
@@ -168,6 +168,7 @@ s/macartur.sc at gmail.com$/macartur.sc at gmail.com>/
s/Marcos da Silva Ramos <ms.ramos at outlook.com>/Marcos Ramos <ms.ramos at outlook.com>/
s/Marcos Ramos <ms.ramos at outlook.com$/Marcos Ramos <ms.ramos at outlook.com>/
+s/msramos at outlook.com/ms.ramos at outlook.com/
s/Marcos <marcos.rpj2 at gmail.com>/Marcos Ronaldo <marcos.rpj2 at gmail.com>/
s/melissa at colivre.coop.br/melissa.srw at gmail.com/
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/71949171167cb709ac0673842d7c947c97bdd302...ac1747b4e01fab443962ee79268946470b91085b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160128/63270b37/attachment.html>
More information about the Noosfero-dev
mailing list