Permalink
Browse files

MDL-37046 behat: Changes from integration review

* RTL languages problem solved
* Fixed curl errno return
* Switch to behat test environment code more readable
  • Loading branch information...
dmonllao committed Jan 29, 2013
1 parent 096858e commit 475ac3f8ee9acef370e09f06822227e0501ce94f
Showing with 15 additions and 6 deletions.
  1. +1 −1 admin/tool/behat/lang/en/tool_behat.php
  2. +1 −1 lib/behat/classes/behat_command.php
  3. +5 −1 lib/behat/classes/util.php
  4. +8 −3 lib/setup.php
@@ -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';
@@ -122,7 +122,7 @@ public static function check_behat_setup($checkphp = false) {
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);
}
@@ -120,7 +120,11 @@ public static function is_server_running() {
$request = new curl();
$request->get($CFG->behat_wwwroot);
return (true && !$request->get_errno());
if ($request->get_errno() === 0) {
return true;
}
return false;
}
/**
View
@@ -108,12 +108,17 @@
// * 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';

0 comments on commit 475ac3f

Please sign in to comment.