Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/classes/Database/DesignerTest.php14
-rw-r--r--test/selenium/ExportTest.php2
-rw-r--r--test/selenium/ImportTest.php5
3 files changed, 15 insertions, 6 deletions
diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
index 5f9c505f5a..23cc15d7ec 100644
--- a/test/classes/Database/DesignerTest.php
+++ b/test/classes/Database/DesignerTest.php
@@ -189,13 +189,19 @@ class DesignerTest extends AbstractTestCase
$this->assertStringContainsString('<input type="hidden" name="page_number" value="' . $page . '">', $result);
// orientation
- $this->assertStringContainsString('<select name="pdf_orientation" id="select_pdf_orientation">', $result);
- $this->assertStringContainsString('<option value="L" selected="selected">Landscape</option>', $result);
+ $this->assertStringContainsString(
+ '<select class="form-select" name="pdf_orientation" id="select_pdf_orientation">',
+ $result
+ );
+ $this->assertStringContainsString('<option value="L" selected>Landscape</option>', $result);
$this->assertStringContainsString('<option value="P">Portrait</option>', $result);
// paper size
- $this->assertStringContainsString('<select name="pdf_paper" id="select_pdf_paper">', $result);
+ $this->assertStringContainsString(
+ '<select class="form-select" name="pdf_paper" id="select_pdf_paper">',
+ $result
+ );
$this->assertStringContainsString('<option value="A3">A3</option>', $result);
- $this->assertStringContainsString('<option value="A4" selected="selected">A4</option>', $result);
+ $this->assertStringContainsString('<option value="A4" selected>A4</option>', $result);
}
}
diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php
index 11ee724118..4c841e9f4f 100644
--- a/test/selenium/ExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -141,7 +141,7 @@ class ExportTest extends TestBase
$this->scrollIntoView('databases_and_tables', 200);
sleep(1);
$this->scrollIntoView('databases_and_tables', 200);
- $this->byPartialLinkText('Unselect all')->click();
+ $this->byId('db_unselect_all')->click();
$this->byCssSelector('option[value="' . $this->databaseName . '"]')->click();
}
diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php
index 91b0618252..c521b24a44 100644
--- a/test/selenium/ImportTest.php
+++ b/test/selenium/ImportTest.php
@@ -101,7 +101,7 @@ class ImportTest extends TestBase
$this->waitAjax();
$this->waitForElement('id', 'input_import_file');
- $this->waitForElement('cssSelector', 'label[for=radio_local_import_file]')->click();
+ $this->waitForElement('id', 'localFileTab')->click();
$this->selectByValue(
$this->byName('local_import_file'),
@@ -119,6 +119,9 @@ class ImportTest extends TestBase
$this->scrollToBottom();
$this->waitUntilElementIsVisible('id', 'buttonGo', 30);
+ $this->scrollToBottom();
+ sleep(1);
+ $this->scrollToBottom();
$this->byId('buttonGo')->click();
sleep(2);
$this->waitUntilElementIsVisible(