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 4927550ca95ee690ecbbb641a09bb505a58bc28e (commit)
from a3963d41357249fcf40a7c0907438e7ebe102914 (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=4927550ca95ee690ecbbb641a09bb505a58bc28e
commit 4927550ca95ee690ecbbb641a09bb505a58bc28e
Author: Roland Mas <[email protected]>
Date: Mon Oct 30 20:55:05 2017 +0100
Use PHPUnit as installed with Composer
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 4af46d9..07e187a 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -51,12 +51,13 @@ define('FORGE_OTHER_PASSWORD', 'toto_Tata8');
$config = dirname(__FILE__).'/config.php';
require_once $config;
-if ($phpunitversion == 4) {
- require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
+if (@include_once '/usr/local/share/php/vendor/autoload.php') {
+ class PHPUnit_Extensions_SeleniumTestCase extends
PHPUnit_Extensions_Selenium2TestCase {}
} else {
- class PHPUnit_Extensions_SeleniumTestCase extends
PHPUnit\Extensions\SeleniumTestCase {}
+ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
}
+
class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
{
public $logged_in = false ;
diff --git a/tests/func_tests.php b/tests/func_tests.php
index 40d5699..45c1c3c 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -7,10 +7,12 @@ if (@include_once '/usr/local/share/php/vendor/autoload.php')
{
$phpunitversion = 6;
class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
-} elseif (!@include_once 'PHPUnit/Autoload.php') {
+} else {
$phpunitversion = 4;
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
+ if (!@include_once 'PHPUnit/Autoload.php') {
+ include_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+ }
}
class AllTests
-----------------------------------------------------------------------
Summary of changes:
tests/func/SeleniumForge.php | 7 ++++---
tests/func_tests.php | 8 +++++---
2 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
