Some improvements on selenium tests for testDropColumns and import

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jun 9, 2020 · 43ea81b · 43ea81b
1 parent 0052557
commit 43ea81b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
@@ -250,10 +250,8 @@ function () {
      *
      * @param string $text   String to pass as inp param
      * @param int    $length Expected output length
-     *
-     * @return void
      */
-    private function executeProcedure($text, $length)
+    private function executeProcedure(string $text, int $length): void
     {
         $this->waitAjax();
         $this->waitUntilElementIsVisible('partialLinkText', 'Execute', 30)->click();

diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php
@@ -7,6 +7,8 @@
 
 namespace PhpMyAdmin\Tests\Selenium;
 
+use function sleep;
+
 /**
  * ImportTest class
  *
@@ -134,6 +136,7 @@ private function doImport($type)
         $this->waitUntilElementIsVisible('id', 'buttonGo', 30);
 
         $this->byId('buttonGo')->click();
+        sleep(2);
         $this->waitUntilElementIsVisible(
             'xpath',
             "//div[@class='alert alert-success' and contains(., 'Import has been successfully')]",

diff --git a/test/selenium/Table/StructureTest.php b/test/selenium/Table/StructureTest.php
@@ -124,8 +124,10 @@ public function testDropColumns()
     {
         $this->waitForElement('cssSelector', 'label[for=checkbox_row_2]')->click();
         $this->waitForElement('cssSelector', 'label[for=checkbox_row_3]')->click();
-        $this->byXPath(
-            "//button[@name='submit_mult' and contains(., 'Drop')]"
+        $this->waitUntilElementIsPresent(
+            'xpath',
+            '//button[contains(., "Drop")]',
+            30
         )->click();
 
         $this->waitForElement(