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:
authordiosmosis <diosmosis@users.noreply.github.com>2019-05-15 02:43:15 +0300
committerGitHub <noreply@github.com>2019-05-15 02:43:15 +0300
commit0af1f22f728b2bb2232f84ace5f4b5f0c3c60c57 (patch)
tree0eb34d450b850c1fe4253261d5e6c7de9edd3b33 /plugins/UsersManager
parent4b81b3b8eea9d0e361a5219164b08b850a30392d (diff)
Indent actions belonging to a pageview (#14063)
* Proof of concept for grouping actions by the page they occur in. * Add pageview to goals/ecommerce actionDetails in Live.getLastVisitsDetails. * Make count of actions to display when collapsed configurable. * Quick selector fix. * unfinished commit * Collapse multiple adjacent content items in the visitor log. * Get content collapsing to work w/ 3.x-dev changes. * Forgot to add Live config file. * Get to work w/ visitor profile and make sure last action does not have border so it looks like it correctly ends. * Fix some issues from review. * More styling tweaks. * another styling tweak * Update screenshots. * Show page refreshes and allow expanding them in new implementation. * Update some screenshots. * Make sure tooltip is replaced correctly when showing refreshes. * Another styling tweak. * Add UI test + fix page refresh issue. * Fix action group merging logic. * Fix another actions grouping issue. * Fixes for ending left border in certain edge cases. * Another UI tweak. * comparison threshold, random failure fix, update screenshots + another css tweak * more css tweaks * possible bug fix * Last couple CSS fixes. * More test fixes.
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/tests/UI/UsersManager_spec.js4
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png4
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/UsersManager/tests/UI/UsersManager_spec.js b/plugins/UsersManager/tests/UI/UsersManager_spec.js
index 7a824728bd..6a7482ba5d 100644
--- a/plugins/UsersManager/tests/UI/UsersManager_spec.js
+++ b/plugins/UsersManager/tests/UI/UsersManager_spec.js
@@ -165,6 +165,9 @@ describe("UsersManager", function () {
await (await page.jQuery('.delete-user-confirm-modal .modal-close:not(.modal-no):visible')).click();
await page.waitForNetworkIdle();
+ await page.mouse.move(-10, -10);
+ await page.waitFor('.pagedUsersList:not(.loading)');
+
expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_single');
});
@@ -177,6 +180,7 @@ describe("UsersManager", function () {
await page.waitForNetworkIdle();
await page.mouse.move(-10, -10);
+ await page.waitFor('.pagedUsersList:not(.loading)');
expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_bulk_access');
});
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
index a9e289c2e3..39c1435865 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:82cb3825149f0ca9e53a28628d1dcc3d6f70cfe5901a57724a9376c7a07d2ee2
-size 139627
+oid sha256:0058fc64d1b2a0d22990a34be329806d127f164c6e92aa8ef35b8cad1445a108
+size 138570