[Fusionforge-commits] FusionForge branch master updated. 9fd99fb97e7b3fd824998c532e76e4f5d5f9b421

Franck Villaume nerville at fusionforge.org
Fri Dec 19 16:37:55 CET 2014


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  9fd99fb97e7b3fd824998c532e76e4f5d5f9b421 (commit)
      from  39707a57e3f11baa28cc9f7344760fcb389d0d65 (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 9fd99fb97e7b3fd824998c532e76e4f5d5f9b421
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Dec 19 16:36:39 2014 +0100

    indent & clean-up

diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index b8f2b63..3c59240 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -124,8 +124,6 @@ class LoginProcess extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("Log Out"));
 		$this->assertTrue($this->isTextPresent("Log Out"));
 	}
-
-
 }
 
 // Local Variables:
diff --git a/tests/func/10_Site/projectsTest.php b/tests/func/10_Site/projectsTest.php
index 36c8062..be2cb24 100644
--- a/tests/func/10_Site/projectsTest.php
+++ b/tests/func/10_Site/projectsTest.php
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/10_Site/topTest.php b/tests/func/10_Site/topTest.php
index d07682a..a53e006 100644
--- a/tests/func/10_Site/topTest.php
+++ b/tests/func/10_Site/topTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 - 2010 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -46,39 +46,39 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class TopTester extends FForge_SeleniumTestCase
 {
-    function testWalkInTop()
-    {
-	    $this->populateStandardTemplate('forums');
-	    $this->init();
+	function testWalkInTop()
+	{
+		$this->populateStandardTemplate('forums');
+		$this->init();
 
-	    $this->clickAndWait("link=Forums");
-	    $this->clickAndWait("link=open-discussion");
-	    $this->clickAndWait("link=Start New Thread");
-	    $this->type("subject", "Message1");
-	    $this->type("body", "Text1");
-	    $this->clickAndWait("submit");
-	    $this->assertTextPresent("Message Posted Successfully");
+		$this->clickAndWait("link=Forums");
+		$this->clickAndWait("link=open-discussion");
+		$this->clickAndWait("link=Start New Thread");
+		$this->type("subject", "Message1");
+		$this->type("body", "Text1");
+		$this->clickAndWait("submit");
+		$this->assertTextPresent("Message Posted Successfully");
 
-	    $this->cron("db/project_weekly_metric.php");
+		$this->cron("db/project_weekly_metric.php");
 
-	    // Test that from the main page we access the most active this week.
-	    $this->clickAndWait("link=Home");
-	    $this->clickAndWait("link=All project activities");
-	    $this->assertTextPresent("Most Active This Week");
+		// Test that from the main page we access the most active this week.
+		$this->clickAndWait("link=Home");
+		$this->clickAndWait("link=All project activities");
+		$this->assertTextPresent("Most Active This Week");
 
-	    // Test that we can return back to all the tops.
-	    $this->clickAndWait("link=[View Other Top Categories]");
-	    $this->assertTextPresent("We track many project usage statistics");
+		// Test that we can return back to all the tops.
+		$this->clickAndWait("link=[View Other Top Categories]");
+		$this->assertTextPresent("We track many project usage statistics");
 
-	    // Test that we can go the view the most active all time.
-	    $this->clickAndWait("link=Most Active All Time");
-	    $this->assertTextPresent("Most Active All Time");
+		// Test that we can go the view the most active all time.
+		$this->clickAndWait("link=Most Active All Time");
+		$this->assertTextPresent("Most Active All Time");
 
-	    // Return back to tops.
-	    $this->clickAndWait("link=[View Other Top Categories]");
-	    $this->clickAndWait("link=Top Downloads");
-	    $this->assertTextPresent("Rank");
-    }
+		// Return back to tops.
+		$this->clickAndWait("link=[View Other Top Categories]");
+		$this->clickAndWait("link=Top Downloads");
+		$this->assertTextPresent("Rank");
+	}
 }
 
 // Local Variables:
diff --git a/tests/func/10_Site/troveTest.php b/tests/func/10_Site/troveTest.php
index e344ce9..ac98b15 100644
--- a/tests/func/10_Site/troveTest.php
+++ b/tests/func/10_Site/troveTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2009 Alain Peyrat <aljeux at free.fr>
  *
  * This file is part of FusionForge.
diff --git a/tests/func/20_Docs/createDocURLTest.php b/tests/func/20_Docs/createDocURLTest.php
index 7ca6c09..001f7ae 100644
--- a/tests/func/20_Docs/createDocURLTest.php
+++ b/tests/func/20_Docs/createDocURLTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2010-2013 Alain Peyrat - Alcatel-Lucent
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2013, Franck Villaume - TrivialDev
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/20_Forums/forumsTest.php b/tests/func/20_Forums/forumsTest.php
index 8b7ca1c..b3f7cde 100644
--- a/tests/func/20_Forums/forumsTest.php
+++ b/tests/func/20_Forums/forumsTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -71,7 +71,7 @@ class CreateForum extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("Message1"));
 	}
 
-	/*
+	/**
 	 * Simulate a click on the link from a mail.
 	 * As the forum is private, the users should be
 	 * redirected to the login prompt saying that he has
@@ -95,7 +95,7 @@ class CreateForum extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("Welcome to developers"));
 	}
 
-	/*
+	/**
 	 * Simulate a user non logged that will reply
 	 * to a message in a forum. He will be redirected
 	 * to the login page, then will reply and then
@@ -124,7 +124,7 @@ class CreateForum extends FForge_SeleniumTestCase
 
 	}
 
-	/*
+	/**
 	 * Verify that it is impossible to use name already used by a mailing list
 	 */
 	function testEmailAddressNotAlreadyUsed() {
diff --git a/tests/func/20_News/newsTest.php b/tests/func/20_News/newsTest.php
index 470a678..460c7da 100644
--- a/tests/func/20_News/newsTest.php
+++ b/tests/func/20_News/newsTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -119,7 +119,7 @@ class CreateNews extends FForge_SeleniumTestCase
 
 	}
 
-	/*
+	/**
 	 * Test multilines news formated in HTML.
 	 */
 	function testAcBug4100()
@@ -147,7 +147,7 @@ class CreateNews extends FForge_SeleniumTestCase
 		$this->assertTextPresent("line5");
 	}
 
-	/*
+	/**
 	 * Test multiple post of the news (reload or back+resubmit).
 	 */
 	function testPreventMultiplePost()
diff --git a/tests/func/20_Surveys/surveysTest.php b/tests/func/20_Surveys/surveysTest.php
index c1eb737..5fd5db3 100644
--- a/tests/func/20_Surveys/surveysTest.php
+++ b/tests/func/20_Surveys/surveysTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2010 Alcatel-Lucent
  *
  * This file is part of FusionForge.
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/20_Tasks/createTaskTest.php b/tests/func/20_Tasks/createTaskTest.php
index 9754a22..131200a 100644
--- a/tests/func/20_Tasks/createTaskTest.php
+++ b/tests/func/20_Tasks/createTaskTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/20_Trackers/relationTest.php b/tests/func/20_Trackers/relationTest.php
index 476dd5b..7430044 100644
--- a/tests/func/20_Trackers/relationTest.php
+++ b/tests/func/20_Trackers/relationTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009-2010 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/20_Trackers/trackersTest.php b/tests/func/20_Trackers/trackersTest.php
index 022fb46..c47547d 100644
--- a/tests/func/20_Trackers/trackersTest.php
+++ b/tests/func/20_Trackers/trackersTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 - 2010 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/20_Trackers/workflowTest.php b/tests/func/20_Trackers/workflowTest.php
index 5365f8d..8607126 100644
--- a/tests/func/20_Trackers/workflowTest.php
+++ b/tests/func/20_Trackers/workflowTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 - 2010 Alain Peyrat, Alcatel-Lucent
  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
diff --git a/tests/func/30_Search/searchTest.php b/tests/func/30_Search/searchTest.php
index 99c58e2..6d51173 100644
--- a/tests/func/30_Search/searchTest.php
+++ b/tests/func/30_Search/searchTest.php
@@ -616,5 +616,4 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
 	}
-
 }
diff --git a/tests/func/40_SSH/sshTest.php b/tests/func/40_SSH/sshTest.php
index 3920b5e..1c78ac5 100644
--- a/tests/func/40_SSH/sshTest.php
+++ b/tests/func/40_SSH/sshTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2014 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -28,7 +28,7 @@ class SSHTest extends FForge_SeleniumTestCase
 		$this->init();
 
 		$this->uploadSshKey();
-	    
+
 		// Run the cronjobs
 		$this->cron("shell/homedirs.php");
 
diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php b/tests/func/50_PluginsScmBzr/bzrTest.php
index 52c1d11..41a4bd3 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 function mysystem($cmd, &$ret=null) {
-  print "Running: $cmd\n";
-  ob_flush();
-  system($cmd, $ret);
+	print "Running: $cmd\n";
+	ob_flush();
+	system($cmd, $ret);
 }
 
 class ScmBzrTest extends FForge_SeleniumTestCase
@@ -45,9 +45,9 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->check("//input[@name='scmengine[]' and @value='scmbzr']");
 		$this->clickAndWait("submit");
-	    
+
 		$this->uploadSshKey();
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -61,12 +61,12 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Bazaar Repository");
-        $this->selectFrame("id=scmbzr_iframe");
+		$this->selectFrame("id=scmbzr_iframe");
 		$this->assertTextPresent("Browsing (root)");
 		$this->click("link=projecta");
 		$this->waitForPageToLoad(60000);
 		$this->assertTextPresent("Browsing (root)/projecta");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
 		// Get the address of the repo
 		$this->open(ROOT);
@@ -95,7 +95,7 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Bazaar Repository");
-        $this->selectFrame("id=scmbzr_iframe");
+		$this->selectFrame("id=scmbzr_iframe");
 		$this->assertTextPresent("Browsing (root)");
 		$this->click("link=projecta");
 		$this->waitForPageToLoad(60000);
@@ -109,9 +109,8 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->waitForPageToLoad(60000);
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
 		mysystem("rm -fr $t");
 	}
 }
-?>
diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php b/tests/func/50_PluginsScmGit/gitSSHTest.php
index 57d42c8..a290331 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -38,7 +38,7 @@ class ScmGitSSHTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("submit");
 
 		$this->uploadSshKey();
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -71,13 +71,13 @@ class ScmGitSSHTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
+		$this->selectFrame("id=scmgit_iframe");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 		$this->clickAndWait("link=projecta.git");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
 		system("rm -fr $t");
 	}
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 60ca355..c86d7c5 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -26,7 +26,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 	function testScmGitSmartHTTP()
 	{
 
-        $this->changeConfig("[core]\nuse_ssl = no\n");
+		$this->changeConfig("[core]\nuse_ssl = no\n");
 
 		$this->activatePlugin('scmgit');
 		$this->populateStandardTemplate('empty');
@@ -39,7 +39,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->click("//input[@name='scmengine[]' and @value='scmgit']");
 		$this->clickAndWait("submit");
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -53,15 +53,15 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$p = $this->getText("//tt[contains(.,'git clone http') and contains(.,'".FORGE_ADMIN_USERNAME."@')]");
 		$p = preg_replace(",^git clone ,", "", $p);
 		$p = preg_replace(",@,", ":".FORGE_ADMIN_PASSWORD."@", $p);
-        $log = "2> /var/log/git.stderr > /var/log/git.stdout";
-        $timeout = "timeout 15s";
+		$log = "2> /var/log/git.stderr > /var/log/git.stdout";
+		$timeout = "timeout 15s";
 
 		// Create a local clone, add stuff, push it to the repo
 		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
 		system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p $log", $ret);
-        if ($ret >= 120) {
-            system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p $log", $ret);
-        }
+		if ($ret >= 120) {
+			system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p $log", $ret);
+		}
 		$this->assertEquals($ret, 0);
 
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
@@ -71,9 +71,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertEquals($ret, 0);
 
 		system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all $log", $ret);
-        if ($ret >= 120) {
-            system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all $log", $ret);
-        }
+		if ($ret >= 120) {
+			system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all $log", $ret);
+		}
 		$this->assertEquals($ret, 0);
 
 		// Check that the changes appear in gitweb
@@ -81,7 +81,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
+		$this->selectFrame("id=scmgit_iframe");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 		$this->clickAndWait("link=projecta.git");
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php b/tests/func/50_PluginsScmGit/gitWUITest.php
index aec095a..19711a5 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -36,12 +36,12 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->check("//input[@name='scmengine[]' and @value='scmgit']");
 		$this->clickAndWait("submit");
-	    
+
 		$this->type("//input[@name='repo_name']", "other-repo");
 		$this->type("//input[@name='description']", "Description for second repository");
 		$this->clickAndWait("//input[@value='Submit']");
 		$this->assertTextPresent("New repository other-repo registered");
-		
+
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
@@ -61,13 +61,13 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
+		$this->selectFrame("id=scmgit_iframe");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->clickAndWait("link=projecta");
 		$this->assertTextPresent("projecta.git");
 		$this->assertTextPresent("other-repo.git");
 		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
@@ -84,13 +84,13 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
+		$this->selectFrame("id=scmgit_iframe");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->clickAndWait("link=projecta");
 		$this->assertTextPresent("projecta.git");
 		$this->assertTextNotPresent("other-repo.git");
 		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 	}
 
 	/**
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index 7596371..95b0ddb 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -25,7 +25,7 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
 {
 	function testScmSvnSSH()
 	{
-        $this->changeConfig("[scmsvn]\nuse_ssh = yes\nuse_dav = no\n");
+		$this->changeConfig("[scmsvn]\nuse_ssh = yes\nuse_dav = no\n");
 
 		$this->activatePlugin('scmsvn');
 		$this->populateStandardTemplate('empty');
@@ -40,7 +40,7 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("submit");
 
 		$this->uploadSshKey();
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -68,10 +68,10 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
+		$this->selectFrame("id=scmsvn_iframe");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextNotPresent("Adding file");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
 		system("rm -fr $t");
 	}
diff --git a/tests/func/50_PluginsScmSvn/svnWUITest.php b/tests/func/50_PluginsScmSvn/svnWUITest.php
index 36249e3..442f0a9 100644
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -38,7 +38,7 @@ class ScmSvnWUITest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->check("//input[@name='scmengine[]' and @value='scmsvn']");
 		$this->clickAndWait("submit");
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 
@@ -46,10 +46,10 @@ class ScmSvnWUITest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
+		$this->selectFrame("id=scmsvn_iframe");
 		$this->assertTextPresent("trunk");
 		$this->assertTextPresent("Init");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 	}
 
 	/**
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 5d1115e..760b07b 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2012 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -38,7 +38,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->click("//input[@name='scmengine[]' and @value='scmsvn']");
 		$this->clickAndWait("submit");
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -56,26 +56,26 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		$t = exec("mktemp -d /tmp/svnTest.XXXXXX");
 		$auth = "--username ".FORGE_ADMIN_USERNAME." --password ".FORGE_ADMIN_PASSWORD;
 		$globalopts = "--trust-server-cert --non-interactive";
-        $log = "2> /var/log/svn.stderr > /var/log/svn.stdout";
-        $timeout = "timeout 15s";
+		$log = "2> /var/log/svn.stderr > /var/log/svn.stdout";
+		$timeout = "timeout 15s";
 		system("cd $t && $timeout svn checkout $globalopts $auth $p projecta $log", $ret);
-        if ($ret > 120) {
-            system("cd $t && $timeout svn checkout $globalopts $auth $p projecta $log", $ret);
-        }
+		if ($ret > 120) {
+			system("cd $t && $timeout svn checkout $globalopts $auth $p projecta $log", $ret);
+		}
 		$this->assertEquals($ret, 0);
 		sleep(2);
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
 		system("cd $t/projecta && $timeout svn add mytext.txt $log && $timeout svn commit $globalopts $auth -m'Adding file' $log", $ret);
-        if ($ret > 120) {
-            system("cd $t/projecta && $timeout svn add mytext.txt $log && $timeout svn commit $globalopts $auth -m'Adding file' $log", $ret);
-        }
+		if ($ret > 120) {
+			system("cd $t/projecta && $timeout svn add mytext.txt $log && $timeout svn commit $globalopts $auth -m'Adding file' $log", $ret);
+		}
 		$this->assertEquals($ret, 0);
 		sleep(2);
 		system("echo 'another simple text' >> $t/projecta/mytext.txt");
 		system("cd $t/projecta && $timeout svn commit $globalopts $auth -m'Modifying file' $log", $ret);
-        if ($ret > 120) {
-            system("cd $t/projecta && $timeout svn commit $globalopts $auth -m'Modifying file' $log", $ret);
-        }
+		if ($ret > 120) {
+			system("cd $t/projecta && $timeout svn commit $globalopts $auth -m'Modifying file' $log", $ret);
+		}
 		$this->assertEquals($ret, 0);
 		sleep(2);
 
@@ -84,7 +84,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
+		$this->selectFrame("id=scmsvn_iframe");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextNotPresent("Adding file");
 
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index 6acc8f3..91e560c 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
@@ -28,7 +28,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->skip_on_rpm_installs();
 		$this->skip_on_src_installs();
 
-        $this->changeConfig("[core]\nallow_multiple_scm = yes\n");
+		$this->changeConfig("[core]\nallow_multiple_scm = yes\n");
 
 		$this->activatePlugin('scmsvn');
 		$this->activatePlugin('scmgit');
@@ -45,9 +45,9 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->check("//input[@name='scmengine[]' and @value='scmgit']");
 		$this->check("//input[@name='scmengine[]' and @value='scmbzr']");
 		$this->clickAndWait("submit");
-	    
+
 		$this->uploadSshKey();
-	    
+
 		// Run the cronjob to create repositories
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
@@ -110,7 +110,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Bazaar Repository");
-        $this->selectFrame("id=scmbzr_iframe");
+		$this->selectFrame("id=scmbzr_iframe");
 		$this->assertTextPresent("Browsing (root)");
 		$this->clickAndWait("link=projecta");
 		$this->assertTextPresent("Browsing (root)/projecta");
@@ -121,31 +121,31 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Changes");
 		$this->assertTextPresent("Modifying file in Bazaar");
 		$this->assertTextPresent("Adding file in Bazaar");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
         // Check Subversion browse
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
+		$this->selectFrame("id=scmsvn_iframe");
 		$this->assertTextPresent("trunk");
 		$this->assertTextPresent("Init");
 		$this->assertTextPresent("Modifying file in Subversion");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 
         // Check Git browse
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
+		$this->selectFrame("id=scmgit_iframe");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 		$this->clickAndWait("link=projecta.git");
 		$this->assertTextPresent("Modifying file in Git");
 		$this->assertTextPresent("Adding file in Git");
-        $this->selectFrame("relative=top");
+		$this->selectFrame("relative=top");
 }
 
 	/**
diff --git a/tests/func/60_PluginsBlocks/blocksTest.php b/tests/func/60_PluginsBlocks/blocksTest.php
index 3c882b0..58a74cd 100644
--- a/tests/func/60_PluginsBlocks/blocksTest.php
+++ b/tests/func/60_PluginsBlocks/blocksTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2010 Alcatel-Lucent
  *
  * This file is part of FusionForge.
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -45,55 +45,55 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class UserBlocks extends FForge_SeleniumTestCase
 {
-  protected $alreadyActive = 0;
+	protected $alreadyActive = 0;
 
-  function testUserBlocks()
-  {
-  	$this->_activateBlocksPlugin();
+	function testUserBlocks()
+	{
+		$this->_activateBlocksPlugin();
 
-    $this->populateStandardTemplate('empty');
-    $this->init();
+		$this->populateStandardTemplate('empty');
+		$this->init();
 
-    $this->click("link=Admin");
-    $this->waitForPageToLoad("30000");
-    $this->click("link=Tools");
-    $this->waitForPageToLoad("30000");
-    $this->click("use_blocks");
-    $this->click("submit");
-    $this->waitForPageToLoad("30000");
-    $this->assertTrue($this->isTextPresent("Project information updated"));
-    $this->click("link=Blocks Admin");
-    $this->waitForPageToLoad("30000");
-    $this->click("activate[summary_description]");
-//    $this->click("activate[summary_right]");
-    $this->click("//input[@value='Save Blocks']");
-    $this->waitForPageToLoad("30000");
+		$this->click("link=Admin");
+		$this->waitForPageToLoad("30000");
+		$this->click("link=Tools");
+		$this->waitForPageToLoad("30000");
+		$this->click("use_blocks");
+		$this->click("submit");
+		$this->waitForPageToLoad("30000");
+		$this->assertTrue($this->isTextPresent("Project information updated"));
+		$this->click("link=Blocks Admin");
+		$this->waitForPageToLoad("30000");
+		$this->click("activate[summary_description]");
+	//    $this->click("activate[summary_right]");
+		$this->click("//input[@value='Save Blocks']");
+		$this->waitForPageToLoad("30000");
 
-    $this->open("/plugins/blocks/index.php?id=7&type=admin&pluginname=blocks");
-    $this->click("link=Configure");
-    $this->waitForPageToLoad("30000");
-    $this->type("body", "This is my nice block.");
-    $this->click("//input[@value='Save']");
-    $this->waitForPageToLoad("30000");
-//    $this->click("//div[@id='maindiv']/form/table/tbody/tr[2]/td[4]/a");
-//    $this->waitForPageToLoad("30000");
-//    $this->type("body", "{boxTop Project}\nThis is the summary block.\n{boxBottom}");
-//    $this->click("//input[@value='Save']");
-//    $this->waitForPageToLoad("30000");
-    $this->click("link=Summary");
-    $this->waitForPageToLoad("30000");
-//    $this->assertText("//td[@id='main']/table[1]/tbody/tr/td[1]", "This is my nice block.");
-//    $this->assertEquals("This is the summary block.", $this->getText("//td[@id='main']/table[1]/tbody/tr/td[2]/table[1]/tbody/tr[2]/td"));
-	$this->assertTrue($this->isTextPresent("This is my nice block."));
-//	$this->assertTrue($this->isTextPresent("This is the summary block."));
-  }
+		$this->open("/plugins/blocks/index.php?id=7&type=admin&pluginname=blocks");
+		$this->click("link=Configure");
+		$this->waitForPageToLoad("30000");
+		$this->type("body", "This is my nice block.");
+		$this->click("//input[@value='Save']");
+		$this->waitForPageToLoad("30000");
+	//    $this->click("//div[@id='maindiv']/form/table/tbody/tr[2]/td[4]/a");
+	//    $this->waitForPageToLoad("30000");
+	//    $this->type("body", "{boxTop Project}\nThis is the summary block.\n{boxBottom}");
+	//    $this->click("//input[@value='Save']");
+	//    $this->waitForPageToLoad("30000");
+		$this->click("link=Summary");
+		$this->waitForPageToLoad("30000");
+	//    $this->assertText("//td[@id='main']/table[1]/tbody/tr/td[1]", "This is my nice block.");
+	//    $this->assertEquals("This is the summary block.", $this->getText("//td[@id='main']/table[1]/tbody/tr/td[2]/table[1]/tbody/tr[2]/td"));
+		$this->assertTrue($this->isTextPresent("This is my nice block."));
+	//	$this->assertTrue($this->isTextPresent("This is the summary block."));
+	}
 
-  private function _activateBlocksPlugin() {
-  	if (! $this->alreadyActive) {
-  		$this->activatePlugin('blocks');
-		$this->alreadyActive = 1;
-  	}
-  }
+	private function _activateBlocksPlugin() {
+		if (! $this->alreadyActive) {
+			$this->activatePlugin('blocks');
+			$this->alreadyActive = 1;
+		}
+	}
 }
 
 // Local Variables:
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index 6d3dbd6..d8b8c6a 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright 2012, Roland Mas
  *
  * This file is part of FusionForge.
@@ -24,16 +24,16 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 class PluginMediawiki extends FForge_SeleniumTestCase
 {
 	protected $alreadyActive = 0;
-	
+
 	function testMediawiki()
 	{
 		$this->skip_on_rpm_installs();
 		$this->skip_on_centos();
 
-        $this->changeConfig("[mediawiki]\nunbreak_frames=yes\n");
+		$this->changeConfig("[mediawiki]\nunbreak_frames=yes\n");
 
 		$this->activatePlugin('mediawiki');
-		
+
 		$this->populateStandardTemplate('empty');
 		$this->init();
 
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 98f401a..0963aea 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright 2012, Roland Mas
  *
  * This file is part of FusionForge.
@@ -24,16 +24,16 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 class PluginMoinMoin extends FForge_SeleniumTestCase
 {
 	protected $alreadyActive = 0;
-	
+
 	function testMoinMoin()
 	{
 		$this->skip_on_rpm_installs();
 		$this->skip_on_centos();
 
-        $this->changeConfig("[moinmoin]\nuse_frame=no\n");
+		$this->changeConfig("[moinmoin]\nuse_frame=no\n");
 
 		$this->activatePlugin('moinmoin');
-		
+
 		$this->populateStandardTemplate('empty');
 		$this->init();
 
diff --git a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
index 8c2befc..0508675 100644
--- a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
+++ b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2010 Alcatel-Lucent
  *
  * This file is part of FusionForge.
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -48,7 +48,7 @@ class ContextualHelp extends FForge_SeleniumTestCase
 	function testContextualHelp()
 	{
 		$this->skip_on_deb_installs();
-		
+
 		$this->init();
 		$this->activatePlugin('online_help');
 		$this->login ('admin');
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index 688fef7..c96f60d 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2014 Roland Mas
  *
  * This file is part of FusionForge.
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- *      
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17,107 +17,106 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */             
+ */
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class SoapTest extends FForge_SeleniumTestCase
 {
-    function setUp() {
-        parent::setUp();
-
-        $this->session = NULL;
-        $this->soapclient = NULL;
-        
-        $this->soapclient = new SoapClient(WSDL_URL,
-        array('cache_wsdl' => WSDL_CACHE_NONE,       
-        'trace' => true));
-        
-        $this->assertNotNull($this->soapclient);
-    }        
-        
+	function setUp() {
+		parent::setUp();
+
+		$this->session = NULL;
+		$this->soapclient = NULL;
+
+		$this->soapclient = new SoapClient(WSDL_URL,
+						array('cache_wsdl' => WSDL_CACHE_NONE,
+							'trace' => true));
+
+		$this->assertNotNull($this->soapclient);
+	}
+
 	function testSoap()
 	{
 		$this->populateStandardTemplate('trackers');
 		$this->init();
 
-        $userid = FORGE_ADMIN_USERNAME;
-        $passwd = FORGE_ADMIN_PASSWORD;
-
-        // Check version number
-        $version = $this->soapclient->version();
-        $this->assertRegexp('/^[-0-9.+a-z]*$/', $version);
-
-        // Check login
-        $response = $this->soapclient->login($userid, $passwd);
-        $this->assertNotNull($response);
-        $this->session = $response;
-
-        // Check logging in with nonexisting user
-        try {
-            $response = $this->soapclient->login('coin', 'pan');
-            $this->fail('An expected exception has not been raised.');
-        }
-        catch (SoapFault $expected) {
-            $this->assertEquals("Unable to log in with userid of coin", $expected->faultstring);
-        }
-        
-        // Check logging in with wrong password
-        try {
-            $response = $this->soapclient->login(FORGE_ADMIN_USERNAME, 'pan');
-            $this->fail('An expected exception has not been raised.');
-        }
-        catch (SoapFault $expected) {
-            $this->assertEquals("Unable to log in with userid of ".FORGE_ADMIN_USERNAME, $expected->faultstring);
-        }
-
-        // Get list of groups with empty parameters
+		$userid = FORGE_ADMIN_USERNAME;
+		$passwd = FORGE_ADMIN_PASSWORD;
+
+		// Check version number
+		$version = $this->soapclient->version();
+		$this->assertRegexp('/^[-0-9.+a-z]*$/', $version);
+
+		// Check login
+		$response = $this->soapclient->login($userid, $passwd);
+		$this->assertNotNull($response);
+		$this->session = $response;
+
+		// Check logging in with nonexisting user
+		try {
+			$response = $this->soapclient->login('coin', 'pan');
+			$this->fail('An expected exception has not been raised.');
+		}
+		catch (SoapFault $expected) {
+			$this->assertEquals("Unable to log in with userid of coin", $expected->faultstring);
+		}
+
+		// Check logging in with wrong password
+		try {
+			$response = $this->soapclient->login(FORGE_ADMIN_USERNAME, 'pan');
+			$this->fail('An expected exception has not been raised.');
+		}
+		catch (SoapFault $expected) {
+			$this->assertEquals("Unable to log in with userid of ".FORGE_ADMIN_USERNAME, $expected->faultstring);
+		}
+
+		// Get list of groups with empty parameters
 		try {
 			$response = $this->soapclient->getGroupsByName($this->session);
-            $this->fail('An expected exception has not been raised. Got response :'.$response);
+			$this->fail('An expected exception has not been raised. Got response :'.$response);
 		}
 		catch (SoapFault $expected) {
 			$this->assertTrue( strpos($expected->faultstring, 'Could Not Get Projects by Name') === 0);
 		}
 
-        // Get one group
-        $response = $this->soapclient->getGroupsByName($this->session,array('projecta'));
-        $group = $response[0];
-        $this->assertEquals('projecta', $group->unix_group_name);
-        $projecta = $group;
-        
-        // Get several groups
-        $response = $this->soapclient->getGroupsByName($this->session,array('tmpl', 'projecta'));
-        foreach ($response as $group) {
-            $response2 = $this->soapclient->getGroups($this->session, array($group->group_id));
-            $group2 = $response2[0];
-            $this->assertEquals($group->group_id, $group2->group_id);
-            $this->assertEquals($group->unix_group_name, $group2->unix_group_name);
-        }
-
-        // Check trackers
-        $trackers = $this->soapclient->getArtifactTypes($this->session, $projecta->group_id);
-        $found = false;
-        foreach ($trackers as $t) {
-            if ($t->name == 'Bugs') {
-                $found = true;
-                $tracker = $t;
-            }
-        }
-        $this->assertTrue($found, "Trackers 'Bugs' not found");
-
-        $response = $this->soapclient->addArtifact($this->session, $projecta->group_id, $tracker->group_artifact_id, 1, 3, 100, "Bug submitted by SOAP", "Bug details are not really relevant here", array());
+		// Get one group
+		$response = $this->soapclient->getGroupsByName($this->session,array('projecta'));
+		$group = $response[0];
+		$this->assertEquals('projecta', $group->unix_group_name);
+		$projecta = $group;
+
+		// Get several groups
+		$response = $this->soapclient->getGroupsByName($this->session,array('tmpl', 'projecta'));
+		foreach ($response as $group) {
+			$response2 = $this->soapclient->getGroups($this->session, array($group->group_id));
+			$group2 = $response2[0];
+			$this->assertEquals($group->group_id, $group2->group_id);
+			$this->assertEquals($group->unix_group_name, $group2->unix_group_name);
+		}
+
+		// Check trackers
+		$trackers = $this->soapclient->getArtifactTypes($this->session, $projecta->group_id);
+		$found = false;
+		foreach ($trackers as $t) {
+			if ($t->name == 'Bugs') {
+				$found = true;
+				$tracker = $t;
+			}
+		}
+		$this->assertTrue($found, "Trackers 'Bugs' not found");
+
+		$response = $this->soapclient->addArtifact($this->session, $projecta->group_id, $tracker->group_artifact_id, 1, 3, 100, "Bug submitted by SOAP", "Bug details are not really relevant here", array());
 
 		$this->clickAndWait("link=Tracker");
 		$this->clickAndWait("link=Bugs");
 		$this->assertTrue($this->isTextPresent("Bug submitted by SOAP"));
 		$this->clickAndWait("link=Bug submitted by SOAP");
-        $this->type("summary", 'Bug summary edited via web interface');
+		$this->type("summary", 'Bug summary edited via web interface');
 		$this->clickAndWait("submit");
 
-        $bugs = $this->soapclient->getArtifacts($this->session, $projecta->group_id, $tracker->group_artifact_id, 0, 0);
-        $bug = $bugs[0];
-        $this->assertEquals('Bug summary edited via web interface', $bug->summary);
+		$bugs = $this->soapclient->getArtifacts($this->session, $projecta->group_id, $tracker->group_artifact_id, 0, 0);
+		$bug = $bugs[0];
+		$this->assertEquals('Bug summary edited via web interface', $bug->summary);
 	}
 }
-?>
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index f0135cf..1f79c91 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2007-2008 Alain Peyrat <aljeux at free dot fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  * Copyright 2013, Franck Villaume - TrivialDev
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
+/**
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
  * "The test suite ("Contribution") has not been tested and/or
@@ -77,13 +77,13 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->screenshotBgColor = '#CCFFDD';
 	}
 
-    protected function changeConfig($text) {
-            $forge_get_config = RUN_JOB_PATH."/forge_get_config";
-            $config_path = rtrim(`$forge_get_config config_path`);
-            $classname = get_class($this);
-            file_put_contents("$config_path/config.ini.d/zzz-buildbot-$classname.ini",
-                              $text);
-    }
+	protected function changeConfig($text) {
+		$forge_get_config = RUN_JOB_PATH."/forge_get_config";
+		$config_path = rtrim(`$forge_get_config config_path`);
+		$classname = get_class($this);
+		file_put_contents("$config_path/config.ini.d/zzz-buildbot-$classname.ini",
+				$text);
+	}
 
 	/**
 	 * Method that is called after Selenium actions.
@@ -486,7 +486,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 	}
 
 	protected function skip_test($msg) {
-		$this->captureScreenshotOnFailure = false; 
+		$this->captureScreenshotOnFailure = false;
 		$this->markTestSkipped($msg);
 	}
 
diff --git a/tests/func/Testing/SeleniumRemoteSuite.php b/tests/func/Testing/SeleniumRemoteSuite.php
index 69af1e0..1d30c72 100644
--- a/tests/func/Testing/SeleniumRemoteSuite.php
+++ b/tests/func/Testing/SeleniumRemoteSuite.php
@@ -1,4 +1,21 @@
 <?php
+/**
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 // The next require_once is just to get HOST
 $config = getenv('CONFIG_PHP') ? getenv('CONFIG_PHP'): 'func/config.php';

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

Summary of changes:
 tests/func/10_Site/loginTest.php                   |    6 +-
 tests/func/10_Site/projectsTest.php                |    2 +-
 tests/func/10_Site/topTest.php                     |   58 +++----
 tests/func/10_Site/troveTest.php                   |    2 +-
 tests/func/20_Docs/createDocURLTest.php            |    4 +-
 tests/func/20_Forums/forumsTest.php                |   10 +-
 tests/func/20_News/newsTest.php                    |    8 +-
 tests/func/20_Surveys/surveysTest.php              |    4 +-
 tests/func/20_Tasks/createTaskTest.php             |    4 +-
 tests/func/20_Trackers/relationTest.php            |    4 +-
 tests/func/20_Trackers/trackersTest.php            |    4 +-
 tests/func/20_Trackers/workflowTest.php            |    4 +-
 tests/func/30_Search/searchTest.php                |    1 -
 tests/func/40_SSH/sshTest.php                      |    8 +-
 tests/func/50_PluginsScmBzr/bzrTest.php            |   25 ++-
 tests/func/50_PluginsScmGit/gitSSHTest.php         |   10 +-
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php   |   28 ++--
 tests/func/50_PluginsScmGit/gitWUITest.php         |   18 +--
 tests/func/50_PluginsScmSvn/svnSSHTest.php         |   14 +-
 tests/func/50_PluginsScmSvn/svnWUITest.php         |   12 +-
 tests/func/50_PluginsScmSvn/svnWebDAVTest.php      |   32 ++--
 tests/func/55_PluginsScmMulti/multiSCMTest.php     |   22 +--
 tests/func/60_PluginsBlocks/blocksTest.php         |   92 +++++------
 tests/func/60_PluginsMediawiki/mediawikiTest.php   |    8 +-
 tests/func/60_PluginsMoinMoin/moinmoinTest.php     |    8 +-
 .../60_PluginsOnlineHelp/contextualHelpTest.php    |    6 +-
 tests/func/70_SOAP/soapTest.php                    |  159 ++++++++++----------
 tests/func/Testing/SeleniumForge.php               |   20 +--
 tests/func/Testing/SeleniumRemoteSuite.php         |   17 +++
 29 files changed, 301 insertions(+), 289 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list