[Fusionforge-commits] FusionForge branch master updated. e500d3b3b7d7cd4d661358900e75e666cfcf0078

Roland Mas lolando at fusionforge.org
Wed Nov 7 17:41:26 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  e500d3b3b7d7cd4d661358900e75e666cfcf0078 (commit)
       via  af4f3b8d574d29ead9a0f1fb1961674363717a7b (commit)
       via  8487f17327c5ca12c44ff03007925900f4523821 (commit)
       via  77e65871c239e2a5092bed947ae8a928f60c10b2 (commit)
       via  7429f6a436953b46755286e18ce5eaf3be9a0239 (commit)
       via  78e41d64968f7e54188b24c9eabdd04f9f8c6a97 (commit)
       via  03db4f54ce34ac8fd96d57c071e713df3b998af7 (commit)
       via  a16542c008e14957ca058a92fe2935b669af963e (commit)
       via  6938d03411fa079a29a3dcf51b4164ac920c83cd (commit)
       via  59babb4d9f59640efcaa477f00a0bc33f4dfba17 (commit)
       via  91e0d5e3c154b9e8c5eeb6d4dd71b0a2321ca3de (commit)
       via  0692800fd8aca91d2a0ec5f90423de42926d860d (commit)
       via  a010791eb455712210c5cc7193181b39d430becc (commit)
      from  817c49c7fd08ca506e9a123a9fcaf7f7f4ad4bbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e500d3b3b7d7cd4d661358900e75e666cfcf0078
Merge: af4f3b8 77e6587
Author: Roland Mas <lolando at debian.org>
Date:   Wed Nov 7 17:41:10 2012 +0100

    Contentless merge from 5.2


commit af4f3b8d574d29ead9a0f1fb1961674363717a7b
Merge: 8487f17 7429f6a
Author: Roland Mas <lolando at debian.org>
Date:   Wed Nov 7 17:40:17 2012 +0100

    Merge from 5.2: miscellaneous fixes

diff --cc src/packaging/install/web-apache2
index 9cac244,ef129bd..6a4fcde
--- a/src/packaging/install/web-apache2
+++ b/src/packaging/install/web-apache2
@@@ -1,6 -1,9 +1,9 @@@
 -www                                 usr/share/@OLDPACKAGE@/
 -www/index_std.php                   etc/@OLDPACKAGE@/custom/
 -utils/install-apache.sh             usr/share/@OLDPACKAGE@/bin/
 -utils/manage-apache-config.sh	    usr/share/@OLDPACKAGE@/bin/
 -etc/httpd.conf.d-fhs		    usr/share/@OLDPACKAGE@/etc/
 -etc/httpd.conf-fhs		    usr/share/@OLDPACKAGE@/etc/
 -lib/vendor/coolfieldset		    usr/share/@OLDPACKAGE@/lib/vendor/
 -lib/vendor/jquery-simpletreemenu    usr/share/@OLDPACKAGE@/lib/vendor/
 -lib/vendor/jquery-storage	    usr/share/@OLDPACKAGE@/lib/vendor/
 +www                                 @SOURCE_PATH@/
 +www/index_std.php                   @CONFIG_PATH@/custom/
 +utils/install-apache.sh             @BINARY_PATH@/
 +utils/manage-apache-config.sh	    @BINARY_PATH@/
 +etc/httpd.conf.d-fhs		    @SOURCE_PATH@/etc/
 +etc/httpd.conf-fhs		    @SOURCE_PATH@/etc/
++lib/vendor/coolfieldset		    @SOURCE_PATH@/lib/vendor/
++lib/vendor/jquery-simpletreemenu    @SOURCE_PATH@/lib/vendor/
++lib/vendor/jquery-storage	    @SOURCE_PATH@/lib/vendor/
diff --cc tests/func/RBAC/rbacTest.php
index ae113d1,643dd16..fc6d5af
--- a/tests/func/RBAC/rbacTest.php
+++ b/tests/func/RBAC/rbacTest.php
@@@ -580,5 -580,48 +580,47 @@@ class RBAC extends FForge_SeleniumTestC
  		$this->click("link=Home");
  		$this->waitForPageToLoad("30000");
  		$this->assertFalse($this->isTextPresent("SubProject"));
+ 
+ 		// Make sure permissions are saved for news-related forums
+ 		$this->switchUser(FORGE_ADMIN_USERNAME);
+ 		$this->gotoProject ("MetaProject") ;
+ 
+ 		$this->click("link=News");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->click("link=Submit");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->type("summary", "First news");
+ 		$this->type("details", "This is a simple news.");
+ 		$this->click("submit");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->click("link=News");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->assertTrue($this->isTextPresent("First news"));
+ 		$this->click("link=First news");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->assertTrue($this->isTextPresent("First news"));
+ 		$this->assertTrue($this->isTextPresent("This is a simple news."));
+ 
+ 		$this->click("link=Admin");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->click("link=Users and permissions");
+ 		$this->waitForPageToLoad("30000");
+ 		$this->click ("//td/form/div[contains(.,'Anonymous')]/../div/input[@value='Edit Permissions']") ;
+ 		$this->waitForPageToLoad("30000");
+ 
+ 		$this->select("//tr/td[contains(.,'first-news')]/../td/select", "label=Read only");
+ 		$this->click ("//input[@value='Submit']") ;
+ 		$this->waitForPageToLoad("30000");
+ 		$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select", "Read only");
+ 
+ 		$this->select("//tr/td[contains(.,'first-news')]/../td/select", "label=Moderated post");
+ 		$this->click ("//input[@value='Submit']") ;
+ 		$this->waitForPageToLoad("30000");
+ 		$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select", "Moderated post");
+ 
+ 		$this->select("//tr/td[contains(.,'first-news')]/../td/select", "label=Unmoderated post");
+ 		$this->click ("//input[@value='Submit']") ;
+ 		$this->waitForPageToLoad("30000");
+ 		$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select", "Unmoderated post");
  	}
  }
 -?>

commit 8487f17327c5ca12c44ff03007925900f4523821
Merge: 817c49c 0692800
Author: Roland Mas <lolando at debian.org>
Date:   Wed Nov 7 17:38:23 2012 +0100

    Contentless merge from 5.2


-----------------------------------------------------------------------

Summary of changes:
 src/common/forum/ForumFactory.class.php            |   13 ++++++
 src/common/include/RBAC.php                        |    4 +-
 src/packaging/install/web-apache2                  |    3 ++
 .../authldap/include/AuthLDAPPlugin.class.php      |    2 +-
 src/www/frs/download.php                           |    2 +-
 tests/func/RBAC/rbacTest.php                       |   44 +++++++++++++++++++-
 6 files changed, 63 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list