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:
authorStefan Giehl <stefan@matomo.org>2021-01-12 14:13:40 +0300
committerGitHub <noreply@github.com>2021-01-12 14:13:40 +0300
commit5934d5eb4407d576350ff4c8735296e843a9db0d (patch)
tree017f229064522331795f730bc33f50eaf2bfcb1d /tests
parent0d979429d6f5eeaaef87dd9a6ea7d2bf4bace769 (diff)
Make admin menu collapsible (#17073)
* Make admin menu collapsible * updates expected UI files * improve/fix menu ui tests * update submodule * updates expected UI files
Diffstat (limited to 'tests')
-rw-r--r--tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png4
-rw-r--r--tests/UI/expected-screenshots/Menus_admin_changed.png4
-rw-r--r--tests/UI/expected-screenshots/Menus_admin_loaded.png4
-rw-r--r--tests/UI/expected-screenshots/Menus_admin_websites.png3
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_api_error.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_glossary.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_notifications.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png4
-rw-r--r--tests/UI/specs/Menus_spec.js9
23 files changed, 54 insertions, 42 deletions
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png
index 65a1ad89b9..8c6c669fbc 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fa82a3639fb75e1e1fcdaec8b6c1892122dd5e59153246ec54ecbab32f2bb8ee
-size 9835
+oid sha256:e5db1b3299d553b510eddf88bc01ac1023c06f462efc5840d1d12ceb117c2506
+size 9832
diff --git a/tests/UI/expected-screenshots/Menus_admin_changed.png b/tests/UI/expected-screenshots/Menus_admin_changed.png
index 3c5fed55d7..a0b897583f 100644
--- a/tests/UI/expected-screenshots/Menus_admin_changed.png
+++ b/tests/UI/expected-screenshots/Menus_admin_changed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:59b7f618ddfa675ac6f7015e3a9e80126e174d0761ad874dc89725f36c943a22
-size 59289
+oid sha256:3d4d0dc1a9fae3c3578a90eaa20cc4f9a779a97bb1a26b071221f255b4365ecd
+size 16856
diff --git a/tests/UI/expected-screenshots/Menus_admin_loaded.png b/tests/UI/expected-screenshots/Menus_admin_loaded.png
index 6ef69198b9..13b0c6635d 100644
--- a/tests/UI/expected-screenshots/Menus_admin_loaded.png
+++ b/tests/UI/expected-screenshots/Menus_admin_loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d7c9df46e7a2ac1a4792ab4f12ba06ec42dc8e1d67f97beeee7f63f38ca506f7
-size 59317
+oid sha256:99d83435f81a0d63949e62f88426b529ed4f54ef71eef5accb69ea1b93ac7232
+size 17009
diff --git a/tests/UI/expected-screenshots/Menus_admin_websites.png b/tests/UI/expected-screenshots/Menus_admin_websites.png
new file mode 100644
index 0000000000..5887e0b19d
--- /dev/null
+++ b/tests/UI/expected-screenshots/Menus_admin_websites.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04fa17259b5fee97a4518270a37916176c0d309be87020df3dca4c90a343aac0
+size 16854
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 1d15c53531..e9d32bdf61 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4e855f4370102ab6fe3c510b58f97911312d2d528077f6ddf56bf8d481d9e8e9
-size 4617420
+oid sha256:34e381cc6fb38ebe63cd2f077782eaa6199d7ce02f13105aa55d9beeb3c2c79b
+size 4618223
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
index 723ed9c1ef..db020354ac 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7d44615400b4ea2d5899779a2d981efcb44470545e214353986b4cc185252a24
-size 158906
+oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc
+size 159010
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index c8940f4e67..22764853fb 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:73114b34c9a35a6c99c8d9962cdb863b7378c8b43b0b81ddfda94ad5cd14943b
-size 442648
+oid sha256:6834f27568c174f646599f3fc9e38d82a695e9ade9c9e6d1509bac188b9ee592
+size 442940
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
index 0ca50045b3..19672aff7f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0ba1fa621d383b086213ab1e0594baf9a203291175344526aa3b5a27d06f626f
-size 203643
+oid sha256:d22be9c7e58626f8b31bec4f0b34a084ec2341dd164a69fdd91b963ff3c0f2ec
+size 203733
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
index 49fd415897..f4100cc360 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:51248a0424c5e36335d36274c7f8569dc2d627fece4c689e8fb2fbbd8f2ceb62
-size 1067191
+oid sha256:2107e0051c523ffd1be1b2f5aac35e9306713e1177a4436d3477e4e9789b6cd6
+size 1067380
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
index c81dc9e4c5..0cb6c0cbd7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8c402f9b50e7ed1d29e0ee290e9d6f47b776701649984573519cabd15c37b96c
-size 1069721
+oid sha256:225bdcd5bf2cd2a58ef83275b6db7d32e1e9e7b9aac4218db45da1b12d2c4108
+size 1069870
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index 48fd68629b..3f2be35d00 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7fb3cf9625aca5189dab9f42d29f9490b70765a5317517bf9db514e3eeab9cd5
-size 1106149
+oid sha256:90a7ad14be5467b6c040dbb0f593a3ec91aa2b63c30749459ec28f984b5ae17d
+size 1106238
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
index bc846eb275..feb1c97bcc 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0020402d2283f1867577162559e87594a20398f153ef859200768c6d0f744eb9
-size 147279
+oid sha256:dda77295620e3f3d063cdbae1a616eb361d7ba33339dba70a981767697e4c7c0
+size 147389
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
index b60b2c6572..3c4a8688d6 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:42bcc207cec4fcdda7e4cc03f0deb23bab433c23b77f3df311b414112f2ef882
-size 120084
+oid sha256:0f90c81de61a11dc755c1ec572feece95cf5cec7f4dc67b7bf2e17c2a4a81802
+size 120238
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
index fae1adeac8..dce7df2e28 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:840c3fbca67d466ec8079b402da4ef5f7f74286fc8e6978e5a09248d6196d068
-size 79078
+oid sha256:d5a24ea81cfb5b301cc60dc88ba8b640beb5f163317918164d1bb7a356c88121
+size 79192
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png
index e1e0be8145..e8a06615e6 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:775b506a1184f8e6399d4310fe48510c9b63466deda4efae76f2bc3bf1bf05bb
-size 84924
+oid sha256:59f1fec2b3363f78ccd7b2d69f1d73beba93928921de12f7a96a735dd896c2f4
+size 85070
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
index 723ed9c1ef..db020354ac 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7d44615400b4ea2d5899779a2d981efcb44470545e214353986b4cc185252a24
-size 158906
+oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc
+size 159010
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 06f5b0d6e3..243a093340 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5b13abc0e4ad9301bf72b83d5d9842ad6d98e954c680f1dedcf395b56b69c997
-size 4978469
+oid sha256:8294588b41f37f3ce2abe92ebbf94b1b304bf50975c623218d5be665f0af3050
+size 4978725
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
index 187ef099ce..f7e0216c4d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9b114fb25ab99afcc5c24592d092b3a9a43382a5231d58c3094184c93582b008
-size 95864
+oid sha256:7e8ea75d84f2291d0e2f44fb3a31c385f151b5d8c20edf6e767994efabb88c4c
+size 96022
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
index c4d66f7e95..2b7aad509c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:905850e54c3a3ace16cf914e10b0ef23aa6219c042b3e0dbdc0e81d07fc80bad
-size 475553
+oid sha256:3d1263a789717dca414cc0ee15d172919ba479daf4483e792b49dc07adacefa3
+size 475734
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
index 40453c2b8e..3c8a7d6181 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:65be736a09dabcb0956ffa92e154a9b73e6748545f5ef30614ff18eba2a5336c
-size 604316
+oid sha256:e93b71cde146772dae327214cd08350aa0c7f86cb6377d1aa10b580381fbd994
+size 604468
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png
index 7b10f030ad..6b90a55b2f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fe35485392dd6b3075533e3a3256e3a8e955b7e51f78d89abdf071de75aa1699
-size 46987
+oid sha256:c23f486e25afaabf72adbed8ce90fe878500ff243301add38b737776a2d435cc
+size 47075
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
index 70f755f83e..78f1375373 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0fd50c1507737a2a250a84f522fbf223d87300eeb2137cfc8f3d9a9ba83dea75
-size 189818
+oid sha256:528f8ed421af3afd5d06d995a66b96d3928a05e4757bd1db64c130715ce6857d
+size 190087
diff --git a/tests/UI/specs/Menus_spec.js b/tests/UI/specs/Menus_spec.js
index 56f5fffbb1..d40011cbcd 100644
--- a/tests/UI/specs/Menus_spec.js
+++ b/tests/UI/specs/Menus_spec.js
@@ -50,6 +50,15 @@ describe("Menus", function () {
expect(await element.screenshot()).to.matchImage('admin_loaded');
});
+ it('should toggle the submenu visibility when main item is clicked', async function() {
+ await openMenuItem(page, 'Website');
+ await page.mouse.move(0, 0);
+ await page.waitFor(500); // wait for animation
+
+ const element = await page.jQuery('#secondNavBar');
+ expect(await element.screenshot()).to.matchImage('admin_websites');
+ });
+
it('should change the admin page correctly when an admin menu item is clicked', async function() {
await openMenuItem(page, 'Manage');
await page.waitForNetworkIdle();