Merge branch 'master' into 3.0-m07

3 files changed, 19 insertions, 6 deletions

diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js
index e796d46903..7494b8910a 100644
--- a/tests/lib/screenshot-testing/support/chai-extras.js
+++ b/tests/lib/screenshot-testing/support/chai-extras.js
@@ -60,13 +60,26 @@ function getPageLogsString(pageLogs, indent) {
 // add capture assertion
 var pageRenderer = new PageRenderer(config.piwikUrl + path.join("tests", "PHPUnit", "proxy"));
 
+function getExpectedScreenshotPath() {
+
+    if (typeof config.expectedScreenshotsDir == 'string') {
+        config.expectedScreenshotsDir = [config.expectedScreenshotsDir];
+    }
+    for (var dir in config.expectedScreenshotsDir) {
+        var expectedScreenshotDir = path.join(app.runner.suite.baseDirectory, config.expectedScreenshotsDir[dir]);
+        if (fs.isDirectory(expectedScreenshotDir)) {
+            break;
+        }
+    }
+
+    return expectedScreenshotDir;
+}
 
 function getExpectedFilePath(fileName) {
-    var expectedScreenshotDir = path.join(app.runner.suite.baseDirectory, config.expectedScreenshotsDir);
 
     fileName = assumeFileIsImageIfNotSpecified(fileName);
 
-    return path.join(expectedScreenshotDir, fileName);
+    return path.join(getExpectedScreenshotPath(), fileName);
 }
 
 function getProcessedFilePath(fileName) {
diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js
index 58321a201d..a3fc42d9b7 100644
--- a/tests/lib/screenshot-testing/support/diff-viewer.js
+++ b/tests/lib/screenshot-testing/support/diff-viewer.js
@@ -58,10 +58,10 @@ DiffViewerGenerator.prototype.generate = function (callback) {
 
                 var filename       = entry.name,
                     expectedUrl    = filename,
-                    screenshotRepo = options['screenshot-repo'] || 'piwik/piwik-ui-tests',
-                    pathPrefix     = options['screenshot-repo'] ? '/Test/UI' : '',
+                    screenshotRepo = options['screenshot-repo'] || 'piwik/piwik',
+                    pathPrefix     = options['screenshot-repo'] ? '/Test/UI' : '/tests/UI',
                     expectedUrlGithub = 'https://raw.githubusercontent.com/' + screenshotRepo + '/master' + pathPrefix
-                                      + '/expected-ui-screenshots/' + filename;
+                                      + '/expected-screenshots/' + filename;
 
                 var expectedHtml = '';
 
diff --git a/tests/lib/screenshot-testing/support/globals.js b/tests/lib/screenshot-testing/support/globals.js
index dbbed49c0a..6448ab2224 100644
--- a/tests/lib/screenshot-testing/support/globals.js
+++ b/tests/lib/screenshot-testing/support/globals.js
@@ -13,7 +13,7 @@ var __dirname = phantom.libraryPath;
 
 var PIWIK_INCLUDE_PATH = path.join(__dirname, '..', '..', '..');
 
-var uiTestsDir = path.join(PIWIK_INCLUDE_PATH, 'tests', 'UI')
+var uiTestsDir = path.join(PIWIK_INCLUDE_PATH, 'tests', 'UI');
 
 var testsLibDir = path.join(__dirname, "..", "..", "lib");