By default, use real Access instance in test DI config. In UI tests, default to using mock access.

config/environment/test.php

@@ -42,7 +42,7 @@ return array(
 
         array('Access.createAccessSingleton', function ($access) {
             $testingEnvironment = new TestingEnvironment();
-            if (!$testingEnvironment->testUseRegularAuth) {
+            if ($testingEnvironment->testUseMockAuth) {
                 $access = new Piwik_MockAccess($access);
                 \Piwik\Access::setSingletonInstance($access);
             }

tests/UI/specs/Installation_spec.js

@@ -14,7 +14,7 @@ describe("Installation", function () {
     this.fixture = null;
 
     before(function () {
-        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.testUseMockAuth = 0;
         testEnvironment.configFileLocal = path.join(PIWIK_INCLUDE_PATH, "/tmp/test.config.ini.php");
         testEnvironment.dontUseTestConfig = true;
         testEnvironment.tablesPrefix = 'piwik_';
@@ -29,7 +29,7 @@ describe("Installation", function () {
         delete testEnvironment.configFileLocal;
         delete testEnvironment.dontUseTestConfig;
         delete testEnvironment.tablesPrefix;
-        delete testEnvironment.testUseRegularAuth;
+        delete testEnvironment.testUseMockAuth;
         testEnvironment.save();
     });
 

tests/UI/specs/Login_spec.js

@@ -14,13 +14,13 @@ describe("Login", function () {
         formlessLoginUrl = "?module=Login&action=logme&login=oliverqueen&password=" + md5Pass;
 
     before(function () {
-        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.testUseMockAuth = 0;
         testEnvironment.queryParamOverride = {date: "2012-01-01", period: "year"};
         testEnvironment.save();
     });
 
     after(function () {
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         delete testEnvironment.queryParamOverride;
         testEnvironment.save();
     });

tests/UI/specs/Overlay_spec.js

-/*!
+    /*!
  * Piwik - free/libre analytics platform
  *
  * Overlay screenshot tests.

tests/UI/specs/UIIntegration_spec.js

@@ -31,13 +31,13 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
 
     beforeEach(function () {
         delete testEnvironment.configOverride;
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         testEnvironment.save();
     });
 
     after(function () {
         delete testEnvironment.queryParamOverride;
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         testEnvironment.save();
     });
 
@@ -593,7 +593,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
     // opt out page
     it('should load the opt out page correctly', function (done) {
         expect.screenshot('opt_out').to.be.capture(function (page) {
-            testEnvironment.testUseRegularAuth = 1;
+            testEnvironment.testUseMockAuth = 0;
             testEnvironment.save();
 
             page.load("?module=CoreAdminHome&action=optOut&language=en");

tests/lib/screenshot-testing/support/test-environment.js

@@ -22,6 +22,7 @@ TestingEnvironment.prototype.reload = function () {
     this['useOverrideCss'] = true;
     this['useOverrideJs'] = true;
     this['loadRealTranslations'] = true; // UI tests should test w/ real translations, not translation keys
+    this['testUseMockAuth'] = true;
 
     if (fs.exists(testingEnvironmentOverridePath)) {
         var data = JSON.parse(fs.read(testingEnvironmentOverridePath));