Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-04-19 16:52:29 +0300
committerGitHub <noreply@github.com>2020-04-19 16:52:29 +0300
commit7e6b13cfd9207adfd2ab0e3d39d0d3b8b17bb3ea (patch)
treec939395ab75eb1d2df66c352186f291f0f870d3f /tests/PHPUnit/Integration/ReleaseCheckListTest.php
parent36a3729bbe0c70175eeee61dbf23f3395800dfe9 (diff)
Run tests on bionic distribution & run AllTests with PHP 7.4 (#15720)
* run tests on php 7.4 / xenial * composer update * fix lfs check * adjust travis.yml * adds distribution param * update submodule * update travis.yml * fix icon tests * Fix array access error on PHP 7.4 * fix test * avoid usage of deprecated assertArraySubset * convert expectedException annotations * avoid error on php 7.4 * Use assertion instead of conditional expection * add separat expected test result asserialize output changed for PHP7.4 * updates expected ui files * fix ui test * run UI tests on xenial dist * updates expected ui files * Update core/DataTable/Renderer.php * updates expected UI files * submodule update
Diffstat (limited to 'tests/PHPUnit/Integration/ReleaseCheckListTest.php')
-rw-r--r--tests/PHPUnit/Integration/ReleaseCheckListTest.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 0be0deb0b7..65c9f30aec 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -80,7 +80,9 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
{
$files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/plugins', '*.png');
// filter expected screenshots as they might not be checked out and downloaded when stored in git-lfs
- $files = array_filter($files, function($value) { return !preg_match('/expected-screenshots/', $value); });
+ $files = array_filter($files, function($value) {
+ return !preg_match('/expected-screenshots/', $value) && !preg_match('~icons/src~', $value);
+ });
$this->checkFilesAreInPngFormat($files);
$files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/core', '*.png');
$this->checkFilesAreInPngFormat($files);
@@ -117,6 +119,9 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
$screenshots = array_map($cleanPath, $screenshots);
$lfsFiles = `git lfs ls-files`;
+ if (empty($lfsFiles)) {
+ $lfsFiles = `git lfs ls-files --exclude=`;
+ }
$submodules = `git submodule | awk '{ print $2 }'`;
$submodules = explode("\n", $submodules);
$storedLfsFiles = explode("\n", $lfsFiles);
@@ -445,6 +450,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
strpos($file, 'yuicompressor') !== false ||
(strpos($file, '/vendor') !== false && strpos($file, '/vendor/piwik') === false) ||
strpos($file, '/tmp/') !== false ||
+ strpos($file, '/Morpheus/icons/src/') !== false ||
strpos($file, '/phantomjs/') !== false
) {
continue;
@@ -862,7 +868,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
$countFileChecked = 0;
foreach ($files as $file) {
- if($this->isFileBelongToTests($file)) {
+ if($this->isFileBelongToTests($file) || is_dir($file)) {
continue;
}