Visitar URL original
Fix some failing Selenium tests · phpmyadmin/phpmyadmin@25e00f3 · GitHub
Skip to content

Commit 25e00f3

Browse files
MauricioFauthMauricioFauth
committed
Fix some failing Selenium tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent be92611 commit 25e00f3

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎test/selenium/ChangePasswordTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function testChangePassword(): void
8080
$this->byId('nopass_1')->click();
8181
}
8282

83-
$this->byCssSelector('#change_password_dialog + div button')->click();
83+
$this->byId('changePasswordGoButton')->click();
8484
$ele = $this->waitForElement('cssSelector', '.alert-success');
8585
$this->assertEquals(
8686
'The profile has been updated.',

‎test/selenium/Database/OperationsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testRenameDB(): void
6868

6969
$this->byCssSelector("form#rename_db_form input[type='submit']")->click();
7070

71-
$this->waitForElement('cssSelector', 'button.submitOK')->click();
71+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
7272

7373
$this->waitForElement(
7474
'xpath',

‎test/selenium/Database/ProceduresTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function testAddProcedure(): void
149149
'READS SQL DATA'
150150
);
151151

152-
$this->byXPath("//button[contains(., 'Go')]")->click();
152+
$this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
153153

154154
$this->waitForElement(
155155
'xpath',
@@ -185,7 +185,7 @@ public function testEditProcedure(): void
185185
$this->byName('item_param_length[0]')->clear();
186186
$this->byName('item_param_length[0]')->sendKeys('30');
187187

188-
$this->byXPath("//button[contains(., 'Go')]")->click();
188+
$this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
189189

190190
$this->waitForElement(
191191
'xpath',
@@ -209,7 +209,7 @@ public function testDropProcedure(): void
209209
$this->waitForElement('id', 'checkAllCheckbox');
210210

211211
$this->byPartialLinkText('Drop')->click();
212-
$this->waitForElement('cssSelector', 'button.submitOK')->click();
212+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
213213

214214
$this->waitAjaxMessage();
215215

‎test/selenium/Database/TriggersTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testAddTrigger(): void
9292
$proc = 'UPDATE ' . $this->databaseName . '.`test_table2` SET val=val+1';
9393
$this->typeInTextArea($proc);
9494

95-
$this->byXPath("//button[contains(., 'Go')]")->click();
95+
$this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
9696

9797
$this->waitForElement(
9898
'xpath',
@@ -147,7 +147,7 @@ public function testEditTriggers(): void
147147
$proc = 'UPDATE ' . $this->databaseName . '.`test_table2` SET val=val+10';
148148
$this->typeInTextArea($proc);
149149

150-
$this->byXPath("//button[contains(., 'Go')]")->click();
150+
$this->byCssSelector('div.ui-dialog-buttonset button:nth-child(1)')->click();
151151

152152
$this->waitForElement(
153153
'xpath',
@@ -182,7 +182,7 @@ public function testDropTrigger(): void
182182
$this->waitForElement('id', 'checkAllCheckbox');
183183

184184
$this->byPartialLinkText('Drop')->click();
185-
$this->waitForElement('cssSelector', 'button.submitOK')->click();
185+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
186186

187187
$this->waitAjaxMessage();
188188

‎test/selenium/Table/OperationsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function testTruncateTable(): void
185185
$this->scrollToBottom();
186186
$this->waitUntilElementIsVisible('id', 'drop_tbl_anchor', 30);
187187
$this->byId('truncate_tbl_anchor')->click();
188-
$this->byCssSelector('button.submitOK')->click();
188+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
189189
$this->waitAjax();
190190

191191
$this->waitForElement(
@@ -212,7 +212,7 @@ public function testDropTable(): void
212212
$dropLink = $this->waitUntilElementIsVisible('partialLinkText', 'Delete the table (DROP)', 30);
213213
$this->scrollToBottom();
214214
$dropLink->click();
215-
$this->byCssSelector('button.submitOK')->click();
215+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
216216
$this->waitAjax();
217217

218218
$this->waitForElement(

‎test/selenium/TrackingTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function testDropTracking(): void
163163
$this->moveto($ele);
164164
$this->click();
165165

166-
$this->waitForElement('cssSelector', 'button.submitOK')->click();
166+
$this->waitForElement('id', 'functionConfirmOkButton')->click();
167167

168168
$this->waitAjax();
169169
$this->waitForElement(

0 commit comments

Comments
 (0)