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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-02-24 08:49:53 +01:00
commit 128d63d453
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/selenium/PmaSeleniumImportTest.php
View File

@ -86,7 +86,6 @@ class PMA_SeleniumImportTest extends PMA_SeleniumBase
);
// go to database page
$this->byLinkText("Databases")->click();
$this->waitForElement("byLinkText", $this->database_name)->click();
$this->waitForElement(
"byXPath",

4
test/selenium/TestBase.php
View File

@ -244,6 +244,8 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
$passwordField = $this->byId('input_password');
$passwordField->value($password);
$this->byId('input_go')->click();
/* Wait for loading the page */
$this->waitForElement("byLinkText", $this->database_name);
}
/**
@ -419,7 +421,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
public function expandMore()
{
try {
$more = $this->byCssSelector('li.submenu > a');
$more = $this->waitForElement('byCssSelector', 'li.submenu > a');
} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
return;
}