mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-67317' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2020-04-17 18:35:10 +08:00
commit e74c253037
3 changed files with 321 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -13,7 +13,7 @@
"require-dev": {
"phpunit/phpunit": "7.5.*",
"phpunit/dbunit": "4.0.*",
"moodlehq/behat-extension": "3.39.1",
"moodlehq/behat-extension": "3.39.2",
"mikey179/vfsstream": "^1.6",
"instaclick/php-webdriver": "dev-local as 1.x-dev"
}

487
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

3
lib/tests/behat/behat_hooks.php
View File

@ -307,6 +307,9 @@ class behat_hooks extends behat_base {
$driverexceptionmsg = 'Selenium server is not running, you need to start it to run tests that involve Javascript. ' . $moreinfo;
try {
$session = $this->getSession();
if (!$session->isStarted()) {
$session->start();
}
} catch (CurlExec $e) {
// Exception thrown by WebDriver, so only @javascript tests will be caugth; in
// behat_util::check_server_status() we already checked that the server is running.