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

moodle · Jan 29, 2013 · 4653ecd · 4653ecd
2 parents 10b8d16 + 33063f2
commit 4653ecd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/admin/tool/behat/lang/en/tool_behat.php b/admin/tool/behat/lang/en/tool_behat.php
@@ -30,6 +30,7 @@
 $string['newtestsinfo'] = 'Read {$a} for info about how to write new tests';
 $string['nostepsdefinitions'] = 'There aren\'t steps definitions matching this filters';
 $string['pluginname'] = 'Acceptance testing';
+$string['runclitool'] = 'To list the steps definitions you need to run the Behat CLI tool to create the $CFG->behat_dataroot directory. Go to your moodle dirroot and run "{$a}"';
 $string['stepsdefinitionscomponent'] = 'Area';
 $string['stepsdefinitionscontains'] = 'Contains';
 $string['stepsdefinitionsfilters'] = 'Steps definitions';

diff --git a/lib/behat/classes/behat_command.php b/lib/behat/classes/behat_command.php
@@ -132,6 +132,11 @@ public static function check_behat_setup($checkphp = false) {
         if ($code != 0) {
             notice(get_string('wrongbehatsetup', 'tool_behat'));
         }
+
+        // Checking behat dataroot existence otherwise notice about admin/tool/behat/cli/util.php.
+        if (empty($CFG->behat_dataroot) || !is_dir($CFG->behat_dataroot) || !is_writable($CFG->behat_dataroot)) {
+            notice(get_string('runclitool', 'tool_behat', 'php admin/tool/behat/cli/util.php'));
+        }
     }
 
     /**