gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve navigateTable and navigateDatabase selenium testbase methods

Browse Source 
And fix navigateDatabase that did stop using the database parameter.

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-06-09 23:47:00 +02:00
parent 03dddcc2cc
commit ba5d6492c2
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/selenium/TestBase.php
View File

@ -935,13 +935,12 @@ abstract class TestBase extends TestCase
/**
* Navigates browser to a table page.
*
* @param string $table Name of table
*
* @return void
* @param string $table Name of table
* @param bool $gotoHomepageRequired Go to homepage required
*/
public function navigateTable($table)
public function navigateTable(string $table, bool $gotoHomepageRequired = false): void
{
$this->navigateDatabase($this->database_name);
$this->navigateDatabase($this->database_name, $gotoHomepageRequired);
// go to table page
$this->waitForElement(
@ -961,10 +960,8 @@ abstract class TestBase extends TestCase
*
* @param string $database Name of database
* @param bool $gotoHomepageRequired Go to homepage required
*
* @return void
*/
public function navigateDatabase($database, $gotoHomepageRequired = false)
public function navigateDatabase(string $database, bool $gotoHomepageRequired = false): void
{
if ($gotoHomepageRequired) {
$this->gotoHomepage();
@ -977,7 +974,7 @@ abstract class TestBase extends TestCase
// go to specific database page
$this->waitForElement(
'xpath',
'//tr[(contains(@class, "db-row"))]//a[contains(., "' . $this->database_name . '")]'
'//tr[(contains(@class, "db-row"))]//a[contains(., "' . $database . '")]'
)->click();
$this->waitAjax();