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
path: root/tests
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2020-09-19 15:55:30 +0300
committerGitHub <noreply@github.com>2020-09-19 15:55:30 +0300
commit62fcad39c4f0c5d8c0d75b2456a4ac07f7b106a5 (patch)
treec81cdbc3dfc266f311d91343262f7a9fb552deca /tests
parent43ddd49a1eab9568701a64352cbda2d754d17715 (diff)
Fix one click update test (#16445)
* use lower major version in oneclickupdate test * use correcct submodule * update screenshots
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/Fixtures/LatestStableInstall/GitCommitReleaseChannel.php6
-rw-r--r--tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png4
-rw-r--r--tests/UI/expected-screenshots/OneClickUpdate_update_screen.png4
-rw-r--r--tests/UI/expected-screenshots/OneClickUpdate_update_success.png4
-rw-r--r--tests/resources/one-click-update-version.php2
5 files changed, 12 insertions, 8 deletions
diff --git a/tests/PHPUnit/Fixtures/LatestStableInstall/GitCommitReleaseChannel.php b/tests/PHPUnit/Fixtures/LatestStableInstall/GitCommitReleaseChannel.php
index 67e7a2b546..edac9a16a5 100644
--- a/tests/PHPUnit/Fixtures/LatestStableInstall/GitCommitReleaseChannel.php
+++ b/tests/PHPUnit/Fixtures/LatestStableInstall/GitCommitReleaseChannel.php
@@ -5,6 +5,7 @@ namespace Piwik\Plugins\CoreUpdater\ReleaseChannel;
use Piwik\UpdateCheck\ReleaseChannel;
use Piwik\Url;
+use Piwik\Version;
class GitCommitReleaseChannel extends ReleaseChannel
{
@@ -20,7 +21,10 @@ class GitCommitReleaseChannel extends ReleaseChannel
public function getUrlToCheckForLatestAvailableVersion()
{
- return 'http://' . Url::getHost(false) . '/tests/resources/one-click-update-version.php';
+ $majorVersion = (int) Version::VERSION;
+ $majorVersion += 1;
+
+ return 'http://' . Url::getHost(false) . '/tests/resources/one-click-update-version.php?v=' . $majorVersion;
}
public function getDownloadUrlWithoutScheme($version)
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
index 9c1539b2a2..cd132f5882 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0ef870dd7c5b44b16946e86594075053f9358ba43d95bdc903a68ec5780bb433
-size 3018
+oid sha256:f32cc042e377cfd2cb1ef7e95d53b69c7510964df5b51402f0b995a7910f538c
+size 3014
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
index f33e05101a..efb14ae531 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:83d9923b39c9979ae27da315e60aa357a56f6aa4b415ac31999c61a31d9eca96
-size 43830
+oid sha256:75d614e2093741c9d9f7faae260a0a1c96b52c05ebeaf8b0dfdf9b3777453dfa
+size 62610
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png
index fb2b2b33a5..73c92c3fa1 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a58343f0d94229314d5d5def9e52415bc99fb4fe8a7a4c2a8b34c4ae7e8e04c7
-size 74684
+oid sha256:74318d92def0f55e708f85695c4cf25396be2a66677ba6b31c4bea446c53f369
+size 73864
diff --git a/tests/resources/one-click-update-version.php b/tests/resources/one-click-update-version.php
index 53a2481509..87d20c4521 100644
--- a/tests/resources/one-click-update-version.php
+++ b/tests/resources/one-click-update-version.php
@@ -1,3 +1,3 @@
<?php
-echo '99.99.99';
+echo $_GET['v'] . '.99.99';