Merge pull request #19007 from MauricioFauth/tests-dir-rename

Rename tests/classes and tests/selenium to tests/unit and tests/end-to-end

.github/workflows/mutation-tests.yml

@@ -8,13 +8,13 @@ on:
       - master
     paths:
       - 'src/**.php'
-      - 'tests/classes/**.php'
+      - 'tests/unit/**.php'
   pull_request:
     branches:
       - master
     paths:
       - 'src/**.php'
-      - 'tests/classes/**.php'
+      - 'tests/unit/**.php'
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'

.github/workflows/test-selenium.yml

@@ -136,7 +136,7 @@ jobs:
           TESTSUITE_DATABASE_PREFIX: "selenium"
           TESTSUITE_SELENIUM_HOST: "127.0.0.1"
           TESTSUITE_SELENIUM_PORT: "4444"
-        run: ./vendor/bin/phpunit --testsuite selenium --no-logging --no-coverage --stop-on-skipped --testdox tests/selenium/${{ matrix.test-name }}Test.php
+        run: ./vendor/bin/phpunit --testsuite end-to-end --no-logging --no-coverage --stop-on-skipped --testdox tests/end-to-end/${{ matrix.test-name }}Test.php
 
       - name: Output logs and stop server
         env:

composer.json

@@ -36,8 +36,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpMyAdmin\\Tests\\": "tests/classes",
-            "PhpMyAdmin\\Tests\\Selenium\\": "tests/selenium/"
+            "PhpMyAdmin\\Tests\\": "tests/unit",
+            "PhpMyAdmin\\Tests\\Selenium\\": "tests/end-to-end/"
         }
     },
     "repositories": [

phpunit.xml.dist

@@ -33,10 +33,10 @@
   </php>
   <testsuites>
     <testsuite name="unit">
-      <directory suffix="Test.php">tests/classes</directory>
+      <directory suffix="Test.php">tests/unit</directory>
     </testsuite>
-    <testsuite name="selenium">
-      <directory suffix="Test.php">tests/selenium</directory>
+    <testsuite name="end-to-end">
+      <directory suffix="Test.php">tests/end-to-end</directory>
     </testsuite>
   </testsuites>
   <logging>

psalm.xml

@@ -17,8 +17,8 @@
         <directory name="app"/>
         <directory name="public/setup"/>
         <directory name="src"/>
-        <directory name="tests/classes"/>
-        <directory name="tests/selenium"/>
+        <directory name="tests/end-to-end"/>
+        <directory name="tests/unit"/>
         <file name="public/index.php"/>
         <ignoreFiles>
             <directory name="app/cache"/>

tests/unit/Command/TwigLintCommandTest.php

@@ -41,7 +41,7 @@ class TwigLintCommandTest extends AbstractTestCase
     public function testGetTemplateContents(): void
     {
         $contents = $this->callFunction($this->command, TwigLintCommand::class, 'getTemplateContents', [
-            TEST_PATH . 'tests/classes/_data/file_listing/subfolder/one.ini',
+            TEST_PATH . 'tests/unit/_data/file_listing/subfolder/one.ini',
         ]);
 
         self::assertSame('key=value' . "\n", $contents);
@@ -49,7 +49,7 @@ class TwigLintCommandTest extends AbstractTestCase
 
     public function testFindFiles(): void
     {
-        $path = TEST_PATH . 'tests/classes/_data/file_listing';
+        $path = TEST_PATH . 'tests/unit/_data/file_listing';
         $filesFound = $this->callFunction($this->command, TwigLintCommand::class, 'findFiles', [$path]);
 
         // Sort results to avoid file system test specific failures
@@ -65,7 +65,7 @@ class TwigLintCommandTest extends AbstractTestCase
 
     public function testGetFilesInfo(): void
     {
-        $path = TEST_PATH . 'tests/classes/_data/file_listing';
+        $path = TEST_PATH . 'tests/unit/_data/file_listing';
         $filesInfos = $this->callFunction($this->command, TwigLintCommand::class, 'getFilesInfo', [$path]);
 
         // Sort results to avoid file system test specific failures
@@ -105,7 +105,7 @@ class TwigLintCommandTest extends AbstractTestCase
         ]);
 
         $filesFound = $this->callFunction($command, TwigLintCommand::class, 'getFilesInfo', [
-            TEST_PATH . 'tests/classes/_data/file_listing',
+            TEST_PATH . 'tests/unit/_data/file_listing',
         ]);
 
         self::assertEquals([