Merge pull request #52 from innocraft/PG-3129-php-8.3-upgrade-4x

Updated tests to run on php 8.3 from 8.2, #PG-3129
innocraft · Nov 14, 2023 · bbd7e52 · bbd7e52
2 parents a846eef + 213ee64
commit bbd7e52
Show file tree

Hide file tree

Showing 13 changed files with 8,190 additions and 10 deletions.
diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
@@ -1,7 +1,7 @@
 # Action for running tests
 # This file has been automatically created.
 # To recreate it you can run this command
-# ./console generate:test-action --plugin="CustomTranslations" --php-versions="7.2,8.2" --protect-artifacts --schedule-cron="45 3 * * 6"
+# ./console generate:test-action --plugin="CustomTranslations" --php-versions="7.2,8.3" --protect-artifacts --schedule-cron="45 3 * * 6"
 
 name: Plugin CustomTranslations Tests
 
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.2', '8.2' ]
+        php: [ '7.2', '8.3' ]
         target: ['minimum_required_matomo', 'maximum_supported_matomo']
     steps:
       - uses: actions/checkout@v3

diff --git a/tests/System/APITest.php b/tests/System/APITest.php
@@ -70,7 +70,7 @@ public function test_getTranslatableTypes($api)
         }
 
         $apiOutputIsMissingMetricTypes = version_compare(Version::VERSION, '4.13.4-b1', '<');
-        $testSuffix = 'API.getReportMetadata' == $api && $apiOutputIsMissingMetricTypes ? '_Old' : '';
+        $testSuffix = in_array($api, ['API.getReportMetadata', 'API.getWidgetMetadata', 'API.getReportPagesMetadata']) && $apiOutputIsMissingMetricTypes ? '_Old' : '';
 
         $this->runAnyApiTest($api, '', $params, array('testSuffix' => $testSuffix, 'xmlFieldsToRemove' => array('imageGraphUrl', 'imageGraphEvolutionUrl')));
     }
@@ -119,7 +119,7 @@ public function test_getTranslatableTypes_withCustomReports($api)
             'period' => 'day',
         );
 
-        $testSuffix = 'withCustomReports' . ('API.getReportMetadata' == $api && $apiOutputIsMissingMetricTypes ? '_Old' : '');
+        $testSuffix = 'withCustomReports' . (in_array($api, ['API.getReportMetadata', 'API.getWidgetMetadata', 'API.getReportPagesMetadata']) && $apiOutputIsMissingMetricTypes ? '_Old' : '');
         $this->runAnyApiTest($api, '', $params, array('testSuffix' => $testSuffix, 'xmlFieldsToRemove' => array('imageGraphUrl', 'imageGraphEvolutionUrl')));
     }
 

diff --git a/tests/System/expected/test___API.getReportPagesMetadata_.xml b/tests/System/expected/test___API.getReportPagesMetadata_.xml
diff --git a/tests/System/expected/test___API.getWidgetMetadata_.xml b/tests/System/expected/test___API.getWidgetMetadata_.xml