[Fusionforge-commits] r11120 - in trunk/tests: . func func/Site func/Testing

Christian Bayle cbayle at libremir.placard.fr.eu.org
Fri Oct 22 03:00:16 CEST 2010


Author: cbayle
Date: 2010-10-22 03:00:15 +0200 (Fri, 22 Oct 2010)
New Revision: 11120

Modified:
   trunk/tests/DEBDebian60Tests.php
   trunk/tests/func/Site/projectsTest.php
   trunk/tests/func/Testing/SeleniumGforge.php
   trunk/tests/func/config.php.buildbotDEB
Log:
Activate much more tests, few are still to correct


Modified: trunk/tests/DEBDebian60Tests.php
===================================================================
--- trunk/tests/DEBDebian60Tests.php	2010-10-21 23:58:04 UTC (rev 11119)
+++ trunk/tests/DEBDebian60Tests.php	2010-10-22 01:00:15 UTC (rev 11120)
@@ -20,10 +20,11 @@
 
 		// Selenium tests
 		$suite->addTestFiles(glob("func/Site/*Test.php"));
-//		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
-//		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
-//		$suite->addTestFiles(glob("func/Forums/*Test.php"));
-//		$suite->addTestFiles(glob("func/News/*Test.php"));
+		if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
+		$suite->addTestFiles(glob("func/Trackers/*Test.php"));
+		$suite->addTestFiles(glob("func/Tasks/*Test.php"));
+		$suite->addTestFiles(glob("func/Forums/*Test.php"));
+		$suite->addTestFiles(glob("func/News/*Test.php"));
 //		$suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
 		
 		return $suite;

Modified: trunk/tests/func/Site/projectsTest.php
===================================================================
--- trunk/tests/func/Site/projectsTest.php	2010-10-21 23:58:04 UTC (rev 11119)
+++ trunk/tests/func/Site/projectsTest.php	2010-10-22 01:00:15 UTC (rev 11120)
@@ -64,8 +64,8 @@
 		$this->click("link=Register Project");
 		$this->waitForPageToLoad("30000");
 		$this->type("full_name", "ProjectA");
-		$this->type("purpose", "This is a simple description for project A");
-		$this->type("description", "This is the public description for project A.");
+		$this->type("purpose", "This is a simple description for ProjectA");
+		$this->type("description", "This is the public description for ProjectA.");
 		$this->type("unix_name", "projecta");
 		$this->click("//input[@name='scm' and @value='scmsvn']");
 		$this->click("submit");
@@ -83,7 +83,7 @@
 		$this->assertTrue($this->isTextPresent("ProjectA"));
 		$this->click("link=ProjectA");
 		$this->waitForPageToLoad("30000");
-		$this->assertTrue($this->isTextPresent("This is the public description for project A."));
+		$this->assertTrue($this->isTextPresent("This is the public description for ProjectA."));
 		$this->assertTrue($this->isTextPresent("This project has not yet categorized itself"));
 	}
 

Modified: trunk/tests/func/Testing/SeleniumGforge.php
===================================================================
--- trunk/tests/func/Testing/SeleniumGforge.php	2010-10-21 23:58:04 UTC (rev 11119)
+++ trunk/tests/func/Testing/SeleniumGforge.php	2010-10-22 01:00:15 UTC (rev 11120)
@@ -128,6 +128,7 @@
 		$this->waitForPageToLoad("30000");
 		$this->click("link=My Page");
 		$this->waitForPageToLoad("30000");
+		if ((!defined('PROJECTA')) || ($unix_name != "projecta")) {
 		$this->click("link=Register Project");
 		$this->waitForPageToLoad("30000");
 		$this->type("full_name", $name);
@@ -145,6 +146,7 @@
 		$this->waitForPageToLoad("30000");
 		$this->click("document.forms['approve.$unix_name'].submit");
 		$this->waitForPageToLoad("30000");
+		}
 		$this->click("link=Home");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent($name));

Modified: trunk/tests/func/config.php.buildbotDEB
===================================================================
--- trunk/tests/func/config.php.buildbotDEB	2010-10-21 23:58:04 UTC (rev 11119)
+++ trunk/tests/func/config.php.buildbotDEB	2010-10-22 01:00:15 UTC (rev 11120)
@@ -25,7 +25,8 @@
 define('DB_NAME', getenv('DB_NAME'));
 define('DB_USER', 'gforge');
 define('DB_PASSWORD', '@@FFDB_PASS@@');
-define('DB_INIT_CMD', "ssh root@".HOST." 'CONFIGURED=true CONFIG_PHP=config.php.buildbotDEB echo KEEPING_DB_As_Is'");
+// We keep the same db 
+//define('DB_INIT_CMD', "");
 
 // this should be an existing user of the forge together with its password
 // (the password should be different from 'myadmin')




More information about the Fusionforge-commits mailing list