Add the extraOptionsButton ID to the Extra options button

MauricioFauth · MauricioFauth · commit fcf654a98fda · 2023-03-19T20:29:28.000-03:00
This helps with the e2e tests

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -3620,6 +3620,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Display/Results.php
 
+		-
+			message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) has parameter \\$colVisib with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: libraries/classes/Display/Results.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) has parameter \\$sortDirection with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -3786,12 +3791,12 @@ parameters:
 			path: libraries/classes/Display/Results.php
 
 		-
-			message: "#^Parameter \\#8 \\$colVisib of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects bool, mixed given\\.$#"
+			message: "#^Parameter \\#8 \\$colVisib of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects array\\|bool, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Display/Results.php
 
 		-
-			message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects string\\|null, mixed given\\.$#"
+			message: "#^Parameter \\#9 \\$colVisibElement of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOrderLinkAndSortedHeaderHtml\\(\\) expects int\\|string\\|null, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Display/Results.php
 
diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig
@@ -196,7 +196,7 @@
 
     {% if default_sliders_state != 'disabled' %}
     <div class="mb-3">
-      <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">
+      <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">
         {% trans 'Extra options' %}
       </button>
     </div>
diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
@@ -58,8 +58,9 @@ private function getSqlMode(): string
         $this->dbQuery(
             'SELECT @@GLOBAL.SQL_MODE as globalsqm;',
             function () use (&$sqlMode): void {
-                $this->waitForElement('xpath', '//button[contains(., "Extra options")]')->click();
-                $this->waitForElement('cssSelector', '#extraOptions.show');
+                $this->scrollIntoView('extraOptionsButton');
+                $this->waitForElement('id', 'extraOptionsButton')->click();
+                $this->waitForElement('cssSelector', '#extraOptions.collapse.show');
                 $this->waitForElement('xpath', '//label[contains(., "Full texts")]')->click();
                 $this->waitForElement('cssSelector', '.collapse .tblFooters input[type=submit]')->click();
                 $this->waitAjax();
