Visitar URL original
Add the extraOptionsButton ID to the Extra options button · phpmyadmin/phpmyadmin@fcf654a · GitHub
Skip to content

Commit fcf654a

Browse files
MauricioFauthMauricioFauth
committed
Add the extraOptionsButton ID to the Extra options button
This helps with the e2e tests Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 4d612b0 commit fcf654a

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,6 +3620,11 @@ parameters:
36203620
count: 1
36213621
path: libraries/classes/Display/Results.php
36223622

3623+
-
3624+
message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) has parameter \\$colVisib with no value type specified in iterable type array\\.$#"
3625+
count: 1
3626+
path: libraries/classes/Display/Results.php
3627+
36233628
-
36243629
message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) has parameter \\$sortDirection with no value type specified in iterable type array\\.$#"
36253630
count: 1
@@ -3786,12 +3791,12 @@ parameters:
37863791
path: libraries/classes/Display/Results.php
37873792

37883793
-
3789-
message: "#^Parameter \\#8 \\$colVisib of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects bool, mixed given\\.$#"
3794+
message: "#^Parameter \\#8 \\$colVisib of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects array\\|bool, mixed given\\.$#"
37903795
count: 1
37913796
path: libraries/classes/Display/Results.php
37923797

37933798
-
3794-
message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects string\\|null, mixed given\\.$#"
3799+
message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects int\\|string\\|null, mixed given\\.$#"
37953800
count: 1
37963801
path: libraries/classes/Display/Results.php
37973802

‎templates/display/results/table.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196

197197
{% if default_sliders_state != 'disabled' %}
198198
<div class="mb-3">
199-
<button class="btn btn-sm btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#extraOptions" aria-expanded="{{ default_sliders_state == 'open' ? 'true' : 'false' }}" aria-controls="extraOptions">
199+
<button class="btn btn-sm btn-secondary" type="button" id="extraOptionsButton" data-bs-toggle="collapse" data-bs-target="#extraOptions" aria-expanded="{{ default_sliders_state == 'open' ? 'true' : 'false' }}" aria-controls="extraOptions">
200200
{% trans 'Extra options' %}
201201
</button>
202202
</div>

‎test/selenium/Database/ProceduresTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ private function getSqlMode(): string
5858
$this->dbQuery(
5959
'SELECT @@GLOBAL.SQL_MODE as globalsqm;',
6060
function () use (&$sqlMode): void {
61-
$this->waitForElement('xpath', '//button[contains(., "Extra options")]')->click();
62-
$this->waitForElement('cssSelector', '#extraOptions.show');
61+
$this->scrollIntoView('extraOptionsButton');
62+
$this->waitForElement('id', 'extraOptionsButton')->click();
63+
$this->waitForElement('cssSelector', '#extraOptions.collapse.show');
6364
$this->waitForElement('xpath', '//label[contains(., "Full texts")]')->click();
6465
$this->waitForElement('cssSelector', '.collapse .tblFooters input[type=submit]')->click();
6566
$this->waitAjax();

0 commit comments

Comments
 (0)