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

MDL-37046 behat: Changes from integration review

Browse Source 
* RTL languages problem solved
* Fixed curl errno return
* Switch to behat test environment code more readable
This commit is contained in:
David Monllao 2013-01-29 11:43:59 +08:00
parent 096858ed83
commit 475ac3f8ee
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/behat/lang/en/tool_behat.php
View File

@ -25,7 +25,7 @@
$string['allavailablesteps'] = 'All the available steps definitions';
$string['giveninfo'] = 'Given. Processes to set up the environment';
$string['installinfo'] = 'Read {$a} for installation and tests execution info';
$string['moreinfoin'] = 'More info in';
$string['moreinfoin'] = 'More info in {$a}';
$string['newstepsinfo'] = 'Read {$a} for info about how to add new steps definitions';
$string['newtestsinfo'] = 'Read {$a} for info about how to write new tests';
$string['nostepsdefinitions'] = 'There aren\'t steps definitions matching this filters';

2
lib/behat/classes/behat_command.php
View File

@ -122,7 +122,7 @@ class behat_command {
if (!CLI_SCRIPT) {
$docslink = html_writer::tag('a', $docslink, array('href' => $docslink, 'target' => '_blank'));
}
$msg .= '. ' . get_string('moreinfoin', 'tool_behat') . ' ' . $docslink;
$msg .= '. ' . get_string('moreinfoin', 'tool_behat', $docslink);
notice($msg);
}

6
lib/behat/classes/util.php
View File

@ -120,7 +120,11 @@ class behat_util extends testing_util {
$request = new curl();
$request->get($CFG->behat_wwwroot);
return (true && !$request->get_errno());
if ($request->get_errno() === 0) {
return true;
}
return false;
}
/**

11
lib/setup.php
View File

@ -108,12 +108,17 @@ if (isset($CFG->behat_switchcompletely)) {
// * User has previously enabled through admin/tool/behat/cli/util.php --enable.
// Both are required to switch to test mode
if (isset($CFG->behat_dataroot) && isset($CFG->behat_prefix) && file_exists($CFG->behat_dataroot)) {
$CFG->behat_dataroot = realpath($CFG->behat_dataroot);
$testenvironmentrequested = (isset($CFG->behat_switchcompletely) && php_sapi_name() !== 'cli') ||
php_sapi_name() === 'cli-server' ||
defined('BEHAT_RUNNING');
$switchcompletely = isset($CFG->behat_switchcompletely) && php_sapi_name() !== 'cli';
$builtinserver = php_sapi_name() === 'cli-server';
$behatrunning = defined('BEHAT_RUNNING');
$testenvironmentrequested = $switchcompletely || $builtinserver || $behatrunning;
// Only switch to test environment if it has been enabled.
$testenvironmentenabled = file_exists($CFG->behat_dataroot . '/behat/test_environment_enabled.txt');
if ($testenvironmentenabled && $testenvironmentrequested) {
$CFG->wwwroot = $CFG->behat_wwwroot;
$CFG->passwordsaltmain = 'moodle';