MDL-56614 behat: new steps for navigation without blocks

2016-12-06 13:35:39 +08:00
parent b182239f21
commit a0b0234a18
15 changed files with 441 additions and 75 deletions
@@ -387,10 +387,7 @@ class block_manager {
            $requiredbythemeblocks = $PAGE->theme->requiredblocks;
        }

-        // We need blocks for behat, till MDL-56614 gets in.
-        if (defined('BEHAT_SITE_RUNNING')) {
-            return array('navigation', 'settings');
-        } else if ($requiredbythemeblocks === false) {
+        if ($requiredbythemeblocks === false) {
            return array('navigation', 'settings');
        } else if ($requiredbythemeblocks === '') {
            return array();