Trying to fix randomly failing tests (#15461)

25 files changed, 101 insertions, 65 deletions

diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
index e22bcfa90b..5594398ca2 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d866e324e519af5ca51351bc5fbf7eddc0f8ff9f8edc94c6a9ef227ca1896a7e
-size 381898
+oid sha256:401ff0f9327b2e2800ed3e79a18d3a91b1697f8f7be3d10a0a028821635fed19
+size 381984
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index 7034b1ad1c..2dd8c4dc43 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81f81764ba472da0f4ee6484b0bd3b1d011f900ff55754ec5401e3ce1aacb3a2
-size 470588
+oid sha256:4a7714eb47d44749f1186072224763e568fa6e0a0d750e6fd9dfe3ea7dd8c80e
+size 470401
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index 02a206391a..53eccc51ba 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02b3b9b3ceac06edb4b82344a3160edc81c8e095468f1b617590cbd660df4187
-size 714992
+oid sha256:ea8954c9b69f59fe06edb66b9959f3b826786f58f84367bc6a0bab15f67715d2
+size 714817
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
index 02a206391a..53eccc51ba 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02b3b9b3ceac06edb4b82344a3160edc81c8e095468f1b617590cbd660df4187
-size 714992
+oid sha256:ea8954c9b69f59fe06edb66b9959f3b826786f58f84367bc6a0bab15f67715d2
+size 714817
diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
index 38c620ea39..b8e3ba75eb 100644
--- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
+++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beac9c4490143385645ba9176a3cb52dc32ce1c46cffd34d4dee642449dd36b2
-size 204429
+oid sha256:cba4af1a42ee5eb213da15eabc299795af4054ca8a914ffd1141cb80480c7787
+size 204228
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
index 6e878672ff..58cfb5aacf 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_dashboard_no_popup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc374ffc11060b8c12ae60f494e66dc371b64946d807c929eeb32166f2d04938
-size 409334
+oid sha256:44c97885caf1a5e6148023cfcd323ad51415e0eabac3e08f7e91f1da6a93b6a1
+size 409180
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
index e99e20e72d..6f1ff436ee 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3beb1da8948e1972a9833678fa1eae8db3179f8b37d3404dbef227a66ec168b
-size 188875
+oid sha256:8b76e58a10a6ce2cb33ae718186e7f55acf28bbe1d1254cbb0d03cf410e14465
+size 188679
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 99ff282848..fc2d29b3b0 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -16,6 +16,7 @@ use Piwik\Date;
 use Piwik\Metrics\Formatter;
 use Piwik\Plugin;
 use Piwik\Piwik;
+use Piwik\Plugins\Live\Visualizations\VisitorLog;
 use Piwik\Tracker\GoalManager;
 
 class Visitor implements VisitorInterface
@@ -291,7 +292,7 @@ class Visitor implements VisitorInterface
             $instance->filterActions($actionDetails, $visitorDetailsArray);
         }
 
-        usort($actionDetails, array('static', 'sortByServerTime'));
+        $actionDetails = self::sortActionDetails($actionDetails);
 
         $actionDetails = array_values($actionDetails);
 
@@ -315,27 +316,21 @@ class Visitor implements VisitorInterface
         return $visitorDetailsArray;
     }
 
-    private static function sortByServerTime($a, $b)
+    private static function sortActionDetails($actions)
     {
-        $ta = strtotime($a['serverTimePretty']);
-        $tb = strtotime($b['serverTimePretty']);
-
-        if ($ta < $tb) {
-            return -1;
-        }
-
-        if ($ta == $tb) {
-            if ($a['idlink_va'] == $b['idlink_va']) {
-                return strcmp($a['type'], $b['type']);
-            }
-
-            if ($a['idlink_va'] > $b['idlink_va']) {
-               return 1;
+        usort($actions, function ($a, $b) {
+            $fields = array('serverTimePretty', 'idlink_va', 'type', 'title', 'url', 'pageIdAction', 'goalId');
+            foreach ($fields as $field) {
+                $sort = VisitorLog::sortByActionsOnPageColumn($a, $b, $field);
+                if ($sort !== 0) {
+                    return $sort;
+                }
             }
 
-            return -1;
-        }
+            return 0;
+        });
 
-        return 1;
+        return $actions;
     }
+
 }
diff --git a/plugins/Live/Visualizations/VisitorLog.php b/plugins/Live/Visualizations/VisitorLog.php
index 31c0efcd9e..d6c3cd08a2 100644
--- a/plugins/Live/Visualizations/VisitorLog.php
+++ b/plugins/Live/Visualizations/VisitorLog.php
@@ -202,6 +202,23 @@ class VisitorLog extends Visualization
                 }
             }
 
+            foreach ($actionGroups as $idPageView => $actionGroup) {
+                if (!empty($actionGroup['actionsOnPage'])) {
+                    usort($actionGroup['actionsOnPage'], function ($a, $b) {
+                        $fields = array('timestamp', 'title', 'url', 'type', 'pageIdAction', 'goalId', 'timeSpent');
+                        foreach ($fields as $field) {
+                            $sort = self::sortByActionsOnPageColumn($a, $b, $field);
+                            if ($sort !== 0) {
+                                return $sort;
+                            }
+                        }
+
+                        return 0;
+                    });
+                    $actionGroups[$idPageView]['actionsOnPage'] = $actionGroup['actionsOnPage'];
+                }
+            }
+
             // merge action groups that have the same page url/action and no pageviewactions
             $actionGroups = self::mergeRefreshes($actionGroups);
 
@@ -209,6 +226,30 @@ class VisitorLog extends Visualization
         }
     }
 
+    public static function sortByActionsOnPageColumn($a, $b, $field)
+    {
+        if (!isset($a[$field]) && !isset($b[$field])) {
+            return 0;
+        }
+        if (!isset($a[$field])) {
+            return -1;
+        }
+        if (!isset($b[$field])) {
+            return 1;
+        }
+        if ($field === 'serverTimePretty') {
+            $a[$field] = strtotime($a[$field]);
+            $b[$field] = strtotime($b[$field]);
+        }
+        if ($a[$field] === $b[$field]) {
+            return 0;
+        }
+        if ($a[$field] < $b[$field]) {
+            return -1;
+        }
+        return 1;
+    }
+
     private static function mergeRefreshes(array $actionGroups)
     {
         $previousId = null;
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
index e556fb1ffd..1128675542 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3dbbfb7280b58c59197ae791c14fa7b4dcf40a4d868bd9ef77614055b05f199
-size 386906
+oid sha256:363ee1f7abca91be5422910989a2328cfc507f217d2eaf1008b8bd7862c49d1a
+size 386911
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
index 1b98f667be..bca3118156 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:952d7e1a73a09d164f7d2b1acf83768b4d42159c46a3d11eb767d7fcd190864f
-size 102198
+oid sha256:c7b27fe264d6b12a0383fe1e788c43d7544dbc7d8cd94752bedc56b081757804
+size 102195
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
index d181af2d47..3361725e7d 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac1caaa7a88f52c057c4d5331b9761a5d363a6e20f2809d60c1524461611af5
-size 418479
+oid sha256:9ca0fcc3ee5901df974c348fd7da020df9f4283bfd5768eba89b664717272000
+size 418489
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
index 8fea3c44f2..d46830adc0 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23ab3a8404d0c0fdc67fd30720968a7ba1f062e8b485f737c8894d0bc45b586b
-size 310449
+oid sha256:81d25e5b1ecdd3bd0d094fccab4b387a1e00d147015b5621a68942edc2e65113
+size 310462
diff --git a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png
index 10344604cb..70a7be1660 100644
--- a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png
+++ b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42a507bc97ed6da6c5052c4ff1effee945e1bf9f9b9d1bd1a14974a58ec43530
-size 402435
+oid sha256:9b42b527f2c040b7d8a799f2911d4106ea7d45c4445492ba01c5612e96e1d1a5
+size 402405
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
index c095b51b7b..c5887844a3 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65b66c7b6a82317613d051222891cdd55c8d5924f58322750e0f2acddd14b47e
-size 367321
+oid sha256:8600371e3bf5fd49444da27e21a8d65d3562ca024141b998857008f2b0ee339d
+size 367151
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index ed5ede58e2..cbb3613d0c 100644
--- a/tests/UI/expected-screenshots/Theme_home.png
+++ b/tests/UI/expected-screenshots/Theme_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3eeace65d3d17768d0172186e1e971abd2d81a614c20ee493ec691560bb68fe7
-size 708707
+oid sha256:78d41258eee99c5fe3afeecada66a2bd6c6b386684aaefa87ed6dc03e21cf643
+size 708602
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
index 06c524c519..8765bcf810 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:2fb2b3a72c7fa9c409cd0f3b8f5dc88eb2ade898e2f213d87475a88c516e93ac
-size 150550
+oid sha256:d5cc35da66a65e1f86b7cf0c66f49d1fcd6d291f53f68d6d3ca8609b0476a76c
+size 150305
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
index 06c524c519..8765bcf810 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:2fb2b3a72c7fa9c409cd0f3b8f5dc88eb2ade898e2f213d87475a88c516e93ac
-size 150550
+oid sha256:d5cc35da66a65e1f86b7cf0c66f49d1fcd6d291f53f68d6d3ca8609b0476a76c
+size 150305
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index a25d0a2dc0..ccfa9ab4e7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20e432b5e679ab0e4726ca56371ca2eee0c1f2b65faa3145dc8c8c53f3097d05
-size 632522
+oid sha256:4060bac4f42231b58dce665c64998e9886cd6d5175ee9c4692080b8cdd23ddae
+size 632336
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
index 32736cc6eb..827bac097f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c51d6709ffd95ac5ab0b6de49e61ce5939b7364d6a759c458cb0aae46d9559a
-size 1565746
+oid sha256:c266e66c4faeb80cba4a71b5263eddf6955295f38ef517be46838597ab734309
+size 1565814
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
index cf506f46fd..f565793aaf 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfff5260349d7effdb44254433c229cd28106d257338976654a28e6bd15ee811
-size 499339
+oid sha256:7bed358956b83d163cd6b6a50add25d343479caecfc63f1752f45bce31af0a2f
+size 499249
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
index ad6aa049a2..b13791984c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aed8ad183d2431dc875cd2b883f4366bf32e42b825bbd6b3f0ebdabab4ee18b3
-size 377259
+oid sha256:292a885028edf409c1e20af41e3e54bed24c21a6cbf0118885e083a8fb63a7b7
+size 379446
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png
index 702100b385..ce96524e93 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba29ee8f7ea1bebc4d7805785b23d403cf89f467368e2037b56ad005676524f3
-size 557477
+oid sha256:1a1aac069dc89607a7af49cfbf3b0cbe73efa9b9e2b4058f8d9eb627ee7ee009
+size 557455
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
index bde907c9ad..8c0c0cd66f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cec43f7d857ee974c25da064b8363f46aca92a61d7d295c1a79b0624a7477604
-size 485732
+oid sha256:96dcb392d7faef30bad0c5a48f13b4eea7529e887af3d9fe136a83c1acd5f0c0
+size 485504
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
index 17c6f708a0..0cb97aaa8c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05110c6f5a177e68f9e0cfed042833b5d395cd7ca9f44ad62f959e090c110a3b
-size 374707
+oid sha256:f11b029b861006f3db85ba58c41cb765e5fc2d41e72da4b78b381237294f6a4c
+size 374162