Use FakeAccess class in DI test.php instead of Piwik_MockAccess. Remove Piwik_MockAccess since it is no longer used.

1 files changed, 5 insertions, 4 deletions

diff --git a/config/environment/test.php b/config/environment/test.php
index 280902f0eb..ce71427b50 100644
--- a/config/environment/test.php
+++ b/config/environment/test.php
@@ -2,10 +2,8 @@
 
 use Interop\Container\ContainerInterface;
 use Piwik\Common;
-use Piwik\DbHelper;
-use Piwik\Option;
+use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\Mock\TestConfig;
-use Piwik\Tests\Framework\Piwik_MockAccess;
 use Piwik\Tests\Framework\TestingEnvironmentVariables;
 
 return array(
@@ -41,7 +39,10 @@ return array(
     'Piwik\Access' => DI\decorate(function ($previous, ContainerInterface $c) {
         $testingEnvironment = $c->get('Piwik\Tests\Framework\TestingEnvironmentVariables');
         if ($testingEnvironment->testUseMockAuth) {
-            return new Piwik_MockAccess($previous);
+            $access = new FakeAccess();
+            FakeAccess::$superUser = true;
+            FakeAccess::$superUserLogin = 'superUserLogin';
+            return $access;
         } else {
             return $previous;
         }