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.1 has been updated
via a822fd8908c0eb3d424b4ab41add3ff266dc8601 (commit)
from a34f1daff3a4a4e547e456eec85463682a22d13d (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=a822fd8908c0eb3d424b4ab41add3ff266dc8601
commit a822fd8908c0eb3d424b4ab41add3ff266dc8601
Author: Roland Mas <[email protected]>
Date: Thu Dec 3 16:15:13 2020 +0100
Try fixing testsuite
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index 4261cff..68f4e02 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -26,7 +26,7 @@ class SoapTest extends FForge_SeleniumTestCase
{
public $fixture = 'projecta';
- function setUp() {
+ protected function setUp():void {
parent::setUp();
$this->session = NULL;
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 185d549..dcc70cc 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -85,20 +85,15 @@ define('FORGE_OTHER_PASSWORD', 'toto_Tata8');
$config = dirname(__FILE__).'/config.php';
require_once $config;
-if (@include_once '/usr/local/share/php/vendor/autoload.php') {
- class PHPUnit_Extensions_SeleniumTestCase extends
PHPUnit_Extensions_Selenium2TestCase {}
-} else {
- require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
-}
-
+@include_once '/usr/local/share/php/vendor/autoload.php'
-class FForge_SeleniumTestCase extends PHPUnit_Extensions_Selenium2TestCase
+class FForge_SeleniumTestCase extends PHPUnit\Extensions\Selenium2TestCase
{
public $logged_in = false ;
public $fixture = 'base';
public $fixture_loaded = false;
-
- public function setUp() {
+
+ protected function setUp():void {
$this->configureSelenium();
$this->loadCachedFixture();
}
@@ -109,7 +104,7 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_Selenium2TestCase
$this->screenshotPath = getenv('SELENIUM_RC_DIR');
$this->screenshotUrl = getenv('SELENIUM_RC_URL');
}
-
+
$this->setBrowser('firefox');
$capabilities = array('acceptInsecureCerts' => true);
$this->setDesiredCapabilities($capabilities);
-----------------------------------------------------------------------
Summary of changes:
tests/func/70_SOAP/soapTest.php | 2 +-
tests/func/SeleniumForge.php | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
