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-16 03:12:05 +0300
committerGitHub <noreply@github.com>2019-05-16 03:12:05 +0300
commit05017ba88ec611f63bf223728990351212ff560f (patch)
tree79c20127a6584a1316bb864b329d0cba713add10 /tests/resources
parentcecec674a65e4dc2a1aa7c33722a5380be2fd719 (diff)
Require password confirmation before setting/removing superuser access. (#13975)
* Require password confirmation for changing superuser access and fix issue where getSiteAccess is called w/ superuser when toggling superuser access. * apply review feedback * Allow bypassing password confirmation in certain scenarios. * Fixing tests & adding UI test. * Update submodule. * test fixes + remove return; from 2fa tests. * update submodule * Fixing tests * Couple tweaks for screenshot testing. * test fixes * Fix TwoFactorAuthUsersManager test. * More test fixes. * try to disable all transitions * More UI test fixes + disable materialize animations globally in UI tests. * 2fa ui tests now working
Diffstat (limited to 'tests/resources')
-rw-r--r--tests/resources/screenshot-override/override.css11
-rw-r--r--tests/resources/screenshot-override/override.js14
2 files changed, 24 insertions, 1 deletions
diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css
index 4a148e4fd9..59ad15acf9 100644
--- a/tests/resources/screenshot-override/override.css
+++ b/tests/resources/screenshot-override/override.css
@@ -48,9 +48,18 @@ body > .widget {
display:none;
}
-html body div *, body * {
+*,
+*::after,
+*::before {
-webkit-transition: none !important;
transition: none !important;
-webkit-animation: none !important;
animation: none !important;
+ transition-delay: 0s !important;
+ transition-duration: 0s !important;
+ animation-delay: -0.0001s !important;
+ animation-duration: 0s !important;
+ animation-play-state: paused !important;
+ caret-color: transparent !important;
+ color-adjust: exact !important;
} \ No newline at end of file
diff --git a/tests/resources/screenshot-override/override.js b/tests/resources/screenshot-override/override.js
index 37971a600b..5f142f3bbd 100644
--- a/tests/resources/screenshot-override/override.js
+++ b/tests/resources/screenshot-override/override.js
@@ -4,4 +4,18 @@ $(document).ready(function () {
$('[notification-id=ControllerAdmin_HttpIsUsed]').hide();
$.fx.off = true;
+
+ // disable materialize animations (Materialize version > 1)
+ if (typeof M !== 'undefined' && M.anime) {
+ var oldAnime = M.anime;
+ M.anime = function (params) {
+ if (!params) {
+ params = {};
+ }
+ params.duration = 0;
+ return oldAnime(params);
+ };
+ } else if ($.Velocity) {
+ $.Velocity.mock = true;
+ }
}); \ No newline at end of file