diff options
| author | Michal Čihař <michal@cihar.com> | 2017-12-15 15:25:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 15:25:38 +0300 |
| commit | d1ac2f84a0ff6abc7faab314759c9aa3fe99b29b (patch) | |
| tree | 3206a2f312df695a2e49f024a1e2003b7156105f | |
| parent | d934364baceea11e8994e4cc735ba4f55d1d28b7 (diff) | |
| parent | 4c2c38f341945f902d37a507ecc1f968032c8745 (diff) | |
Merge pull request #13867 from nijel/selenium
Try to use more recent phpunit-selenium
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | test/selenium/TestBase.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 23da9f96ed..63d7b57d09 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.36 || ^5.7", "codacy/coverage": "^1.3.0", - "phpunit/phpunit-selenium": "~1.2", + "phpunit/phpunit-selenium": "~1.2 || ^3.0", "squizlabs/php_codesniffer": "^3.0", "tecnickcom/tcpdf": "^6.2", "pragmarx/google2fa": "^2.0", diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index 15aa723cf2..8aa0740d73 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -729,7 +729,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase * * @return void */ - public function onNotSuccessfulTest(Exception $e) + public function onNotSuccessfulTest($e) { // If this is being run on Browerstack, // mark the test on Browerstack as failure |