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

2013-07-22 10:45:42 +08:00
parent 7bdae0924f 401f60d576
commit 51425cc045
4 changed files with 44 additions and 0 deletions
@@ -131,6 +131,10 @@ if (!defined('BEHAT_SITE_RUNNING') && !empty($CFG->behat_dataroot) &&
        // actions like reset the site or use data generators.
        define('BEHAT_SITE_RUNNING', true);

+        // Clean extra config.php settings.
+        require_once(__DIR__ . '/../lib/behat/lib.php');
+        behat_clean_init_config();
+
        $CFG->wwwroot = $CFG->behat_wwwroot;
        $CFG->passwordsaltmain = 'moodle';
        $CFG->prefix = $CFG->behat_prefix;