From 4a43a3736c4ba46a99469b70d2d2381800580fd0 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Wed, 28 May 2014 05:59:38 +0200
Subject: [PATCH] for github pass only filename and renamed github link
---
plugins/CoreConsole/Commands/SyncUITestScreenshots.php | 1 +
tests/PHPUnit/UI | 2 +-
tests/lib/screenshot-testing/support/diff-viewer.js | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php
index 3deb5d72e1..6e5770d421 100644
--- a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php
+++ b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php
@@ -40,6 +40,7 @@ class SyncUITestScreenshots extends ConsoleCommand
$urlBase = sprintf('http://builds-artifacts.piwik.org/ui-tests.master/%s', $buildNumber);
$diffviewer = Http::sendHttpRequest($urlBase . "/screenshot-diffs/diffviewer.html", $timeout = 60);
+ $diffviewer = str_replace('&', '&', $diffviewer);
$dom = new \DOMDocument();
$dom->loadHTML($diffviewer);
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 63ea53008d..eba0470112 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 63ea53008dd59373bdbd4eda26dd87d70f665151
+Subproject commit eba04701127fd491b15efe1d0d88e0a1494911bc
diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js
index 81ce164d15..bf7ee61183 100644
--- a/tests/lib/screenshot-testing/support/diff-viewer.js
+++ b/tests/lib/screenshot-testing/support/diff-viewer.js
@@ -68,7 +68,7 @@ DiffViewerGenerator.prototype.generate = function (callback) {
}
expectedHtml += '<a href="' + expectedUrl + '">Expected</a> ';
- expectedHtml += '<a href="' + expectedUrlGithub + '">[Github]</a>';
+ expectedHtml += '<a href="' + expectedUrlGithub + '">[Github Master]</a>';
} else {
var expectedHtml = '<em>Not found</em>';
}
@@ -93,7 +93,7 @@ DiffViewerGenerator.prototype.generate = function (callback) {
<td>' + entry.name + entryLocationHint + '</td>\
<td>' + expectedHtml + '</td>\
<td>' + (entry.processed ? ('<a href="' + entry.processedUrl + '">Processed</a>') : '<em>Not found</em>') + '</td>\
- <td>' + (expectedUrl ? ('<a href="singlediff.html?processed=' + entry.processedUrl + '&expected=' + expectedUrl + '&github=' + expectedUrlGithub + '">Difference</a>') : '<em>Could not create diff.</em>') + '</td>\
+ <td>' + (expectedUrl ? ('<a href="singlediff.html?processed=' + entry.processedUrl + '&expected=' + expectedUrl + '&github=' + path.basename(entry.processed) + '">Difference</a>') : '<em>Could not create diff.</em>') + '</td>\
</tr>';
}
--
GitLab