From 6912bad4716cd090acdedb4376bc5e89bf81e918 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Thu, 17 Nov 2016 13:07:09 +0800
Subject: [PATCH] MDL-57007 behat: assume all capabilities during installation

---
 admin/tool/behat/cli/run.php | 1 -
 lib/accesslib.php            | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/tool/behat/cli/run.php b/admin/tool/behat/cli/run.php
index f8a37e77523..eb5f60e8aa7 100644
--- a/admin/tool/behat/cli/run.php
+++ b/admin/tool/behat/cli/run.php
@@ -26,7 +26,6 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
     die(); // No access from web!
 }
 
-define('BEHAT_UTIL', true);
 define('CLI_SCRIPT', true);
 define('ABORT_AFTER_CONFIG', true);
 define('CACHE_DISABLE_ALL', true);
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 19033df02f0..5ee1c7f6a4f 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -366,7 +366,11 @@ function has_capability($capability, context $context, $user = null, $doanything
     global $USER, $CFG, $SCRIPT, $ACCESSLIB_PRIVATE;
 
     if (during_initial_install()) {
-        if ($SCRIPT === "/$CFG->admin/index.php" or $SCRIPT === "/$CFG->admin/cli/install.php" or $SCRIPT === "/$CFG->admin/cli/install_database.php") {
+        if ($SCRIPT === "/$CFG->admin/index.php"
+                or $SCRIPT === "/$CFG->admin/cli/install.php"
+                or $SCRIPT === "/$CFG->admin/cli/install_database.php"
+                or (defined('BEHAT_UTIL') and BEHAT_UTIL)
+                or (defined('PHPUNIT_UTIL') and PHPUNIT_UTIL)) {
             // we are in an installer - roles can not work yet
             return true;
         } else {