merge 3.x to 4.x (#15821)

* Avoid possible error subtable already exists but not loaded (#15779)

* Make sure to always set JSON_PIWIK to native JSON when possible (#15785)

* make sure to always set JSON_PIWIK to native JSON when possible

* rebuilt piwik.js

* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests (#15784)

* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests

* rebuilt piwik.js

* Make sure to clean up tracking failures before sending email notification (#15798)

Feedback from a customer... Eg the daily `cleanupTrackingFailures()` action might be only executed after the weekly `notifyTrackingFailures` therefore we should try to clean up failures first and then check if any are left. Avoids the case where a user opens hours later the email they receive and then there are no tracking failures reported. This could still happen but it's a bit less likely.

* 3.13.5-b1

* Faster segmented suggested values when browser archiving is disabled (#15786)

* Faster segmented suggested values when browser archiving is disabled

* make sure no segment is set

* remove wrong var type

* fix/add tests

* add more segment values

* detect if we should flatten or not

* add docs

* Fix problem when comparing segments or opening popovers (#15809)

refs #15805

* purge all old archives regardless of done value (#15800)

* purge all old archives regardless of done value, we only care about the newest usable one

* Fix test and start on new one.

* Add coverage for change in tests.

* there is no longer an inner join so should not need the idsite check

* Add more parameters to the computeNbUnique event (#15808)

* 3.13.5-b2

* One click update in two parts so new code is loaded for second. (#15770)

* One click update in two parts so new code is loaded for second.

* remove no longer needed code

Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index 98d9861422..c634bc3f55 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -3519,7 +3519,7 @@ if ($mysql) {
     });
 
     test("tracking with sendBeacon", function() {
-        expect(9);
+        expect(11);
 
         var tracker = Piwik.getTracker();
         tracker.setTrackerUrl("matomo.php");
@@ -3537,6 +3537,9 @@ if ($mysql) {
             ok(event.request.indexOf('action_name=') === 0, 'contains request');
         });
 
+        tracker.queueRequest('action_name=Queue1'); // these 2 will be sent as bulk request
+        tracker.queueRequest('action_name=Queue2');
+
         stop();
         setTimeout(function() {
             ok(callbackCalled, 'called the callback');
@@ -3546,13 +3549,15 @@ if ($mysql) {
             xhr.send(null);
             var results = xhr.responseText;
             var m = /<span\>([0-9]+)\<\/span\>/.exec(results);
-            equal( m ? m[1] : 0, "2", "count tracking events" );
+            equal( m ? m[1] : 0, "4", "count tracking events" );
 
             ok(results.indexOf('matomo.php?action_name=' + shortTitle + '&') >= 0, "trackPageView() sends small request");
             ok(results.indexOf('matomo.php?action_name=' + longTitle + '&') >= 0, "trackPageView() sends long request");
+            ok(results.indexOf('matomo.php?action_name=Queue1&') >= 0, "queueRequest() sends bulk request 1");
+            ok(results.indexOf('matomo.php?action_name=Queue2&') >= 0, "queueRequest() sends bulk request 2");
 
             start();
-        }, 2000);
+        }, 6000);
     });