diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php index cf70cfa88ac..b2118655ed0 100644 --- a/lib/behat/classes/util.php +++ b/lib/behat/classes/util.php @@ -108,9 +108,6 @@ class behat_util extends testing_util { set_config('debug', DEBUG_DEVELOPER); set_config('debugdisplay', 1); - // Force the navigation and settings blocks, even if the theme has made them optional. - set_config('undeletableblocktypes', 'navigation,settings'); - // Disable some settings that are not wanted on test sites. set_config('noemailever', 1); diff --git a/lib/blocklib.php b/lib/blocklib.php index e3a386883ea..2baca98e5e5 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -387,7 +387,10 @@ class block_manager { $requiredbythemeblocks = $PAGE->theme->requiredblocks; } - if ($requiredbythemeblocks === false) { + // We need blocks for behat, till MDL-56614 gets in. + if (defined('BEHAT_SITE_RUNNING')) { + return array('navigation', 'settings'); + } else if ($requiredbythemeblocks === false) { return array('navigation', 'settings'); } else if ($requiredbythemeblocks === '') { return array();