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 7af7aec7a3cdeeb926b6ef11d55ce5dd561c0f4c (commit)
from f45822c5f9196a5d5e8e2a750bdfa966acbe96dd (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=7af7aec7a3cdeeb926b6ef11d55ce5dd561c0f4c
commit 7af7aec7a3cdeeb926b6ef11d55ce5dd561c0f4c
Author: Franck Villaume <[email protected]>
Date: Sun Mar 29 19:08:00 2020 +0200
upgrade to phpunit-selenium 8
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index 4261cff..df1d195 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -2,6 +2,7 @@
/**
* Copyright (C) 2014 Roland Mas
* Copyright (C) 2015 Inria (Sylvain Beucler)
+ * Copyright 2020, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -26,7 +27,7 @@ class SoapTest extends FForge_SeleniumTestCase
{
public $fixture = 'projecta';
- function setUp() {
+ function setUp(): void {
parent::setUp();
$this->session = NULL;
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 185d549..c514aa0 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -2,7 +2,7 @@
/**
* Copyright (C) 2007-2008 Alain Peyrat <aljeux at free dot fr>
* Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
- * Copyright 2013,2019, Franck Villaume - TrivialDev
+ * Copyright 2013,2019-2020, Franck Villaume - TrivialDev
* Copyright (C) 2015 Inria (Sylvain Beucler)
*
* This file is part of FusionForge.
@@ -86,19 +86,17 @@ $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';
}
-
-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() {
+ public function setUp(): void {
$this->configureSelenium();
$this->loadCachedFixture();
}
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 9c16e75..6accc4e 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -4,6 +4,7 @@
#
# Copyright (C) 2011 Olivier Berger - Institut Telecom
# Copyright (C) 2014, 2015 Inria (Sylvain Beucler)
+# Copyright 2020, Franck Villaume - TrivialDev
#
# This file is part of FusionForge. FusionForge is free software;
# you can redistribute it and/or modify it under the terms of the
@@ -77,8 +78,8 @@ install_selenium() {
apt-get -y install php-curl unzip composer psmisc rsyslog
default-jre patch
mkdir -p /usr/local/share/php
pushd /usr/local/share/php
- composer --no-plugins --no-scripts require
phpunit/phpunit:7.5.9
- composer --no-plugins --no-scripts require
phpunit/phpunit-selenium
+ composer --no-plugins --no-scripts require
phpunit/phpunit:8.5.2
+ composer --no-plugins --no-scripts require
phpunit/phpunit-selenium:8.0.0
popd
fi
else
-----------------------------------------------------------------------
Summary of changes:
tests/func/70_SOAP/soapTest.php | 3 ++-
tests/func/SeleniumForge.php | 8 +++-----
tests/func_tests.sh | 5 +++--
3 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
