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:
authorStefan Giehl <stefan@matomo.org>2020-05-14 18:26:56 +0300
committerGitHub <noreply@github.com>2020-05-14 18:26:56 +0300
commitdc4c4947d0f3d9e193be4191c963b55c6018d6a2 (patch)
treeee869886d568ff363c0d84b7092899b4405bf6d7 /plugins/Installation
parente2c98248f71a91d8b57c92ed72a4b8d68539584d (diff)
Make it possible to automatically set up geoip2 in installation (#15939)
* make it possible to automatically set up geoip2 in installation * reenable skipped installation ui tests * updates expected UI files * do download in hourly task * trigger an async run of scheduled tasks to set up geoip2 * directly execute the task if possible and schedule the task only if not * improve text * updates UI test
Diffstat (limited to 'plugins/Installation')
-rw-r--r--plugins/Installation/Controller.php1
-rw-r--r--plugins/Installation/tests/UI/Installation_spec.js2
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png4
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png4
10 files changed, 17 insertions, 18 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 7c7d34cd7f..b7dbd5a60a 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -27,7 +27,6 @@ use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
use Piwik\Plugins\UsersManager\NewsletterSignup;
use Piwik\Plugins\UsersManager\UserUpdater;
-
use Piwik\ProxyHeaders;
use Piwik\SettingsPiwik;
use Piwik\Tracker\TrackerCodeGenerator;
diff --git a/plugins/Installation/tests/UI/Installation_spec.js b/plugins/Installation/tests/UI/Installation_spec.js
index 4f667bc69a..058275bc76 100644
--- a/plugins/Installation/tests/UI/Installation_spec.js
+++ b/plugins/Installation/tests/UI/Installation_spec.js
@@ -88,7 +88,7 @@ describe("Installation", function () {
expect(await page.screenshot({ fullPage: true })).to.matchImage('db_setup_fail');
});
-return; // next test times out
+
it("should display the tables created page when next is clicked on the db setup page w/ correct info entered in the form", async function() {
const dbInfo = testEnvironment.readDbInfoFromConfig();
const username = dbInfo.username;
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
index 84dc6f6ee5..20ac43f39e 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9cebcf1acea004e2e2cf7b52fa53a4a4fae19d052ebaae843f37a3700dfb7be1
-size 170481
+oid sha256:92bf44ce1f73faa4c47f15f2a93a474d31977bae3e316bdf93d4037d259d571a
+size 197253
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
index b4b7c4da10..65a2015fce 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a92c8bffb687c7ccfa1f6428dc2b601d88c291a8c460f6e6fcc49726f16112ac
-size 45398
+oid sha256:b17e4b346e715a0f59c2105cbe912606f76f3ee57ed902ea10fe47d25543c5e7
+size 44592
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
index 92a2693c4f..5a2467f16a 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:741792b60f6490bd78a8950342b550d66ddc856f76fc7aa704c2e8a1a8cc8634
-size 225156
+oid sha256:36333c400e55951cfb66bb79d4aa029799927c655b0af1ed46d6b90edfbdd161
+size 239861
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
index 96bd2dd071..ae50c0bb5d 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d64d827204c0700f762091a433a7d81378656aa5bd59f28f02e2925a4a8eaf5c
-size 76064
+oid sha256:05723d3b9fd0964b531d8521d82f38ddfae9e7858161965d4fdb3ab1c6822a4a
+size 77528
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
index 056554c1a3..d4b304ed10 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:497ecc743c1ee3fc6be4a0a8705209cbf5449f726f5f14dbd5c8b9ef0d6b764b
-size 82042
+oid sha256:289d3963995836f34f28a8d7267db5cf7cc7d7424b08bbd6da35625adf5a2156
+size 82430
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
index 9c48931855..c4e083a3ef 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f3f23ecda363335121e9084c23f48215d9f461a7263d48bec1ff93bdca990cf9
-size 90983
+oid sha256:861b47bd63e385dc821c17ea0d03b55fb2ccffb859f197af5394cf7e6ac7746b
+size 89603
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
index 8a2bc28bee..78cbbebdd5 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fd8bcf6b6f519cb339a4e4f7e1a3235e3afadc34ae23dd3c584a58b2eb199b40
-size 106822
+oid sha256:6e35a01b13411e38a785b341f70eab32577b3b9140653f7877b2bfd65b3cdc8e
+size 106065
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
index fd8e902827..172f5c8e97 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ba81a4fba3604dfde7495bf25769d89b2430bd7c518e923558db011542b76831
-size 105855
+oid sha256:a705b0d1d45e8477d9c4c055584736717e0aba329b86d77909b5e0a58865813f
+size 103334