Skip to content
Extraits de code Groupes Projets
Valider 4a43a373 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

for github pass only filename and renamed github link

parent 3dd18db7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -40,6 +40,7 @@ class SyncUITestScreenshots extends ConsoleCommand ...@@ -40,6 +40,7 @@ class SyncUITestScreenshots extends ConsoleCommand
$urlBase = sprintf('http://builds-artifacts.piwik.org/ui-tests.master/%s', $buildNumber); $urlBase = sprintf('http://builds-artifacts.piwik.org/ui-tests.master/%s', $buildNumber);
$diffviewer = Http::sendHttpRequest($urlBase . "/screenshot-diffs/diffviewer.html", $timeout = 60); $diffviewer = Http::sendHttpRequest($urlBase . "/screenshot-diffs/diffviewer.html", $timeout = 60);
$diffviewer = str_replace('&', '&', $diffviewer);
$dom = new \DOMDocument(); $dom = new \DOMDocument();
$dom->loadHTML($diffviewer); $dom->loadHTML($diffviewer);
......
Subproject commit 63ea53008dd59373bdbd4eda26dd87d70f665151 Subproject commit eba04701127fd491b15efe1d0d88e0a1494911bc
...@@ -68,7 +68,7 @@ DiffViewerGenerator.prototype.generate = function (callback) { ...@@ -68,7 +68,7 @@ DiffViewerGenerator.prototype.generate = function (callback) {
} }
expectedHtml += '<a href="' + expectedUrl + '">Expected</a>&nbsp;'; expectedHtml += '<a href="' + expectedUrl + '">Expected</a>&nbsp;';
expectedHtml += '<a href="' + expectedUrlGithub + '">[Github]</a>'; expectedHtml += '<a href="' + expectedUrlGithub + '">[Github Master]</a>';
} else { } else {
var expectedHtml = '<em>Not found</em>'; var expectedHtml = '<em>Not found</em>';
} }
...@@ -93,7 +93,7 @@ DiffViewerGenerator.prototype.generate = function (callback) { ...@@ -93,7 +93,7 @@ DiffViewerGenerator.prototype.generate = function (callback) {
<td>' + entry.name + entryLocationHint + '</td>\ <td>' + entry.name + entryLocationHint + '</td>\
<td>' + expectedHtml + '</td>\ <td>' + expectedHtml + '</td>\
<td>' + (entry.processed ? ('<a href="' + entry.processedUrl + '">Processed</a>') : '<em>Not found</em>') + '</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>'; </tr>';
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter