Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2016-04-11 14:29:50 +0300
committerThomas Steur <thomas.steur@gmail.com>2016-04-11 14:29:50 +0300
commit6028cac0ff0ecdefad505478fe54f770e90b60c3 (patch)
treebfd5d3a1cf91cd2a09a88a81fafbd4de956fa52c /plugins/TestRunner
parentd1683a2641a92d02057dfbe6c3c403138e36711c (diff)
parent120a7f7d54a05e85f2a8b47f7a6fd6a85464139b (diff)
Merge branch 'master' into 3.x-dev
Conflicts: core/Version.php tests/UI/expected-ui-screenshots tests/lib/screenshot-testing/support/chai-extras.js
Diffstat (limited to 'plugins/TestRunner')
-rw-r--r--plugins/TestRunner/Commands/SyncScreenshots.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/TestRunner/Commands/SyncScreenshots.php b/plugins/TestRunner/Commands/SyncScreenshots.php
index 7862d65fab..a2930edbcf 100644
--- a/plugins/TestRunner/Commands/SyncScreenshots.php
+++ b/plugins/TestRunner/Commands/SyncScreenshots.php
@@ -109,7 +109,7 @@ class SyncScreenshots extends ConsoleCommand
private function downloadScreenshot($url, $repository, $screenshot, $httpUser, $httpPassword)
{
- $downloadTo = $this->getDownloadToPath($repository) . $screenshot . '.png';
+ $downloadTo = $this->getDownloadToPath($repository) . $screenshot;
$url = 'http://builds-artifacts.piwik.org' . $url;
$this->logger->debug("Downloading {url} to {destination}", array('url' => $url, 'destination' => $downloadTo));