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

UniGe · Dec 17, 2013 · 272e440 · 272e440
2 parents 1f71f76 + e227cfe
commit 272e440
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/behat/classes/behat_config_manager.php b/lib/behat/classes/behat_config_manager.php
@@ -183,6 +183,11 @@ protected static function get_config_file_contents($features, $stepsdefinitions)
         // We require here when we are sure behat dependencies are available.
         require_once($CFG->dirroot . '/vendor/autoload.php');
 
+        // It is possible that it has no value as we don't require a full behat setup to list the step definitions.
+        if (empty($CFG->behat_wwwroot)) {
+            $CFG->behat_wwwroot = 'http://itwillnotbeused.com';
+        }
+
         $basedir = $CFG->dirroot . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'behat';
         $config = array(
             'default' => array(