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>2021-09-01 16:37:38 +0300
committerGitHub <noreply@github.com>2021-09-01 16:37:38 +0300
commita3ee690ea3863ff16a828ac0afbc77243bb45f5b (patch)
tree77f3341e86608894b1020725700b348bbcd44567 /plugins/MultiSites
parentba1facfd1ecb4e618f3162aedbdb3170e9461e50 (diff)
Use newer version of Puppeteer for UI tests (#17880)
* Use latest version of Puppeteer for UI tests * use newer node on travis * test * use waitForTimeout / waitForSelector instead of waitFor * Handle BC for removed waitFor method * Updates expected UI test files * update submodules * improve/fix some UI tests * Updates expected UI test files * improve/fix some UI tests * update url-parse dependency * simplify some UI tests * update screenshot * avoid using merged assets that are broken * fix expected compare exit code * don't use merged assets for TwoFactorAuth UI tests it seems due to too many requests to login, logout and other pages merging the CoreJS assets somehow fails, and results in returning an empty file. Even the reload fails to serve the correct content, so maybe the file, the content should be written to, is somehow locked. Disabling the merged assets seems to fix this issue for this tests. Locally the tests are also running correctly with merged assets. * improve handling of automatic css / js reloading in UI tests * increase timeouts of TwoFactorAuth UI tests * fix 2fa ui test * revert change * update new screenshot * updates UI screenshots * submodule updates
Diffstat (limited to 'plugins/MultiSites')
-rw-r--r--plugins/MultiSites/tests/UI/MultiSites_spec.js2
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png4
6 files changed, 11 insertions, 11 deletions
diff --git a/plugins/MultiSites/tests/UI/MultiSites_spec.js b/plugins/MultiSites/tests/UI/MultiSites_spec.js
index d043ec0fda..5c6856cf28 100644
--- a/plugins/MultiSites/tests/UI/MultiSites_spec.js
+++ b/plugins/MultiSites/tests/UI/MultiSites_spec.js
@@ -44,7 +44,7 @@ describe("MultiSitesTest", function () {
it('should load the all websites dashboard correctly', async function() {
await page.goto("?" + generalParams + "&module=MultiSites&action=index");
- await page.waitFor(500);
+ await page.waitForTimeout(500);
await page.waitForNetworkIdle();
expect(await page.screenshotSelector(selector)).to.matchImage('all_websites');
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index b75b6f2b4b..8344dbbe7c 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:827c39b6477d331340650288de48c389fa345115cf5cb52a1b1ae97cc2d83f43
-size 281242
+oid sha256:438e52f1fa6410fc55c8c3c9569ad075068bf3cac9798d96395705b8dec106db
+size 283053
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index 089787d20b..8434198e43 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f866b750ce195cbf1f250213de7d128e562d7bab2ec10a58c9365ce79595ee9b
-size 56046
+oid sha256:154a12a32098b5a46b45f3c41f6a006e92edc80a159e4cd893e04ce0e1316ef8
+size 56207
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index 8522855680..0f53d2cf80 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a477ea5a3e53e3a1e82181385159e312b79d97792f084868c62c9ef14225d41d
-size 72809
+oid sha256:527984361b44bbf7d7903e1b8c37994df2fe08f2d32fe82bc56d1adbc121faff
+size 73075
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
index a204ad66f1..c735b5fe75 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b46bed462c5fca2eda732e8e680eafd6edf147c38df617f2ce0b5222b7371216
-size 244905
+oid sha256:ca5cdfdbcc53b91c26c0d2a5fadd06857dedbd0b4dc608b865c5aa62a7b0d2ff
+size 245998
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index 1e521d9989..ad8f299b87 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c0f8a6ba0033f2a3844dec327de82b547481f4b97b5bdd50b7d3955c9157b1fb
-size 56046
+oid sha256:76e8dce8a637a01ee34e473ae69df607a2b5d88b549df997f5768ac934cc2093
+size 56231