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

Merge branch 'MDL-39481_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-05-08 09:54:13 +12:00
commit b3a9bf23f5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,9 +175,9 @@ class behat_command {
return BEHAT_EXITCODE_COMPOSER;
}
// Checking behat dataroot existence otherwise echo about admin/tool/behat/cli/util.php.
// Checking behat dataroot existence otherwise echo about admin/tool/behat/cli/init.php.
if (empty($CFG->behat_dataroot) || !is_dir($CFG->behat_dataroot) || !is_writable($CFG->behat_dataroot)) {
self::output_msg(get_string('runclitool', 'tool_behat', 'php admin/tool/behat/cli/util.php'));
self::output_msg(get_string('runclitool', 'tool_behat', 'php admin/tool/behat/cli/init.php'));
return BEHAT_EXITCODE_CONFIG;
}

8
lib/behat/lib.php
View File

@ -55,12 +55,12 @@ function behat_error($errorcode, $text = '') {
$text = 'Behat permissions problem: ' . $text . ', check the permissions';
break;
case BEHAT_EXITCODE_REINSTALL:
$path = testing_cli_argument_path('/admin/tool/behat/cli/util.php');
$text = "Reinstall Behat: ".$text.", use:\n php ".$path." --drop \n php ".$path." --install";
$path = testing_cli_argument_path('/admin/tool/behat/cli/init.php');
$text = "Reinstall Behat: ".$text.", use:\n php ".$path;
break;
case BEHAT_EXITCODE_INSTALL:
$path = testing_cli_argument_path('/admin/tool/behat/cli/util.php');
$text = "Install Behat before enabling it, use:\n php ".$path." --install";
$path = testing_cli_argument_path('/admin/tool/behat/cli/init.php');
$text = "Install Behat before enabling it, use:\n php ".$path;
break;
default:
$text = 'Unknown error ' . $errorcode . ' ' . $text;

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

@ -95,7 +95,7 @@ class behat_hooks extends behat_base {
// Prevents using outdated data, upgrade script would start and tests would fail.
if (!behat_util::is_test_data_updated()) {
$commandpath = 'php admin/tool/behat/cli/util.php';
$commandpath = 'php admin/tool/behat/cli/init.php';
throw new Exception('Your behat test site is outdated, please run ' . $commandpath . ' from your moodle dirroot to drop and install the behat test site again.');
}
// Avoid parallel tests execution, it continues when the previous lock is released.