Add some missing AJAX waits in events/procedures/triggers

Signed-off-by: Michal Čihař <michal@cihar.com>
NenadGajic · Sep 7, 2017 · 877d620 · 877d620
1 parent e9dece4
commit 877d620
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/test/selenium/PmaSeleniumDbEventsTest.php b/test/selenium/PmaSeleniumDbEventsTest.php
@@ -98,11 +98,11 @@ private function _eventSQL()
      */
     public function testAddEvent()
     {
-        $ele = $this->waitForElement("byPartialLinkText", "Events");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Events")->click();
+        $this->waitAjax();
 
-        $ele = $this->waitForElement("byPartialLinkText", "Add event");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Add event")->click();
+        $this->waitAjax();
 
         $this->waitForElement("byClassName", "rte_form");
 
@@ -169,8 +169,8 @@ public function testAddEvent()
     public function testEditEvents()
     {
         $this->_eventSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Events");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Events")->click();
+        $this->waitAjax();
 
         $this->waitForElement(
             "byXPath",
@@ -210,6 +210,7 @@ public function testDropEvent()
     {
         $this->_eventSQL();
         $this->waitForElement("byPartialLinkText", "Events")->click();
+        $this->waitAjax();
 
         $this->waitForElement(
             "byXPath",

diff --git a/test/selenium/PmaSeleniumDbProceduresTest.php b/test/selenium/PmaSeleniumDbProceduresTest.php
@@ -75,11 +75,10 @@ private function _procedureSQL()
      */
     public function testAddProcedure()
     {
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Routines")->click();
+        $this->waitAjax();
 
-        $ele = $this->waitForElement("byPartialLinkText", "Add routine");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Add routine")->click();
 
         $this->waitForElement("byClassName", "rte_form");
 
@@ -132,8 +131,8 @@ public function testAddProcedure()
     public function testEditProcedure()
     {
         $this->_procedureSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Routines")->click();
+        $this->waitAjax();
 
         $this->waitForElement(
             "byXPath",
@@ -166,8 +165,8 @@ public function testEditProcedure()
     public function testDropProcedure()
     {
         $this->_procedureSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Routines")->click();
+        $this->waitAjax();
 
         $this->waitForElement(
             "byXPath",

diff --git a/test/selenium/PmaSeleniumDbTriggersTest.php b/test/selenium/PmaSeleniumDbTriggersTest.php
@@ -86,11 +86,11 @@ private function _triggerSQL()
     public function testAddTrigger()
     {
         $this->expandMore();
-        $ele = $this->waitForElement("byPartialLinkText", "Triggers");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Triggers")->click();
+        $this->waitAjax();
 
-        $ele = $this->waitForElement("byPartialLinkText", "Add trigger");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Add trigger")->click();
+        $this->waitAjax();
 
         $this->waitForElement("byClassName", "rte_form");
 
@@ -147,8 +147,8 @@ public function testEditTriggers()
         $this->expandMore();
 
         $this->_triggerSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Triggers");
-        $ele->click();
+        $this->waitForElement("byPartialLinkText", "Triggers")->click();
+        $this->waitAjax();
 
         $this->waitForElement(
             "byXPath",