add support for testing Mautic 4

mautic · Aug 21, 2023 · 3074e1e · 3074e1e
1 parent cad7ed4
commit 3074e1e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -107,6 +107,7 @@ jobs:
             cp $GITHUB_WORKSPACE/.github/ci-files/local_4.php ./app/config/local.php
             php bin/console mautic:install http://localhost/ --force --env=test --mailer_from_name="GitHub Actions" --mailer_from_email="[email protected]"
             sed -i "s/('prod',/('test',/g" ./index.php
+            sed -i 's/env name="MAUTIC_VERSION" value="5"/env name="MAUTIC_VERSION" value="4"/g' ./phpunit.xml.dist
         else
             cp $GITHUB_WORKSPACE/.github/ci-files/local_5.php ./app/config/local.php
             php bin/console mautic:install http://localhost/ --force --env=test

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,4 +10,7 @@
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <php>
+    <env name="MAUTIC_VERSION" value="5"/>
+  </php>
 </phpunit>
diff --git a/tests/Api/AssetsTest.php b/tests/Api/AssetsTest.php
@@ -14,6 +14,8 @@ class AssetsTest extends MauticApiTestCase
 {
     protected $skipPayloadAssertion = ['file'];
 
+    protected $mediaFolder = 'media';
+
     public function setUp(): void
     {
         $this->api         = $this->getContext('assets');
@@ -22,6 +24,10 @@ public function setUp(): void
             'storageLocation' => 'remote',
             'file'            => 'https://www.mautic.org/media/logos/logo/Mautic_Logo_DB.pdf',
         ];
+
+        if ('4' == $this->mauticVersion) {
+            $this->mediaFolder = 'assets';
+        }
     }
 
     public function testGetList()
@@ -38,7 +44,7 @@ public function testCreateWithLocalFileGetAndDelete()
     {
         // Upload a testing file
         $this->apiFiles = $this->getContext('files');
-        $this->apiFiles->setFolder('media');
+        $this->apiFiles->setFolder($this->mediaFolder);
         $fileRequest = [
             'file' => dirname(__DIR__).'/mauticlogo.png',
         ];

diff --git a/tests/Api/FilesTest.php b/tests/Api/FilesTest.php
@@ -12,10 +12,17 @@
 
 class FilesTest extends MauticApiTestCase
 {
+    protected $mediaFolder = 'media';
+
     public function setUp(): void
     {
         $this->api                 = $this->getContext('files');
         $this->testPayload['file'] = dirname(__DIR__).'/mauticlogo.png';
+
+        if ('4' == $this->mauticVersion) {
+            $this->mediaFolder = 'assets';
+        }
+
         $this->assertTrue(file_exists($this->testPayload['file']), 'A file for test at '.$this->testPayload['file'].' does not exist.');
     }
 
@@ -46,7 +53,7 @@ public function testGetListSubdir()
 
     public function testGetListMediaFiles()
     {
-        $this->api->setFolder('media');
+        $this->api->setFolder($this->mediaFolder);
         $response   = $this->api->getList();
         $this->assertErrors($response);
     }
@@ -86,7 +93,7 @@ public function testCreateAndDeleteImageInSubdir()
 
     public function testCreateAndDeleteMedia()
     {
-        $this->api->setFolder('media');
+        $this->api->setFolder($this->mediaFolder);
         $response = $this->api->create($this->testPayload);
         $this->assertPayload($response);
 

diff --git a/tests/Api/MauticApiTestCase.php b/tests/Api/MauticApiTestCase.php
@@ -22,6 +22,8 @@ abstract class MauticApiTestCase extends TestCase
     protected $skipPayloadAssertion = [];
     protected $testPayload          = [];
 
+    protected $mauticVersion = null;
+
     /** @var Api */
     protected $api;
 
@@ -67,6 +69,7 @@ protected function getAuth()
 
     protected function getContext($context)
     {
+        $this->mauticVersion = $_ENV['MAUTIC_VERSION'] ?? '5';
         list($auth, $apiUrl) = $this->getAuth();
 
         $api = new MauticApi();

diff --git a/tests/Api/StatsTest.php b/tests/Api/StatsTest.php
@@ -96,6 +96,12 @@ public function testGetTables()
             'video_hits',
             'webhook_logs',
         ];
+
+        if ('4' == $this->mauticVersion) {
+            $expectedTables[] = 'plugin_citrix_events';
+            sort($expectedTables);
+        }
+
         $tables = $this->getTableList();
         $this->assertTrue(!empty($tables));
         $this->assertSame(