mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-66979 behat: Rename selenium config to webdriver

Browse Source 
The PHP WebDriver Mink Driver does not necessarily require Selenium. It
supports Selenium 3 upwards, and can be used directly with ChromeDriver,
EdgeDriver, SafariDriver, GeckoDriver, and others.

It therefore uses a slightly different configuraitno path.
This commit is contained in:
Andrew Nicols 2020-06-15 08:23:25 +08:00
parent 50b9866e54
commit c96cde27ea
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
behat.yml.dist
View File

@ -7,7 +7,7 @@ default:
Behat\MinkExtension:
base_url: 'http://localhost:8000'
goutte: null
selenium2: null
webdriver: null
Moodle\BehatExtension:
moodledirroot: /Should/Change/To/Moodle/www/dir
steps_definitions: { }

18
lib/behat/classes/behat_config_util.php
View File

@ -475,12 +475,12 @@ class behat_config_util {
$parallelruns = $this->get_number_of_parallel_run();
}
$selenium2wdhost = array('wd_host' => 'http://localhost:4444/wd/hub');
$webdriverwdhost = array('wd_host' => 'http://localhost:4444/wd/hub');
// If parallel run, then set wd_host if specified.
if (!empty($currentrun) && !empty($parallelruns)) {
// Set proper selenium2 wd_host if defined.
// Set proper webdriver wd_host if defined.
if (!empty($CFG->behat_parallel_run[$currentrun - 1]['wd_host'])) {
$selenium2wdhost = array('wd_host' => $CFG->behat_parallel_run[$currentrun - 1]['wd_host']);
$webdriverwdhost = array('wd_host' => $CFG->behat_parallel_run[$currentrun - 1]['wd_host']);
}
}
@ -525,7 +525,7 @@ class behat_config_util {
'Behat\MinkExtension' => array(
'base_url' => $CFG->behat_wwwroot,
'goutte' => null,
'selenium2' => $selenium2wdhost
'webdriver' => $webdriverwdhost
),
'Moodle\BehatExtension' => array(
'moodledirroot' => $CFG->dirroot,
@ -688,7 +688,7 @@ class behat_config_util {
$behatprofileextension = array(
'extensions' => array(
'Behat\MinkExtension' => array(
'selenium2' => $seleniumconfig,
'webdriver' => $seleniumconfig,
)
)
);
@ -948,11 +948,11 @@ class behat_config_util {
$oldconfigvalues = array();
if (isset($values['extensions']['Behat\MinkExtension\Extension'])) {
$extensionvalues = $values['extensions']['Behat\MinkExtension\Extension'];
if (isset($extensionvalues['selenium2']['browser'])) {
$oldconfigvalues['browser'] = $extensionvalues['selenium2']['browser'];
if (isset($extensionvalues['webdriver']['browser'])) {
$oldconfigvalues['browser'] = $extensionvalues['webdriver']['browser'];
}
if (isset($extensionvalues['selenium2']['wd_host'])) {
$oldconfigvalues['wd_host'] = $extensionvalues['selenium2']['wd_host'];
if (isset($extensionvalues['webdriver']['wd_host'])) {
$oldconfigvalues['wd_host'] = $extensionvalues['webdriver']['wd_host'];
}
if (isset($extensionvalues['capabilities'])) {
$oldconfigvalues['capabilities'] = $extensionvalues['capabilities'];