Make sure superuser isn't removed when --persist-fixture-data is used for UI...

Make sure superuser isn't removed when --persist-fixture-data is used for UI tests & remove unneeded override.js.

tests/PHPUnit/Fixture.php

@@ -60,6 +60,7 @@ class Fixture extends PHPUnit_Framework_Assert
     public $dropDatabaseInTearDown = true;
     public $loadTranslations = true;
     public $createSuperUser = true;
+    public $removeExistingSuperUser = true;
     public $overwriteExisting = true;
     public $configureComponents = true;
     public $persistFixtureData = false;
@@ -94,6 +95,7 @@ class Fixture extends PHPUnit_Framework_Assert
                 $this->dropDatabaseInSetUp = false;
                 $this->dropDatabaseInTearDown = false;
                 $this->overwriteExisting = false;
+                $this->removeExistingSuperUser = false;
 
                 Config::getInstance()->database_tests['dbname'] = Config::getInstance()->database['dbname'] = $this->dbName;
                 Config::getInstance()->saveConfigOverride();
@@ -160,7 +162,7 @@ class Fixture extends PHPUnit_Framework_Assert
         }
 
         if ($this->createSuperUser) {
-            self::createSuperUser($removeExisting = true);
+            self::createSuperUser($this->removeExistingSuperUser);
         }
 
         if ($setupEnvironmentOnly) {
@@ -427,7 +429,7 @@ class Fixture extends PHPUnit_Framework_Assert
         );
     }
 
-    public static function createSuperUser($removeExisting = false)
+    public static function createSuperUser($removeExisting = true)
     {
         $login = self::ADMIN_USER_LOGIN;
         $password = UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD);

tests/PHPUnit/Fixtures/UITestFixture.php

@@ -14,7 +14,7 @@ use Piwik\AssetManager;
 use Piwik\Date;
 
 /**
- * TODO
+ * Fixture for UI tests.
  */
 class UITestFixture extends OmniFixture
 {

UI @ 1fb30650

-Subproject commit 176cb6555939159b7bcf17f9e691bca90b76999e
+Subproject commit 1fb30650d8152bc6df694fac7920083e4a50b7cf

tests/resources/screenshot-override/override.js

-(function ($) {
-
-    var DEBUG_LOGGING = true;
-    
-    if (DEBUG_LOGGING) {
-        var log = function(message) {
-            console.log(message);
-        };
-    } else {
-        var log = function() {};
-    }
-
-    var triggerRenderInsane = function () {
-        console.log("__AJAX_DONE__");
-    };
-    
-    var triggerRender = function () {
-        if (window.globalAjaxQueue.active === 0) { // sanity check
-            triggerRenderInsane();
-        }
-    };
-
-    var triggerRenderIfNoAjax = function () {
-        setTimeout(function () { // allow other javascript to execute in case they execute ajax/add images/set the src of images
-            if (window.globalAjaxQueue.active === 0) {
-                $('body').waitForImages({
-                    waitForAll: true,
-                    finished: function () {
-                        // wait some more to make sure other javascript is executed & the last image is rendered
-                        setTimeout(triggerRender, 10000);
-                    },
-                });
-            }
-        }, 1);
-    };
-
-    window.piwik = window.piwik || {};
-    window.piwik.ajaxRequestFinished = triggerRenderIfNoAjax;
-    window.piwik._triggerRenderInsane = triggerRenderInsane;
-
-}(jQuery));
\ No newline at end of file