From 9a0d34b01dbacbd79641cda75a52a7a5f0367c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 22 Feb 2024 15:23:24 -0300 Subject: [PATCH] Rename tests/selenium to tests/end-to-end MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .github/workflows/test-selenium.yml | 2 +- composer.json | 2 +- phpstan-baseline.neon | 36 +++++++++---------- phpunit.xml.dist | 4 +-- psalm-baseline.xml | 4 +-- psalm.xml | 2 +- .../ChangePasswordTest.php | 0 .../CreateDropDatabaseTest.php | 0 .../CreateRemoveUserTest.php | 0 .../Database/EventsTest.php | 0 .../Database/OperationsTest.php | 0 .../Database/ProceduresTest.php | 0 .../Database/StructureTest.php | 0 tests/{selenium => end-to-end}/ExportTest.php | 0 tests/{selenium => end-to-end}/ImportTest.php | 0 tests/{selenium => end-to-end}/LoginTest.php | 0 .../NormalizationTest.php | 0 .../ServerSettingsTest.php | 0 .../{selenium => end-to-end}/SqlQueryTest.php | 0 .../Table/BrowseTest.php | 0 .../Table/CreateTest.php | 0 .../Table/InsertTest.php | 0 .../Table/OperationsTest.php | 0 .../Table/StructureTest.php | 0 tests/{selenium => end-to-end}/TestBase.php | 0 .../{selenium => end-to-end}/TrackingTest.php | 0 .../{selenium => end-to-end}/TriggersTest.php | 0 tests/{selenium => end-to-end}/XssTest.php | 0 28 files changed, 25 insertions(+), 25 deletions(-) rename tests/{selenium => end-to-end}/ChangePasswordTest.php (100%) rename tests/{selenium => end-to-end}/CreateDropDatabaseTest.php (100%) rename tests/{selenium => end-to-end}/CreateRemoveUserTest.php (100%) rename tests/{selenium => end-to-end}/Database/EventsTest.php (100%) rename tests/{selenium => end-to-end}/Database/OperationsTest.php (100%) rename tests/{selenium => end-to-end}/Database/ProceduresTest.php (100%) rename tests/{selenium => end-to-end}/Database/StructureTest.php (100%) rename tests/{selenium => end-to-end}/ExportTest.php (100%) rename tests/{selenium => end-to-end}/ImportTest.php (100%) rename tests/{selenium => end-to-end}/LoginTest.php (100%) rename tests/{selenium => end-to-end}/NormalizationTest.php (100%) rename tests/{selenium => end-to-end}/ServerSettingsTest.php (100%) rename tests/{selenium => end-to-end}/SqlQueryTest.php (100%) rename tests/{selenium => end-to-end}/Table/BrowseTest.php (100%) rename tests/{selenium => end-to-end}/Table/CreateTest.php (100%) rename tests/{selenium => end-to-end}/Table/InsertTest.php (100%) rename tests/{selenium => end-to-end}/Table/OperationsTest.php (100%) rename tests/{selenium => end-to-end}/Table/StructureTest.php (100%) rename tests/{selenium => end-to-end}/TestBase.php (100%) rename tests/{selenium => end-to-end}/TrackingTest.php (100%) rename tests/{selenium => end-to-end}/TriggersTest.php (100%) rename tests/{selenium => end-to-end}/XssTest.php (100%) diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml index 6a3a6d2ccd..8f2a9176b5 100644 --- a/.github/workflows/test-selenium.yml +++ b/.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: diff --git a/composer.json b/composer.json index fb239bcf0e..fd182fa040 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "autoload-dev": { "psr-4": { "PhpMyAdmin\\Tests\\": "tests/unit", - "PhpMyAdmin\\Tests\\Selenium\\": "tests/selenium/" + "PhpMyAdmin\\Tests\\Selenium\\": "tests/end-to-end/" } }, "repositories": [ diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 65ab818d4d..90866cd703 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -15263,92 +15263,92 @@ parameters: - message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotNull\\(\\) with Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebElement will always evaluate to true\\.$#" count: 1 - path: tests/selenium/Database/OperationsTest.php + path: tests/end-to-end/Database/OperationsTest.php - message: "#^Call to function is_string\\(\\) with non\\-falsy\\-string will always evaluate to true\\.$#" count: 2 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Cannot access property \\$public_url on mixed\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Class PhpMyAdmin\\\\Tests\\\\Selenium\\\\TestBase has an uninitialized property \\$sessionId\\. Give it default value or assign it in the constructor\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" count: 5 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in &&, string given on the left side\\.$#" count: 2 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in a negated boolean, int\\|false given\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in a negated boolean, string\\|null given\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in an elseif condition, string\\|false given\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in an if condition, int given\\.$#" count: 2 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Only booleans are allowed in an if condition, string\\|false given\\.$#" count: 2 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Parameter \\#1 \\$by of method Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebDriver\\:\\:findElement\\(\\) expects Facebook\\\\WebDriver\\\\WebDriverBy, mixed given\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Parameter \\#1 \\$by of static method Facebook\\\\WebDriver\\\\WebDriverExpectedCondition\\:\\:presenceOfElementLocated\\(\\) expects Facebook\\\\WebDriver\\\\WebDriverBy, mixed given\\.$#" count: 2 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Parameter \\#1 \\$by of static method Facebook\\\\WebDriver\\\\WebDriverExpectedCondition\\:\\:visibilityOfElementLocated\\(\\) expects Facebook\\\\WebDriver\\\\WebDriverBy, mixed given\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Parameter \\#1 \\$handle of method Facebook\\\\WebDriver\\\\Remote\\\\RemoteTargetLocator\\:\\:window\\(\\) expects string, mixed given\\.$#" count: 3 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Property PhpMyAdmin\\\\Tests\\\\Selenium\\\\TestBase\\:\\:\\$sqlWindowHandle \\(string\\|null\\) does not accept mixed\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Strict comparison using \\=\\=\\= between Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebDriver and null will always evaluate to false\\.$#" count: 1 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Variable static method call on Facebook\\\\WebDriver\\\\WebDriverBy\\.$#" count: 4 - path: tests/selenium/TestBase.php + path: tests/end-to-end/TestBase.php - message: "#^Cannot access offset 'Servers' on mixed\\.$#" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8847c1c8a0..c9a01aba76 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -35,8 +35,8 @@ tests/unit - - tests/selenium + + tests/end-to-end diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 72b4a7cd65..79bed2b81f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -11986,12 +11986,12 @@ - + - + diff --git a/psalm.xml b/psalm.xml index 09b593f913..5ac40da2df 100644 --- a/psalm.xml +++ b/psalm.xml @@ -17,7 +17,7 @@ - + diff --git a/tests/selenium/ChangePasswordTest.php b/tests/end-to-end/ChangePasswordTest.php similarity index 100% rename from tests/selenium/ChangePasswordTest.php rename to tests/end-to-end/ChangePasswordTest.php diff --git a/tests/selenium/CreateDropDatabaseTest.php b/tests/end-to-end/CreateDropDatabaseTest.php similarity index 100% rename from tests/selenium/CreateDropDatabaseTest.php rename to tests/end-to-end/CreateDropDatabaseTest.php diff --git a/tests/selenium/CreateRemoveUserTest.php b/tests/end-to-end/CreateRemoveUserTest.php similarity index 100% rename from tests/selenium/CreateRemoveUserTest.php rename to tests/end-to-end/CreateRemoveUserTest.php diff --git a/tests/selenium/Database/EventsTest.php b/tests/end-to-end/Database/EventsTest.php similarity index 100% rename from tests/selenium/Database/EventsTest.php rename to tests/end-to-end/Database/EventsTest.php diff --git a/tests/selenium/Database/OperationsTest.php b/tests/end-to-end/Database/OperationsTest.php similarity index 100% rename from tests/selenium/Database/OperationsTest.php rename to tests/end-to-end/Database/OperationsTest.php diff --git a/tests/selenium/Database/ProceduresTest.php b/tests/end-to-end/Database/ProceduresTest.php similarity index 100% rename from tests/selenium/Database/ProceduresTest.php rename to tests/end-to-end/Database/ProceduresTest.php diff --git a/tests/selenium/Database/StructureTest.php b/tests/end-to-end/Database/StructureTest.php similarity index 100% rename from tests/selenium/Database/StructureTest.php rename to tests/end-to-end/Database/StructureTest.php diff --git a/tests/selenium/ExportTest.php b/tests/end-to-end/ExportTest.php similarity index 100% rename from tests/selenium/ExportTest.php rename to tests/end-to-end/ExportTest.php diff --git a/tests/selenium/ImportTest.php b/tests/end-to-end/ImportTest.php similarity index 100% rename from tests/selenium/ImportTest.php rename to tests/end-to-end/ImportTest.php diff --git a/tests/selenium/LoginTest.php b/tests/end-to-end/LoginTest.php similarity index 100% rename from tests/selenium/LoginTest.php rename to tests/end-to-end/LoginTest.php diff --git a/tests/selenium/NormalizationTest.php b/tests/end-to-end/NormalizationTest.php similarity index 100% rename from tests/selenium/NormalizationTest.php rename to tests/end-to-end/NormalizationTest.php diff --git a/tests/selenium/ServerSettingsTest.php b/tests/end-to-end/ServerSettingsTest.php similarity index 100% rename from tests/selenium/ServerSettingsTest.php rename to tests/end-to-end/ServerSettingsTest.php diff --git a/tests/selenium/SqlQueryTest.php b/tests/end-to-end/SqlQueryTest.php similarity index 100% rename from tests/selenium/SqlQueryTest.php rename to tests/end-to-end/SqlQueryTest.php diff --git a/tests/selenium/Table/BrowseTest.php b/tests/end-to-end/Table/BrowseTest.php similarity index 100% rename from tests/selenium/Table/BrowseTest.php rename to tests/end-to-end/Table/BrowseTest.php diff --git a/tests/selenium/Table/CreateTest.php b/tests/end-to-end/Table/CreateTest.php similarity index 100% rename from tests/selenium/Table/CreateTest.php rename to tests/end-to-end/Table/CreateTest.php diff --git a/tests/selenium/Table/InsertTest.php b/tests/end-to-end/Table/InsertTest.php similarity index 100% rename from tests/selenium/Table/InsertTest.php rename to tests/end-to-end/Table/InsertTest.php diff --git a/tests/selenium/Table/OperationsTest.php b/tests/end-to-end/Table/OperationsTest.php similarity index 100% rename from tests/selenium/Table/OperationsTest.php rename to tests/end-to-end/Table/OperationsTest.php diff --git a/tests/selenium/Table/StructureTest.php b/tests/end-to-end/Table/StructureTest.php similarity index 100% rename from tests/selenium/Table/StructureTest.php rename to tests/end-to-end/Table/StructureTest.php diff --git a/tests/selenium/TestBase.php b/tests/end-to-end/TestBase.php similarity index 100% rename from tests/selenium/TestBase.php rename to tests/end-to-end/TestBase.php diff --git a/tests/selenium/TrackingTest.php b/tests/end-to-end/TrackingTest.php similarity index 100% rename from tests/selenium/TrackingTest.php rename to tests/end-to-end/TrackingTest.php diff --git a/tests/selenium/TriggersTest.php b/tests/end-to-end/TriggersTest.php similarity index 100% rename from tests/selenium/TriggersTest.php rename to tests/end-to-end/TriggersTest.php diff --git a/tests/selenium/XssTest.php b/tests/end-to-end/XssTest.php similarity index 100% rename from tests/selenium/XssTest.php rename to tests/end-to-end/XssTest.php