From b87a909571685826956843548ddaae77dfefc1e9 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 30 Mar 2020 14:43:17 +0200
Subject: [PATCH] FEAT #13646 TIME 0:40 phpunit 9
---
.gitlab-ci.yml | 4 ++--
phpunit.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f39a94d5011..ff0398f120c 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ job_php-7.4:
- cd /var/www/html/MaarchCourrier
- mkdir -p /var/www/html/MaarchCourrier
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-8.phar
+ - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-9.phar
- chmod +x /usr/local/bin/phpunit
- phpunit --coverage-text --colors=never -c phpunit.xml
only:
@@ -64,7 +64,7 @@ job_php-7.3:
- cd /var/www/html/MaarchCourrier
- mkdir -p /var/www/html/MaarchCourrier
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-8.phar
+ - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-9.phar
- chmod +x /usr/local/bin/phpunit
- phpunit --coverage-text --colors=never -c phpunit.xml
only:
diff --git a/phpunit.xml b/phpunit.xml
index 826e3d21752..7556455dd10 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -31,7 +31,7 @@
<file>test/unitTests/app/resource/ResourceListControllerTest.php</file>
<file>test/unitTests/app/resource/ExportControllerTest.php</file>
<file>test/unitTests/app/resource/LinkControllerTest.php</file>
- <file>test/unitTests/app/resource/ListInstanceControllerTest.php</file>
+ <file>test/unitTests/app/entity/ListInstanceControllerTest.php</file>
<file>test/unitTests/app/resource/SummarySheetControllerTest.php</file>
<file>test/unitTests/app/status/StatusControllerTest.php</file>
<file>test/unitTests/app/shipping/ShippingControllerTest.php</file>
@@ -42,7 +42,7 @@
<file>test/unitTests/app/folder/FolderControllerTest.php</file>
<file>test/unitTests/app/configuration/ConfigurationControllerTest.php</file>
<file>test/unitTests/app/tag/TagControllerTest.php</file>
- <file>test/unitTests/app/tag/UserFollowedResourceControllerTest.php</file>
+ <file>test/unitTests/app/resource/UserFollowedResourceControllerTest.php</file>
<!-- The last one should be history -->
<file>test/unitTests/app/history/HistoryControllerTest.php</file>
</testsuite>
--
GitLab