Refs #4087, add UI screenshot tests to new repository, enable tests o…

…n travis and make sure new repo is built every time integration tests pass on piwik build.

.gitignore

@@ -62,7 +62,4 @@ tests/lib/xhprof-0.9.2/extension/run-tests.php
 docs/
 composer.phar
 vendor/
-/.htaccess
-tests/PHPUnit/UI/processed-ui-screenshots
-tests/PHPUnit/UI/expected-ui-screenshots
-
+/.htaccess

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tests/PHPUnit/UI"]
+	path = tests/PHPUnit/UI
+	url = https://github.com/piwik/piwik-ui-tests.git

.travis.yml

@@ -12,9 +12,9 @@ env:
     - TEST_SUITE=PluginTests
     - TEST_SUITE=CoreTests
     - TEST_SUITE=IntegrationTests
-    #- TEST_DIR=UI
   global:
-    secure: "AMhZmPZx4SUcuZRBzGHlQPxzM4D8FvFB3UThDa52gbi9KIBrwcumzV2VGi6B\n5fgjwtB4XTE1In7qhY2HMikPWBmWYYOQ5QcMPJsqqHt4iMmahx8WKzne6NOk\nNpqAuje/fulNGeP2LJZi0nrub3Fh4VwXaOvpNloKNQN/2JuqPtM="
+    - secure: "AMhZmPZx4SUcuZRBzGHlQPxzM4D8FvFB3UThDa52gbi9KIBrwcumzV2VGi6B\n5fgjwtB4XTE1In7qhY2HMikPWBmWYYOQ5QcMPJsqqHt4iMmahx8WKzne6NOk\nNpqAuje/fulNGeP2LJZi0nrub3Fh4VwXaOvpNloKNQN/2JuqPtM="
+    - secure: "DySde80fX3dw0osGY5s5lGiGLjMleUkkONsuRDC4xjT1hAQP94FGHpPXVZV8\nAQY0s8MQmcK2eRLOQrmE9Bh1XXbGqh40s66XhSWq0hulFHxQH5OLaZXccFeu\n5WxGkHXnNDIc+CVhXW/IIbHZPO1K6hffS8fuvP1o6mYgxwFL6Xw="
 
 # Run PHP 5.4 for aa tests to generate
 # code coverage.
@@ -43,6 +43,7 @@ before_script:
 
 after_success:
   - cd $TRAVIS_BUILD_DIR
+  - ./tests/travis/initiate_ui_tests.sh
   - ./tests/travis/generate_docs.sh
 
 after_script:

core/ViewDataTable.php

@@ -1255,10 +1255,10 @@ private function overrideViewPropertiesWithQueryParams()
         // TODO: should mark properties that are overridable so not all properties can be overidden this way
         $queryParams = $_GET + $_POST;
         foreach ($queryParams as $name => $value) {
-            if (empty($queryParams[$name])) {
+            if (empty($value)) {
                 continue;
             }
-            
+
             $value = Common::getRequestVar($name, $default = null, $type = null, $queryParams);
 
             if (Properties::isCoreViewProperty($name)) {

plugins/CoreVisualizations/javascripts/jqplot.js

@@ -101,7 +101,7 @@
                     tickOptions: {
                         showMark: false,
                         fontSize: '11px',
-                        fontFamily: 'Arial'
+                        fontFamily: window.piwik.jqplotLabelFont || 'Arial'
                     },
                     rendererOptions: {
                         drawBaseline: false
@@ -860,7 +860,7 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
 
         var ctx = legend.legendCanvas._ctx;
         ctx.save();
-        ctx.font = '11px Arial';
+        ctx.font = '11px ' + (window.piwik.jqplotLabelFont || 'Arial');
 
         // render series names
         var x = 0;
@@ -996,7 +996,7 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
         var ctx = legend.pieLegendCanvas._ctx;
         ctx.save();
 
-        ctx.font = '11px Arial';
+        ctx.font = '11px ' + (window.piwik.jqplotLabelFont || 'Arial');
 
         // render labels
         var height = legend.pieLegendCanvas._elem.height();

tests/PHPUnit/TestingEnvironment.php

@@ -19,6 +19,17 @@ public static function addHooks()
         });
         Piwik_AddAction('Config.createConfigSingleton', function($config) {
             $config->setTestEnvironment();
+
+            $pluginsToLoad = array(
+                "CorePluginsAdmin", "CoreAdminHome", "CoreHome", "Proxy", "API", "Widgetize", "Transitions",
+                "LanguagesManager", "Actions", "Dashboard", "MultiSites", "Referers", "UserSettings", "Goals",
+                "SEO", "UserCountry", "VisitsSummary", "VisitFrequency", "VisitTime", "VisitorInterest",
+                "ExampleAPI", "ExamplePlugin", "ExampleRssWidget", "Provider", "Feedback", "Login", "UsersManager",
+                "SitesManager", "Installation", "CoreUpdater", "PDFReports", "UserCountryMap", "Live",
+                "CustomVariables", "PrivacyManager", "ImageGraph", "DoNotTrack", "Annotations", "MobileMessaging",
+                "Overlay", "SegmentEditor", "VisitorGenerator", "DevicesDetection", "DBStats",
+            );
+            $config->Plugins = array('Plugins' => $pluginsToLoad);
         });
         Piwik_AddAction('FrontController.dispatch', function() {
             \Piwik\Plugins\CoreVisualizations\Visualizations\Cloud::$debugDisableShuffle = true;

tests/PHPUnit/UITest.php

@@ -26,10 +26,8 @@ public static function createAccessInstance()
 
     public static function setUpBeforeClass()
     {
-        if (!self::isXvfbAvailable()) {
-            self::markTestSkipped("xvfb is not available, skipping UI integration tests. (install with 'sudo apt-get install xvfb')");
-        } else if (self::CAPTURE_PROGRAM == 'slimerjs'
-                   && !self::isSlimerJsAvailable()
+        if (self::CAPTURE_PROGRAM == 'slimerjs'
+            && !self::isSlimerJsAvailable()
         ) {
             self::markTestSkipped("slimerjs is not available, skipping UI integration tests. "
                                 . "(install by downloading http://slimerjs.org/download.html)");
@@ -51,17 +49,25 @@ public static function setUpBeforeClass()
         // make sure processed & expected dirs exist
         self::makeDirsAndLinks();
 
-        // run slimerjs/phantomjs w/ all urls so we only invoke it once
-        $urls = array();
-        foreach (static::getUrlsForTesting() as $testInfo) {
-            list($name, $urlQuery) = $testInfo;
+        // run slimerjs/phantomjs w/ all urls so we only invoke it once per 25 entries (travis needs
+        // there to be output)
+        $urlsToTest = static::getUrlsForTesting();
 
-            list($processedScreenshotPath, $expectedScreenshotPath) = self::getProcessedAndExpectedScreenshotPaths($name);
-            $urls[] = array($processedScreenshotPath, self::getProxyUrl() . $urlQuery);
+        reset($urlsToTest);
+        for ($i = 0; $i < count($urlsToTest); $i += 25) {
+            $urls = array();
+            for ($j = $i; $j != $i + 25 && $j < count($urlsToTest); ++$j) {
+                list($name, $urlQuery) = current($urlsToTest);
+
+                list($processedScreenshotPath, $expectedScreenshotPath) = self::getProcessedAndExpectedScreenshotPaths($name);
+                $urls[] = array($processedScreenshotPath, self::getProxyUrl() . $urlQuery);
+
+                next($urlsToTest);
+            }
+
+            echo "Generating screenshots...\n";
+            self::runCaptureProgram($urls);
         }
-
-        echo "Generating screenshots...\n";
-        self::runCaptureProgram($urls);
     }
 
     public static function tearDownAfterClass()
@@ -100,7 +106,6 @@ private static function runCaptureProgram($urlInfo)
     {
         file_put_contents(PIWIK_INCLUDE_PATH . '/tmp/urls.txt', json_encode($urlInfo));
         $cmd = self::CAPTURE_PROGRAM . " \"" . PIWIK_INCLUDE_PATH . "/tests/resources/screenshot-capture/capture.js\" 2>&1";
-        $cmd = 'xvfb-run --server-args="-screen 0, 1024x768x24" ' . $cmd;
 
         exec($cmd, $output, $result);
         $output = implode("\n", $output);
@@ -140,11 +145,6 @@ private static function isPhantomJsAvailable()
         return self::isProgramAvailable('phantomjs');
     }
 
-    private static function isXvfbAvailable()
-    {
-        return self::isProgramAvailable('xvfb-run');
-    }
-
     private static function isProgramAvailable($name)
     {
         exec($name . ' --help 2>&1', $output, $result);
@@ -176,7 +176,7 @@ public static function getProxyUrl()
 
     private static function makeDirsAndLinks()
     {
-        $dirs = self::getProcessedAndExpectedDirs();
+        $dirs = array_merge(self::getProcessedAndExpectedDirs(), array(PIWIK_INCLUDE_PATH . '/tmp/sessions'));
         foreach ($dirs as $dir) {
             if (!is_dir($dir)) {
                 mkdir($dir);

tests/resources/screenshot-capture/capture.js

@@ -2,6 +2,8 @@ var fs = require('fs');
 var app = typeof slimer === 'undefined' ? phantom : slimer;
 var readFileSync = fs.readFileSync || fs.read;
 
+var VERBOSE = false;
+
 var PageRenderer = function() {
     this.start = new Date();
 
@@ -11,6 +13,9 @@ var PageRenderer = function() {
     this.outputPath = '';
     this.url = '';
 
+    this.webpage = require('webpage').create();
+    this._setupWebpageEvents();
+
     this._setScriptTimeout();
 };
 
@@ -36,32 +41,21 @@ PageRenderer.prototype = {
 
         this.webpage = require('webpage').create();
         this._setupWebpageEvents();
-        
+
         this.webpage.viewportSize = {width:1350, height:768};
 
-        var self = this;
-        this.webpage.open(this.url, function () {
-            self._setPageTimeouts();
-        });
+        this.webpage.open(this.url);
+        this._setPageTimeouts();
     },
 
     _setPageTimeouts: function () {
         var url = this.url, self = this;
 
-        // in case there are no ajax requests, try triggering after a sec
-        setTimeout(function () {
-            if (url == self.url) {
-                self.webpage.evaluate(function () {
-                    window.piwik.ajaxRequestFinished();
-                });
-            }
-        }, 1000)
-
         // only allowed at most one minute to load
         setTimeout(function () {
             if (url == self.url) {
                 self.webpage.evaluate(function () {
-                    window.piwik._triggerRenderInsane();
+                    console.log("__AJAX_DONE__");
                 });
             }
         }, 1000 * 60);
@@ -88,6 +82,18 @@ PageRenderer.prototype = {
                 console.log("LOGGED: " + message);
             }
         };
+
+        if (VERBOSE) {
+            this.webpage.onResourceReceived = function (response) {
+                console.log('Response (#' + response.id + ', stage "' + response.stage + '", size "' + response.bodySize +
+                            '", status "' + response.status + '"): ' + response.url);
+            };
+        }
+
+        this.webpage.onResourceError = function (resourceError) {
+            console.log('Unable to load resource (#' + resourceError.id + 'URL:' + resourceError.url + ')');
+            console.log('Error code: ' + resourceError.errorCode + '. Description: ' + resourceError.errorString);
+        };
     },
 
     _renderNextUrl: function () {
@@ -114,7 +120,7 @@ PageRenderer.prototype = {
         setTimeout(function() {
             console.log("ERROR: Timed out!");
             app.exit(1);
-        }, Math.max(1000 * 15 * this.urls.length, 1000 * 60 * 5));
+        }, Math.max(1000 * 15 * this.urls.length, 1000 * 60 * 10));
     },
 };