Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle

This commit is contained in:
David Monllao 2015-02-16 16:51:51 +08:00
commit a27b8c9b3b
5 changed files with 45 additions and 2 deletions

View file

@ -205,6 +205,9 @@ class behat_hooks extends behat_base {
$user = $DB->get_record('user', array('username' => 'admin'));
\core\session\manager::set_user($user);
// Enable web cron.
set_config('cronclionly', 0);
// Reset the browser if specified in config.php.
if (!empty($CFG->behat_restart_browser_after) && $this->running_javascript()) {
$now = time();