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-07-30 02:41:52 +0300
committerGitHub <noreply@github.com>2021-07-30 02:41:52 +0300
commitda4df21e808fa983e32c6402c8f3de90145e0910 (patch)
tree299b930a152748e11161e880c9ab9371bbe04fac /tests/javascript/index.php
parentd4f1a131eecac2e71c901db3188427c66dce19e1 (diff)
Don't check cookie value if cookie was deleted (#17830)
* don't check cookie value if cookie was deleted * add test that ensures no error is logged when setCookieDomain is called w/ valid input Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'tests/javascript/index.php')
-rw-r--r--tests/javascript/index.php29
1 files changed, 28 insertions, 1 deletions
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index f589e9cd8a..d6ad864d83 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -4998,7 +4998,7 @@ if ($mysql) {
});
test("Test API - set cookie domain", function() {
- expect(5);
+ expect(6);
var tracker = Piwik.getTracker();
var cookie_domain = tracker.getCookieDomain()
@@ -5010,6 +5010,33 @@ if ($mysql) {
tracker.requireCookieConsent();
tracker.setCookieDomain(test_domain);
equal(tracker.getCookieDomain(), test_domain, "can set cookie domain after requireCookieConsent disables cookies" );
+
+ var interceptedMessages = testWithWrappedConsole(function () {
+ var tracker2 = Piwik.getTracker();
+
+ tracker2.setCookieDomain(window.location.hostname);
+ });
+
+ deepEqual(interceptedMessages, [], "no console logs should have been outputted when setting a correct cookie domain");
+
+ function testWithWrappedConsole(callback) {
+ var interceptedMessages = [];
+
+ try {
+ var originalConsoleError = console.error;
+ console.error = function catchConsoleError(message) {
+ interceptedMessages.push(message);
+ };
+
+ callback();
+ } catch (e) {
+ console.error = originalConsoleError;
+ throw e;
+ }
+ console.error = originalConsoleError;
+
+ return interceptedMessages;
+ }
});
test("Test API - optOut (via consent feature)", function () {