Fixed waiting for event/procedure/trigger drop

The nothing2display element is always present, sometimes it is just hidden. Wait for AJAX completion instead. Signed-off-by: Michal Čihař <michal@cihar.com>
NenadGajic · Sep 7, 2017 · c3f8315 · c3f8315
1 parent 037dde0
commit c3f8315
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/test/selenium/PmaSeleniumDbEventsTest.php b/test/selenium/PmaSeleniumDbEventsTest.php
@@ -247,9 +247,8 @@ public function testDropEvent()
             "byClassName", "submitOK"
         )->click();
 
-        $this->waitForElement("byId", "nothing2display");
+        $this->waitAjax();
 
-        sleep(1);
         $result = $this->dbQuery(
             "SHOW EVENTS WHERE Db='" . $this->database_name
             . "' AND Name='test_event'"

diff --git a/test/selenium/PmaSeleniumDbProceduresTest.php b/test/selenium/PmaSeleniumDbProceduresTest.php
@@ -179,9 +179,8 @@ public function testDropProcedure()
             "byCssSelector", "button.submitOK"
         )->click();
 
-        $this->waitForElement("byId", "nothing2display");
+        $this->waitAjax();
 
-        sleep(1);
         $result = $this->dbQuery(
             "SHOW PROCEDURE STATUS WHERE Db='" . $this->database_name . "'"
         );

diff --git a/test/selenium/PmaSeleniumDbTriggersTest.php b/test/selenium/PmaSeleniumDbTriggersTest.php
@@ -201,8 +201,7 @@ public function testDropTrigger()
             "byCssSelector", "button.submitOK"
         )->click();
 
-        $this->waitForElement("byId", "nothing2display");
-        sleep(1);
+        $this->waitAjax();
 
         // test trigger
         $this->dbQuery("INSERT INTO `test_table` (val) VALUES (1);");