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 2017-12-18 14:53:25 +01:00
commit dc27cbcc67
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/selenium/ChangePasswordTest.php
View File

@ -38,19 +38,19 @@ class ChangePasswordTest extends TestBase
try {
$ele = $this->waitForElement("byName", "pma_pw");
$this->assertEquals("", $ele->value());
} catch (PHPUnit_Framework_AssertionFailedError $e) {
} catch (\PHPUnit_Framework_AssertionFailedError $e) {
array_push($this->verificationErrors, $e->toString());
}
try {
$ele = $this->waitForElement("byName", "pma_pw2");
$this->assertEquals("", $ele->value());
} catch (PHPUnit_Framework_AssertionFailedError $e) {
} catch (\PHPUnit_Framework_AssertionFailedError $e) {
array_push($this->verificationErrors, $e->toString());
}
try {
$ele = $this->waitForElement("byName", "generated_pw");
$this->assertEquals("", $ele->value());
} catch (PHPUnit_Framework_AssertionFailedError $e) {
} catch (\PHPUnit_Framework_AssertionFailedError $e) {
array_push($this->verificationErrors, $e->toString());
}
$this->byId("button_generate_password")->click();

8
test/selenium/TestBase.php
View File

@ -395,7 +395,7 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
return call_user_func_array(
array($this, $func), array($arg)
);
} catch(Exception $e) {
} catch(\Exception $e) {
// Element not present, fall back to waiting
}
$this->timeouts()->implicitWait(10000);
@ -438,10 +438,10 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
$element = call_user_func_array(
array($this, $func), array($arg)
);
} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
} catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
// Element not present
return false;
} catch (InvalidArgumentException $e) {
} catch (\InvalidArgumentException $e) {
// Element not present
return false;
}
@ -578,7 +578,7 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
$ele = null;
try {
$ele = $this->waitForElement('byCssSelector', 'li.submenu > a');
} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
} catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
return;
}