Merge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle

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);
 

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();