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, 6.0 has been updated
via 8f8ae0edcdd668603ffa08c631c2fc7115685156 (commit)
from 1674217917d9e80b559dfa566386a81a046940ed (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8f8ae0edcdd668603ffa08c631c2fc7115685156
commit 8f8ae0edcdd668603ffa08c631c2fc7115685156
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 17:08:40 2015 +0200
testsuite: move up SeleniumForge.php for clarity
diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index 3c59240..1c338f7 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class LoginProcess extends FForge_SeleniumTestCase
{
diff --git a/tests/func/10_Site/projectsTest.php
b/tests/func/10_Site/projectsTest.php
index 812b126..b24bd41 100644
--- a/tests/func/10_Site/projectsTest.php
+++ b/tests/func/10_Site/projectsTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateProject extends FForge_SeleniumTestCase
{
diff --git a/tests/func/10_Site/topTest.php b/tests/func/10_Site/topTest.php
index a53e006..3d36cbf 100644
--- a/tests/func/10_Site/topTest.php
+++ b/tests/func/10_Site/topTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class TopTester extends FForge_SeleniumTestCase
{
diff --git a/tests/func/10_Site/troveTest.php b/tests/func/10_Site/troveTest.php
index ac98b15..57480f1 100644
--- a/tests/func/10_Site/troveTest.php
+++ b/tests/func/10_Site/troveTest.php
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class Trove extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Docs/createDocURLTest.php
b/tests/func/20_Docs/createDocURLTest.php
index c9cb5a1..3cc3c02 100644
--- a/tests/func/20_Docs/createDocURLTest.php
+++ b/tests/func/20_Docs/createDocURLTest.php
@@ -44,7 +44,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateDocURL extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_FRS/FRSTest.php b/tests/func/20_FRS/FRSTest.php
index 37cf886..9968320 100644
--- a/tests/func/20_FRS/FRSTest.php
+++ b/tests/func/20_FRS/FRSTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateFRS extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Forums/forumsTest.php
b/tests/func/20_Forums/forumsTest.php
index f68fc62..b3d8058 100644
--- a/tests/func/20_Forums/forumsTest.php
+++ b/tests/func/20_Forums/forumsTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateForum extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_News/newsTest.php b/tests/func/20_News/newsTest.php
index a5b1bc1..8179779 100644
--- a/tests/func/20_News/newsTest.php
+++ b/tests/func/20_News/newsTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateNews extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Surveys/surveysTest.php
b/tests/func/20_Surveys/surveysTest.php
index a44f2a6..bd7472d 100644
--- a/tests/func/20_Surveys/surveysTest.php
+++ b/tests/func/20_Surveys/surveysTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class Surveys extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Tasks/createTaskTest.php
b/tests/func/20_Tasks/createTaskTest.php
index b2a45f0..b08883e 100644
--- a/tests/func/20_Tasks/createTaskTest.php
+++ b/tests/func/20_Tasks/createTaskTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateTask extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Trackers/relationTest.php
b/tests/func/20_Trackers/relationTest.php
index f1e1247..e6d825d 100644
--- a/tests/func/20_Trackers/relationTest.php
+++ b/tests/func/20_Trackers/relationTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateTrackerRelation extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Trackers/trackersTest.php
b/tests/func/20_Trackers/trackersTest.php
index 9760bb0..df9e7f0 100644
--- a/tests/func/20_Trackers/trackersTest.php
+++ b/tests/func/20_Trackers/trackersTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateTracker extends FForge_SeleniumTestCase
{
diff --git a/tests/func/20_Trackers/workflowTest.php
b/tests/func/20_Trackers/workflowTest.php
index 2cdbafd..82674d0 100644
--- a/tests/func/20_Trackers/workflowTest.php
+++ b/tests/func/20_Trackers/workflowTest.php
@@ -43,7 +43,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class CreateTrackerWorkflow extends FForge_SeleniumTestCase
{
diff --git a/tests/func/30_RBAC/rbacTest.php b/tests/func/30_RBAC/rbacTest.php
index 4606e8d..a1947a4 100644
--- a/tests/func/30_RBAC/rbacTest.php
+++ b/tests/func/30_RBAC/rbacTest.php
@@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class RBAC extends FForge_SeleniumTestCase
{
diff --git a/tests/func/30_Search/searchTest.php
b/tests/func/30_Search/searchTest.php
index 2cd337d..2637255 100644
--- a/tests/func/30_Search/searchTest.php
+++ b/tests/func/30_Search/searchTest.php
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class Search extends FForge_SeleniumTestCase
{
diff --git a/tests/func/40_SSH/sshTest.php b/tests/func/40_SSH/sshTest.php
index 84ca5f5..e24e462 100644
--- a/tests/func/40_SSH/sshTest.php
+++ b/tests/func/40_SSH/sshTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class SSHTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php
b/tests/func/50_PluginsScmBzr/bzrTest.php
index 4922fa3..258f7ff 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
function mysystem($cmd, &$ret=null) {
print "Running: $cmd\n";
diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php
b/tests/func/50_PluginsScmGit/gitSSHTest.php
index 5324846..e1a5aa5 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmGitSSHTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index a8695f4..8b1265c 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php
b/tests/func/50_PluginsScmGit/gitWUITest.php
index 4d70a45..18416f4 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmGitWUITest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php
b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index ea563fd..8ccf05a 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmSvnSSHTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmSvn/svnWUITest.php
b/tests/func/50_PluginsScmSvn/svnWUITest.php
index 4cef4fb..b6bac36 100644
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmSvnWUITest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index e026c62..9fc8c66 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php
b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index faf35cb..88bb130 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class multiSCMTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/60_PluginsBlocks/blocksTest.php
b/tests/func/60_PluginsBlocks/blocksTest.php
index ee66d8d..08f31e0 100644
--- a/tests/func/60_PluginsBlocks/blocksTest.php
+++ b/tests/func/60_PluginsBlocks/blocksTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class UserBlocks extends FForge_SeleniumTestCase
{
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php
b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index c4290b7..fd9b258 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class PluginMediawiki extends FForge_SeleniumTestCase
{
diff --git a/tests/func/60_PluginsMessage/messageTest.php
b/tests/func/60_PluginsMessage/messageTest.php
index 3385afa..6e799a9 100644
--- a/tests/func/60_PluginsMessage/messageTest.php
+++ b/tests/func/60_PluginsMessage/messageTest.php
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class MessageTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index e8673be..266e1c9 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class PluginMoinMoin extends FForge_SeleniumTestCase
{
diff --git a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
index 4296184..d6a56f0 100644
--- a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
+++ b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
@@ -42,7 +42,7 @@
* ALONE BASIS."
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class ContextualHelp extends FForge_SeleniumTestCase
{
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index f492785..f94bf0d 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
+require_once dirname(dirname(__FILE__)).'/SeleniumForge.php';
class SoapTest extends FForge_SeleniumTestCase
{
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index b8f60b5..3a5dc23 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -82,7 +82,7 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
*/
public function loadCachedFixture() {
$this->fixture_loaded = false;
- $base_cmd = dirname(dirname(__FILE__))."/db_reload.sh";
+ $base_cmd = dirname(__FILE__)."/db_reload.sh";
$ret = 0;
passthru("$base_cmd --exists {$this->fixture}", $ret);
ob_flush();
if ($ret != 0) {
@@ -107,11 +107,11 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
*/
public function loadAndCacheFixture() {
if (!$this->fixture_loaded) {
- $base_cmd = dirname(dirname(__FILE__))."/db_reload.sh";
+ $base_cmd = dirname(__FILE__)."/db_reload.sh";
$ret = 0;
passthru("$base_cmd base", $ret); ob_flush();
-
require(dirname(dirname(__FILE__))."/fixtures/{$this->fixture}.php");
+
require(dirname(__FILE__)."/fixtures/{$this->fixture}.php");
$this->logout();
$this->fixture_loaded = true;
-----------------------------------------------------------------------
Summary of changes:
tests/func/10_Site/loginTest.php | 2 +-
tests/func/10_Site/projectsTest.php | 2 +-
tests/func/10_Site/topTest.php | 2 +-
tests/func/10_Site/troveTest.php | 2 +-
tests/func/20_Docs/createDocURLTest.php | 2 +-
tests/func/20_FRS/FRSTest.php | 2 +-
tests/func/20_Forums/forumsTest.php | 2 +-
tests/func/20_News/newsTest.php | 2 +-
tests/func/20_Surveys/surveysTest.php | 2 +-
tests/func/20_Tasks/createTaskTest.php | 2 +-
tests/func/20_Trackers/relationTest.php | 2 +-
tests/func/20_Trackers/trackersTest.php | 2 +-
tests/func/20_Trackers/workflowTest.php | 2 +-
tests/func/30_RBAC/rbacTest.php | 2 +-
tests/func/30_Search/searchTest.php | 2 +-
tests/func/40_SSH/sshTest.php | 2 +-
tests/func/50_PluginsScmBzr/bzrTest.php | 2 +-
tests/func/50_PluginsScmGit/gitSSHTest.php | 2 +-
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 2 +-
tests/func/50_PluginsScmGit/gitWUITest.php | 2 +-
tests/func/50_PluginsScmSvn/svnSSHTest.php | 2 +-
tests/func/50_PluginsScmSvn/svnWUITest.php | 2 +-
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 2 +-
tests/func/55_PluginsScmMulti/multiSCMTest.php | 2 +-
tests/func/60_PluginsBlocks/blocksTest.php | 2 +-
tests/func/60_PluginsMediawiki/mediawikiTest.php | 2 +-
tests/func/60_PluginsMessage/messageTest.php | 2 +-
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 2 +-
tests/func/60_PluginsOnlineHelp/contextualHelpTest.php | 2 +-
tests/func/70_SOAP/soapTest.php | 2 +-
tests/func/SeleniumForge.php | 6 +++---
31 files changed, 33 insertions(+), 33 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits