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 5aed90bb3165c1ee18832239a0db13b3e7f8e9f7 (commit)
via a445f9b56499e94acba1599a92a84f1a3ee747d2 (commit)
via 337381df8c706be0dc3ab1cd2ed92062b47e1a6a (commit)
via d88b99d756d4094ac6d0a68bb6f729dca3ebac8b (commit)
from 300158ba2e380ac16ce445f208f2814298a6ab8e (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=5aed90bb3165c1ee18832239a0db13b3e7f8e9f7
commit 5aed90bb3165c1ee18832239a0db13b3e7f8e9f7
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 12:26:06 2015 +0200
testsuite: remove unused config.php (+ cf. generation phpunit-selenium.sh)
diff --git a/tests/func/config.php.buildbot b/tests/func/config.php.buildbot
deleted file mode 100644
index de354f3..0000000
--- a/tests/func/config.php.buildbot
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- *
- * Running the test suite will drop your current database, this is
- * to be used only on test environment.
- *
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- */
-
-// Host where selenium-rc is running
-define ('SELENIUM_RC_HOST', getenv('SELENIUM_RC_HOST'));
-define ('SELENIUM_RC_DIR', getenv('SELENIUM_RC_DIR'));
-
-// The forge's hostname
-define ('HOST', getenv('HOST'));
-
-// Base URL where FusionForge is installed
-define ('ROOT', '');
-
-// Database connection parameters.
-define('DB_NAME', getenv('DB_NAME'));
-define('DB_USER', 'gforge');
-define('DB_PASSWORD', '@@FFDB_PASS@@');
-define('DB_INIT_CMD', "ssh root@".HOST." '/root/tests/func/db_reload.sh
".DB_NAME." >/dev/null;'");
-
-// this should be an existing user of the forge together with its password
-define ('FORGE_ADMIN_USERNAME', 'admin');
-define ('FORGE_ADMIN_PASSWORD', 'myadmin');
-define ('FORGE_OTHER_PASSWORD', 'myotherpass');
-
-// Where CLI is installed
-define ('CLI_CMD', '/opt/gforge/acde/tools/gforge-cli/gforge.php');
-
-// Where Java CLI is installed
-define ('JAGOSI_CMD', '/opt/gforge/acde/tools/gforge-java-cli/');
-
-// Enter true when file is configured.
-define('CONFIGURED', getenv('CONFIGURED'));
-
-//
-// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
-//
-
-// These are deduced from the previous definitions.
-
-// URL to access the application
-define ('URL', 'http://'.HOST.'/');
-
-// WSDL of the forges SOAP API
-define ('WSDL_URL', URL.'soap/index.php?wsdl');
-?>
diff --git a/tests/func/config.php.ffsandbox b/tests/func/config.php.ffsandbox
deleted file mode 100644
index d2138c3..0000000
--- a/tests/func/config.php.ffsandbox
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/*
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- *
- * Running the test suite will drop your current database, this is
- * to be used only on test environment.
- *
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- */
-
-// Host where selenium-rc is running
-define ('SELENIUM_RC_HOST', 'localhost');
-define ('SELENIUM_RC_DIR', '/tmp/');
-
-// The forge's hostname
-define ('HOST', 'forge.local');
-
-// Base URL where FusionForge is installed
-define ('ROOT', '');
-
-// Database connection parameters.
-define('DB_NAME', getenv('DB_NAME'));
-define('DB_INIT_CMD', "/root/scripts/reload-db.sh > /dev/null 2> /dev/null");
-
-// this should be an existing user of the forge together with its password
-define ('FORGE_ADMIN_USERNAME', 'admin');
-define ('FORGE_ADMIN_PASSWORD', 'myadmin');
-define ('FORGE_OTHER_PASSWORD', 'myotherpass');
-
-// Where CLI is installed
-define ('CLI_CMD', '/opt/gforge/acde/tools/gforge-cli/gforge.php');
-
-// Where Java CLI is installed
-define ('JAGOSI_CMD', '/opt/gforge/acde/tools/gforge-java-cli/');
-
-// Enter true when file is configured.
-define('CONFIGURED', getenv('CONFIGURED'));
-
-//
-// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
-//
-
-// These are deduced from the previous definitions.
-
-// URL to access the application
-define ('URL', 'http://'.HOST.'/');
-
-// WSDL of the forges SOAP API
-define ('WSDL_URL', URL.'soap/index.php?wsdl');
-?>
diff --git a/tests/func/config.php.sample b/tests/func/config.php.sample
deleted file mode 100644
index 80fc53c..0000000
--- a/tests/func/config.php.sample
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- *
- * Running the test suite will drop your current database, this is
- * to be used only on test environment.
- *
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- */
-
-// Host where selenium-rc is running
-define ('SELENIUM_RC_HOST', 'localhost');
-define ('SELENIUM_RC_DIR', 'D:');
-
-// The forge's hostname
-define ('HOST', 'centos52.local');
-
-// Base URL where FusionForge is installed
-define ('ROOT', '');
-
-// Database connection parameters.
-define('DB_NAME', 'fforge');
-define('DB_USER', 'gforge');
-define('DB_PASSWORD', '@@FFDB_PASS@@');
-define('DB_INIT_CMD', 'php '.dirname(__FILE__).'/db_reload.php');
-
-// this should be an existing user of the forge together with its password
-define ('FORGE_ADMIN_USERNAME', 'admin');
-define ('FORGE_ADMIN_PASSWORD', 'xxxxx');
-define ('FORGE_OTHER_PASSWORD', 'yyyyy');
-
-// Enter true when file is configured.
-define('CONFIGURED', false);
-
-//
-// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
-//
-
-// These are deduced from the previous definitions.
-
-// URL to access the application
-define ('URL', 'http://'.HOST.'/');
-
-// WSDL of the forges SOAP API
-define ('WSDL_URL', URL.'soap/index.php?wsdl');
-?>
diff --git a/tests/func/config.php.tests b/tests/func/config.php.tests
deleted file mode 100644
index 013eef6..0000000
--- a/tests/func/config.php.tests
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- *
- * Running the test suite will drop your current database, this is
- * to be used only on test environment.
- *
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- * DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER DANGER
- */
-
-// Host where selenium-rc is running
-define ('SELENIUM_RC_HOST', '192.168.0.204');
-
-// The forge's hostname
-define ('HOST', getenv('HOST'));
-
-// URL to access the application
-define ('URL', 'http://centos52.local/');
-
-// Base URL where FusionForge is installed
-define ('ROOT', '');
-
-// Database connection parameters.
-define('DB_NAME', 'fforge');
-define('DB_USER', 'gforge');
-define('DB_PASSWORD', '@@FFDB_PASS@@');
-define('DB_INIT_CMD', "ssh root@centos52 'cd /opt/tests/func 2>/dev/null || cd
/usr/share/tests/func; php db_reload.php'");
-
-// Enter true when file is configured.
-define('CONFIGURED', true);
-?>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a445f9b56499e94acba1599a92a84f1a3ee747d2
commit a445f9b56499e94acba1599a92a84f1a3ee747d2
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 12:23:00 2015 +0200
testsuite: unnoisify output
diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php
b/tests/func/50_PluginsScmGit/gitSSHTest.php
index e74e4bb..20483e9 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -82,19 +82,4 @@ class ScmGitSSHTest extends FForge_SeleniumTestCase
system("rm -fr $t");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-?>
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 308e193..f6aa7a2 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -162,19 +162,4 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
system("rm -fr $t");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-?>
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php
b/tests/func/50_PluginsScmGit/gitWUITest.php
index c256ef6..66e72d0 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -94,19 +94,4 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
$this->selectFrame("relative=top");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-?>
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php
b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index f1320f5..5009818 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -76,19 +76,4 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
system("rm -fr $t");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-?>
diff --git a/tests/func/50_PluginsScmSvn/svnWUITest.php
b/tests/func/50_PluginsScmSvn/svnWUITest.php
index cdbf0da..515841c 100644
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@ -53,19 +53,4 @@ class ScmSvnWUITest extends FForge_SeleniumTestCase
$this->assertTextPresent("Init");
$this->selectFrame("relative=top");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-?>
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 17b893a..df2fd0e 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -76,23 +76,4 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
system("rm -fr $t");
}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
- }
-
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php
b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index ec1d7d0..91043b1 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -147,20 +147,5 @@ class multiSCMTest extends FForge_SeleniumTestCase
$this->assertTextPresent("Modifying file in Git");
$this->assertTextPresent("Adding file in Git");
$this->selectFrame("relative=top");
-}
-
- /**
- * Method that is called after Selenium actions.
- *
- * @param string $action
- */
- protected function defaultAssertions($action)
- {
- if ($action == 'waitForPageToLoad') {
- $this->assertTrue($this->isElementPresent("//h1")
- ||
$this->isElementPresent("//.[@class='page_footer']"));
- }
}
-
}
-?>
diff --git a/tests/func/60_PluginsMessage/messageTest.php
b/tests/func/60_PluginsMessage/messageTest.php
index 6b09530..3385afa 100644
--- a/tests/func/60_PluginsMessage/messageTest.php
+++ b/tests/func/60_PluginsMessage/messageTest.php
@@ -19,28 +19,6 @@
* 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
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class MessageTest extends FForge_SeleniumTestCase
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=337381df8c706be0dc3ab1cd2ed92062b47e1a6a
commit 337381df8c706be0dc3ab1cd2ed92062b47e1a6a
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 12:11:57 2015 +0200
testsuite: use fixture in all plugin tests
diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php
b/tests/func/50_PluginsScmBzr/bzrTest.php
index d8d5ac9..f10caec 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -29,14 +29,15 @@ function mysystem($cmd, &$ret=null) {
class ScmBzrTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
function testScmBzr()
{
$this->skip_on_rpm_installs();
$this->skip_on_src_installs();
+ $this->loadAndCacheFixture();
+
$this->activatePlugin('scmbzr');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php
b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index 8883c87..f1320f5 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -23,13 +23,15 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class ScmSvnSSHTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnSSH()
{
$this->changeConfig("[scmsvn]\nuse_ssh = yes\nuse_dav = no\n");
+ $this->loadAndCacheFixture();
+
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/50_PluginsScmSvn/svnWUITest.php
b/tests/func/50_PluginsScmSvn/svnWUITest.php
index b4744c4..cdbf0da 100644
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@ -23,13 +23,15 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class ScmSvnWUITest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnWUI()
{
+ $this->loadAndCacheFixture();
+
$this->changeConfig("[scmsvn]\nuse_ssh = no\nuse_dav = yes\n");
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 8342071..17b893a 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -23,13 +23,15 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnWebDAV()
{
+ $this->loadAndCacheFixture();
+
$this->changeConfig("[scmsvn]\nuse_ssl = no\n");
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php
b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index c2aa0a7..ec1d7d0 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -23,18 +23,20 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class multiSCMTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testMultiSCM()
{
$this->skip_on_rpm_installs();
$this->skip_on_src_installs();
+ $this->loadAndCacheFixture();
+
$this->changeConfig("[core]\nallow_multiple_scm = yes\n");
$this->activatePlugin('scmsvn');
$this->activatePlugin('scmgit');
$this->activatePlugin('scmbzr');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php
b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index 5f55329..00590ea 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -24,19 +24,20 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class PluginMediawiki extends FForge_SeleniumTestCase
{
protected $alreadyActive = 0;
+ public $fixture = 'projecta';
function testMediawiki()
{
$this->skip_on_rpm_installs();
$this->skip_on_centos();
+ $this->loadAndCacheFixture();
+
$this->changeConfig("[mediawiki]\nunbreak_frames=yes\n");
$this->activatePlugin('mediawiki');
- $this->populateStandardTemplate('empty');
- $this->init();
-
+ $this->gotoProject('ProjectA');
$this->clickAndWait("link=Admin");
$this->clickAndWait("link=Tools");
$this->click("use_mediawiki");
diff --git a/tests/func/60_PluginsMessage/messageTest.php
b/tests/func/60_PluginsMessage/messageTest.php
index 86096ab..6b09530 100644
--- a/tests/func/60_PluginsMessage/messageTest.php
+++ b/tests/func/60_PluginsMessage/messageTest.php
@@ -51,8 +51,6 @@ class MessageTest extends FForge_SeleniumTestCase
{
$this->_activateMessagePlugin();
- $this->init();
-
$this->clickAndWait("link=Site Admin");
$this->clickAndWait("link=Configure Global Message");
$this->type("//textarea[@name='body']", "Forge under
maintenance, please bear with us.");
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 893fb9d..47bb42d 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -38,7 +38,6 @@ class PluginMoinMoin extends FForge_SeleniumTestCase
$this->activatePlugin('moinmoin');
$this->gotoProject('ProjectA');
-
$this->clickAndWait("link=Admin");
$this->clickAndWait("link=Tools");
$this->click("use_moinmoin");
diff --git a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
index 0508675..fd89940 100644
--- a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
+++ b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
@@ -45,11 +45,14 @@ require_once
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
class ContextualHelp extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testContextualHelp()
{
$this->skip_on_deb_installs();
- $this->init();
+ $this->loadAndCacheFixture();
+
$this->activatePlugin('online_help');
$this->login ('admin');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d88b99d756d4094ac6d0a68bb6f729dca3ebac8b
commit d88b99d756d4094ac6d0a68bb6f729dca3ebac8b
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 12:00:39 2015 +0200
testsuite: simplify fixture loading
diff --git a/tests/func/Testing/SeleniumForge.php
b/tests/func/Testing/SeleniumForge.php
index e072acf..888f730 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -111,7 +111,6 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
passthru("$base_cmd base", $ret); ob_flush();
require(dirname(dirname(__FILE__))."/fixtures/{$this->fixture}.php");
- call_user_func("fixture_{$this->fixture}", $this);
$this->fixture_loaded = true;
passthru("$base_cmd --backup {$this->fixture}", $ret);
ob_flush();
diff --git a/tests/func/fixtures/projecta.php b/tests/func/fixtures/projecta.php
index 9953459..60fb227 100644
--- a/tests/func/fixtures/projecta.php
+++ b/tests/func/fixtures/projecta.php
@@ -19,7 +19,5 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-function fixture_projecta($test) {
- $test->populateStandardTemplate('all');
- $test->createProject('ProjectA');
-}
+$this->populateStandardTemplate('all');
+$this->createProject('ProjectA');
-----------------------------------------------------------------------
Summary of changes:
tests/func/50_PluginsScmBzr/bzrTest.php | 5 +-
tests/func/50_PluginsScmGit/gitSSHTest.php | 15 ------
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 15 ------
tests/func/50_PluginsScmGit/gitWUITest.php | 15 ------
tests/func/50_PluginsScmSvn/svnSSHTest.php | 21 ++-------
tests/func/50_PluginsScmSvn/svnWUITest.php | 21 ++-------
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 25 ++--------
tests/func/55_PluginsScmMulti/multiSCMTest.php | 21 ++-------
tests/func/60_PluginsMediawiki/mediawikiTest.php | 7 +--
tests/func/60_PluginsMessage/messageTest.php | 24 ----------
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 1 -
.../60_PluginsOnlineHelp/contextualHelpTest.php | 5 +-
tests/func/Testing/SeleniumForge.php | 1 -
tests/func/config.php.buildbot | 54 ----------------------
tests/func/config.php.ffsandbox | 52 ---------------------
tests/func/config.php.sample | 48 -------------------
tests/func/config.php.tests | 33 -------------
tests/func/fixtures/projecta.php | 6 +--
18 files changed, 29 insertions(+), 340 deletions(-)
delete mode 100644 tests/func/config.php.buildbot
delete mode 100644 tests/func/config.php.ffsandbox
delete mode 100644 tests/func/config.php.sample
delete mode 100644 tests/func/config.php.tests
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
