From b32ca4caf923dde340c979a6b5835f8c531eda58 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Fri, 3 May 2013 12:04:42 +0800
Subject: [PATCH] MDL-39481 behat: Provide info about init.php

---
 lib/behat/classes/behat_command.php | 4 ++--
 lib/behat/lib.php                   | 8 ++++----
 lib/tests/behat/behat_hooks.php     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/behat/classes/behat_command.php b/lib/behat/classes/behat_command.php
index e39999633d2..b93c224ab89 100644
--- a/lib/behat/classes/behat_command.php
+++ b/lib/behat/classes/behat_command.php
@@ -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;
         }
 
diff --git a/lib/behat/lib.php b/lib/behat/lib.php
index b1a747a31f3..789c98f35c6 100644
--- a/lib/behat/lib.php
+++ b/lib/behat/lib.php
@@ -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;
diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
index a8893482ae7..925f376342f 100644
--- a/lib/tests/behat/behat_hooks.php
+++ b/lib/tests/behat/behat_hooks.php
@@ -92,7 +92,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.