[Fusionforge-commits] r11398 - trunk/tests/func/RBAC

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Nov 5 14:42:58 CET 2010


Author: lolando
Date: 2010-11-05 14:42:57 +0100 (Fri, 05 Nov 2010)
New Revision: 11398

Modified:
   trunk/tests/func/RBAC/rbacTest.php
Log:
Make RBAC testsuite not fail when run from a non-clean database

Modified: trunk/tests/func/RBAC/rbacTest.php
===================================================================
--- trunk/tests/func/RBAC/rbacTest.php	2010-11-04 23:03:54 UTC (rev 11397)
+++ trunk/tests/func/RBAC/rbacTest.php	2010-11-05 13:42:57 UTC (rev 11398)
@@ -49,7 +49,7 @@
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isLoginRequired());
 		$this->triggeredLogin('staffmember');
-		$this->assertTrue($this->isTextPresent("This is the public description for ProjectA."));
+		$this->assertTrue($this->isTextPresent("Project Members"));
 	}
 
 	function testGlobalRolesAndPermissions()
@@ -216,10 +216,10 @@
 		$this->createUser ("docmaster") ;
 		$this->createUser ("trainee") ;
 
-		// Create "Project approvers" role
+		// Create "Project moderators" role
 		$this->click("link=Site Admin");
 		$this->waitForPageToLoad("30000");
-		$this->type ("//form[contains(@action,'globalroleedit.php')]//input[@name='role_name']", "Project approvers") ;
+		$this->type ("//form[contains(@action,'globalroleedit.php')]//input[@name='role_name']", "Project moderators") ;
 		$this->click ("//form[contains(@action,'globalroleedit.php')]//input[@value='Create Role']") ;
 		$this->waitForPageToLoad("30000");
 
@@ -460,7 +460,7 @@
 		$this->waitForPageToLoad("30000");
 
 		$this->assertTrue($this->isElementPresent("//input[@value='Link external role']/../../td/select/option[.='Documentation masters (global role)']")) ;
-		$this->assertFalse($this->isElementPresent("//input[@value='Link external role']/../../td/select/option[.='Project approvers (global role)']")) ;
+		$this->assertFalse($this->isElementPresent("//input[@value='Link external role']/../../td/select/option[.='Project moderators (global role)']")) ;
 		$this->select("//input[@value='Link external role']/../../td/select", "label=Documentation masters (global role)") ;
 		$this->click("//input[@value='Link external role']") ;
 		$this->waitForPageToLoad("30000");




More information about the Fusionforge-commits mailing list