From 7aab16301f0878e37911f91f5574af747e65e30e Mon Sep 17 00:00:00 2001 From: Jacob Ransom Date: Mon, 12 Aug 2024 13:24:08 +1200 Subject: [PATCH 1/4] Updating expected results to fix broken builds --- .../test___Actions.getPageUrls_day.xml | 30 +++++++++---------- .../test___Actions.getPageUrls_year.xml | 30 +++++++++---------- ...mensions.getConfiguredCustomDimensions.xml | 2 +- .../test___Live.getLastVisitsDetails_day.xml | 20 ++++++------- .../test___Live.getLastVisitsDetails_year.xml | 20 ++++++------- .../test___SitesManager.getSiteFromId.xml | 2 +- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/tests/System/expected/test___Actions.getPageUrls_day.xml b/tests/System/expected/test___Actions.getPageUrls_day.xml index 5817a45..9f9d17b 100644 --- a/tests/System/expected/test___Actions.getPageUrls_day.xml +++ b/tests/System/expected/test___Actions.getPageUrls_day.xml @@ -1,4 +1,4 @@ - + @@ -7,15 +7,15 @@ 360 0 0 - - + + 1 2 721 0 1 - + 1 5 2 @@ -24,13 +24,13 @@ 1 2.5 - + 1 2541 1 1 - + 1 2541 2 @@ -55,8 +55,8 @@ 360 0 0 - - + + 1 1 2 @@ -65,7 +65,7 @@ 1 1 - + 1 5 2 @@ -74,12 +74,12 @@ 1 2.5 - + 1 2541 1 - + 1 2541 2 @@ -105,15 +105,15 @@ 360 0 0 - - + + 1 1 2 544 0 - + 1 5 2 @@ -126,7 +126,7 @@ 5 1 - + 1 2541 2 diff --git a/tests/System/expected/test___Actions.getPageUrls_year.xml b/tests/System/expected/test___Actions.getPageUrls_year.xml index 9d85d97..d476ae2 100644 --- a/tests/System/expected/test___Actions.getPageUrls_year.xml +++ b/tests/System/expected/test___Actions.getPageUrls_year.xml @@ -1,4 +1,4 @@ - + @@ -7,15 +7,15 @@ 360 0 0 - - + + 1 2 721 0 1 - + 1 5 2 @@ -24,13 +24,13 @@ 1 2.5 - + 1 2541 1 1 - + 1 2541 2 @@ -54,15 +54,15 @@ 360 0 0 - - + + 1 2 721 0 1 - + 1 5 2 @@ -71,12 +71,12 @@ 1 2.5 - + 1 2541 1 - + 1 2541 2 @@ -104,14 +104,14 @@ 360 0 0 - - + + 1 2 544 0 - + 1 5 2 @@ -124,7 +124,7 @@ 5 1 - + 1 2541 2 diff --git a/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml b/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml index bede52a..d4aa297 100644 --- a/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml +++ b/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml @@ -1,4 +1,4 @@ - + 1 diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_day.xml b/tests/System/expected/test___Live.getLastVisitsDetails_day.xml index 577d94f..e984e7b 100644 --- a/tests/System/expected/test___Live.getLastVisitsDetails_day.xml +++ b/tests/System/expected/test___Live.getLastVisitsDetails_day.xml @@ -51,11 +51,11 @@ ecommerceAbandonedCart 2541 1 - - + + direct - - + + SKU_ID2 @@ -233,11 +233,11 @@ 0 0 33 - - + + direct - - + + SKU_ID @@ -267,8 +267,8 @@ http://example.com/sub/page direct - - + + plugins/Morpheus/images/goal.png plugins/Morpheus/images/goal.svg Goal conversion diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml index 577d94f..e984e7b 100644 --- a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml +++ b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml @@ -51,11 +51,11 @@ ecommerceAbandonedCart 2541 1 - - + + direct - - + + SKU_ID2 @@ -233,11 +233,11 @@ 0 0 33 - - + + direct - - + + SKU_ID @@ -267,8 +267,8 @@ http://example.com/sub/page direct - - + + plugins/Morpheus/images/goal.png plugins/Morpheus/images/goal.svg Goal conversion diff --git a/tests/System/expected/test___SitesManager.getSiteFromId.xml b/tests/System/expected/test___SitesManager.getSiteFromId.xml index 0d351ed..015ddde 100644 --- a/tests/System/expected/test___SitesManager.getSiteFromId.xml +++ b/tests/System/expected/test___SitesManager.getSiteFromId.xml @@ -15,7 +15,7 @@ - + website 0 From 041187d7eb9e877fd56af059e945351d4fe1adb4 Mon Sep 17 00:00:00 2001 From: Jacob Ransom Date: Mon, 12 Aug 2024 13:35:48 +1200 Subject: [PATCH 2/4] Updating expected results to fix broken builds --- .../test___Actions.getPageUrls_day.xml | 56 +++++++++---------- .../test___Actions.getPageUrls_year.xml | 56 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/tests/System/expected/test___Actions.getPageUrls_day.xml b/tests/System/expected/test___Actions.getPageUrls_day.xml index 9f9d17b..768a084 100644 --- a/tests/System/expected/test___Actions.getPageUrls_day.xml +++ b/tests/System/expected/test___Actions.getPageUrls_day.xml @@ -15,15 +15,6 @@ 0 1 - - 1 - 5 - 2 - 0.5 - 1 - 1 - 2.5 - 1 2541 @@ -39,6 +30,15 @@ 1 1270.5 + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 0 0 @@ -65,15 +65,6 @@ 1 1 - - 1 - 5 - 2 - 0.5 - 0 - 1 - 2.5 - 1 2541 @@ -88,6 +79,15 @@ 1 1270.5 + + 1 + 5 + 2 + 0.5 + 0 + 1 + 2.5 + 180 0% @@ -113,30 +113,30 @@ 544 0 - + 1 - 5 + 2541 2 0.5 1 1 - 2.5 - 5 + 1270.5 + 2541 1 - 5 + 2541 1 - + 1 - 2541 + 5 2 0.5 1 1 - 1270.5 - 2541 + 2.5 + 5 1 - 2541 + 5 1 diff --git a/tests/System/expected/test___Actions.getPageUrls_year.xml b/tests/System/expected/test___Actions.getPageUrls_year.xml index d476ae2..db8d6f1 100644 --- a/tests/System/expected/test___Actions.getPageUrls_year.xml +++ b/tests/System/expected/test___Actions.getPageUrls_year.xml @@ -15,15 +15,6 @@ 0 1 - - 1 - 5 - 2 - 0.5 - 1 - 1 - 2.5 - 1 2541 @@ -39,6 +30,15 @@ 1 1270.5 + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 0 0 @@ -62,15 +62,6 @@ 0 1 - - 1 - 5 - 2 - 0.5 - 0 - 1 - 2.5 - 1 2541 @@ -85,6 +76,15 @@ 1 1270.5 + + 1 + 5 + 2 + 0.5 + 0 + 1 + 2.5 + 2 1 @@ -111,30 +111,30 @@ 544 0 - + 1 - 5 + 2541 2 0.5 1 1 - 2.5 - 5 + 1270.5 + 2541 1 - 5 + 2541 1 - + 1 - 2541 + 5 2 0.5 1 1 - 1270.5 - 2541 + 2.5 + 5 1 - 2541 + 5 1 From 518489226ad565c6cb08625a9c02bf9c2c76541b Mon Sep 17 00:00:00 2001 From: Jacob Ransom Date: Mon, 12 Aug 2024 13:45:29 +1200 Subject: [PATCH 3/4] Accounting for older Matomo versions --- tests/System/Commands/MigrateTest.php | 3 +- .../test_5-2a__Actions.getPageUrls_day.xml | 151 ++++++++++++++++++ .../test_5-2a__Actions.getPageUrls_year.xml | 151 ++++++++++++++++++ 3 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 tests/System/expected/test_5-2a__Actions.getPageUrls_day.xml create mode 100644 tests/System/expected/test_5-2a__Actions.getPageUrls_year.xml diff --git a/tests/System/Commands/MigrateTest.php b/tests/System/Commands/MigrateTest.php index e337102..47802b7 100644 --- a/tests/System/Commands/MigrateTest.php +++ b/tests/System/Commands/MigrateTest.php @@ -148,9 +148,10 @@ public function testApi($api, $params) FakeAccess::clearAccess(true); $this->disableArchiving(); - if (['Live.getLastVisitsDetails'] === $api && version_compare(Version::VERSION, '5.2.0-alpha', '<')) { + if (in_array($api, [['Live.getLastVisitsDetails'], ['Actions.getPageUrls']]) && version_compare(Version::VERSION, '5.2.0-alpha', '<')) { $params['testSuffix'] = '5-2a'; } + $this->runApiTests($api, $params); } diff --git a/tests/System/expected/test_5-2a__Actions.getPageUrls_day.xml b/tests/System/expected/test_5-2a__Actions.getPageUrls_day.xml new file mode 100644 index 0000000..5817a45 --- /dev/null +++ b/tests/System/expected/test_5-2a__Actions.getPageUrls_day.xml @@ -0,0 +1,151 @@ + + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 0 + 0 + 180 + 0% + 50% + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + + + + 2 + 2 + 2 + 360 + 0 + 0 + + + 1 + 1 + 2 + 721 + 0 + 1 + 1 + + + 1 + 5 + 2 + 0.5 + 0 + 1 + 2.5 + + + 1 + 2541 + 1 + + + 1 + 2541 + 2 + 0.5 + 0 + 1 + 1270.5 + + + 180 + 0% + 50% + http://example.com/sub/page + pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage + + + + + + 1 + 1 + 1 + 360 + 0 + 0 + + + 1 + 1 + 2 + 544 + 0 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 5 + 1 + 5 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + 2541 + 1 + 2541 + 1 + + + 0 + 0 + 360 + 0% + 0% + http://example.com/ + pageUrl==http%253A%252F%252Fexample.com%252F + + \ No newline at end of file diff --git a/tests/System/expected/test_5-2a__Actions.getPageUrls_year.xml b/tests/System/expected/test_5-2a__Actions.getPageUrls_year.xml new file mode 100644 index 0000000..9d85d97 --- /dev/null +++ b/tests/System/expected/test_5-2a__Actions.getPageUrls_year.xml @@ -0,0 +1,151 @@ + + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 0 + 0 + 180 + 0% + 50% + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 5 + 2 + 0.5 + 0 + 1 + 2.5 + + + 1 + 2541 + 1 + + + 1 + 2541 + 2 + 0.5 + 0 + 1 + 1270.5 + + + 2 + 1 + 1 + 180 + 0% + 50% + http://example.com/sub/page + pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage + + + + + + 1 + 1 + 360 + 0 + 0 + + + 1 + 2 + 544 + 0 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 5 + 1 + 5 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + 2541 + 1 + 2541 + 1 + + + 1 + 1 + 0 + 0 + 360 + 0% + 0% + http://example.com/ + pageUrl==http%253A%252F%252Fexample.com%252F + + \ No newline at end of file From 196bc98342917c9475a4b71ed0bdf7ba652aa833 Mon Sep 17 00:00:00 2001 From: Jacob Ransom Date: Mon, 12 Aug 2024 13:51:25 +1200 Subject: [PATCH 4/4] Some more minor test corrections --- tests/System/Commands/MigrateTest.php | 2 +- .../System/expected/test_Old__API.get_day.xml | 89 ----- .../expected/test_Old__API.get_year.xml | 83 ---- .../test_Old__Actions.getPageUrls_day.xml | 72 ---- .../test_Old__Actions.getPageUrls_year.xml | 72 ---- ...mensions.getConfiguredCustomDimensions.xml | 36 -- ...est_Old__Live.getLastVisitsDetails_day.xml | 374 ------------------ ...st_Old__Live.getLastVisitsDetails_year.xml | 374 ------------------ .../test_Old__SitesManager.getSiteFromId.xml | 25 -- 9 files changed, 1 insertion(+), 1126 deletions(-) delete mode 100644 tests/System/expected/test_Old__API.get_day.xml delete mode 100644 tests/System/expected/test_Old__API.get_year.xml delete mode 100644 tests/System/expected/test_Old__Actions.getPageUrls_day.xml delete mode 100644 tests/System/expected/test_Old__Actions.getPageUrls_year.xml delete mode 100644 tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml delete mode 100644 tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml delete mode 100644 tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml delete mode 100644 tests/System/expected/test_Old__SitesManager.getSiteFromId.xml diff --git a/tests/System/Commands/MigrateTest.php b/tests/System/Commands/MigrateTest.php index 47802b7..1e9e70a 100644 --- a/tests/System/Commands/MigrateTest.php +++ b/tests/System/Commands/MigrateTest.php @@ -167,7 +167,7 @@ public function testApi_migrated($api, $params) FakeAccess::clearAccess($superUser = true); - if (['Live.getLastVisitsDetails'] === $api && version_compare(Version::VERSION, '5.2.0-alpha', '<')) { + if (in_array($api, [['Live.getLastVisitsDetails'], ['Actions.getPageUrls']]) && version_compare(Version::VERSION, '5.2.0-alpha', '<')) { $params['testSuffix'] = '5-2a'; } try { diff --git a/tests/System/expected/test_Old__API.get_day.xml b/tests/System/expected/test_Old__API.get_day.xml deleted file mode 100644 index 741bb31..0000000 --- a/tests/System/expected/test_Old__API.get_day.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - 2 - 2 - 0 - 4 - 2 - 0 - 1265 - 2 - 4 - 2 - 0 - 2 - 0% - 2 - 633 - 0 - 0 - 0 - 0 - 0 - 0% - 0 - 0 - 0 - 0 - 2 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 100% - 0% - 0% - 0% - 0% - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 2 - 1 - 2546 - 50% - 2 - 1 - 2546 - 50% - 0 - 0 - 0 - 0% - 0 - 0 - 0 - 3 - 3 - 0 - 0 - 0 - 0 - 1 - 1 - 0% - 2 - 633 - \ No newline at end of file diff --git a/tests/System/expected/test_Old__API.get_year.xml b/tests/System/expected/test_Old__API.get_year.xml deleted file mode 100644 index c4cfe68..0000000 --- a/tests/System/expected/test_Old__API.get_year.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 2 - 4 - 2 - 0 - 1265 - 2 - 4 - 2 - 0% - 2 - 633 - 0 - 0 - 0 - 0% - 0 - 0 - 0 - 0 - 2 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 100% - 0% - 0% - 0% - 0% - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 2 - 1 - 2546 - 50% - 2 - 1 - 2546 - 50% - 0 - 0 - 0 - 0% - 0 - 0 - 0 - 3 - 3 - 0 - 0 - 0 - 0 - 1 - 1 - 0% - 2 - 633 - \ No newline at end of file diff --git a/tests/System/expected/test_Old__Actions.getPageUrls_day.xml b/tests/System/expected/test_Old__Actions.getPageUrls_day.xml deleted file mode 100644 index 5d9cf83..0000000 --- a/tests/System/expected/test_Old__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 2 - 2 - 360 - 0 - 0 - - - 1 - 2 - 721 - 0 - 1 - 0 - 0 - 180 - 0% - 50% - pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub - - - - 2 - 2 - 2 - 360 - 0 - 0 - - - 1 - 1 - 2 - 721 - 0 - 1 - 1 - 180 - 0% - 50% - http://example.com/sub/page - pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage - - - - - - 1 - 1 - 1 - 360 - 0 - 0 - - - 1 - 1 - 2 - 544 - 0 - 0 - 0 - 360 - 0% - 0% - http://example.com/ - pageUrl==http%253A%252F%252Fexample.com%252F - - \ No newline at end of file diff --git a/tests/System/expected/test_Old__Actions.getPageUrls_year.xml b/tests/System/expected/test_Old__Actions.getPageUrls_year.xml deleted file mode 100644 index 187d005..0000000 --- a/tests/System/expected/test_Old__Actions.getPageUrls_year.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 2 - 2 - 360 - 0 - 0 - - - 1 - 2 - 721 - 0 - 1 - 0 - 0 - 180 - 0% - 50% - pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub - - - - 2 - 2 - 360 - 0 - 0 - - - 1 - 2 - 721 - 0 - 1 - 2 - 1 - 1 - 180 - 0% - 50% - http://example.com/sub/page - pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage - - - - - - 1 - 1 - 360 - 0 - 0 - - - 1 - 2 - 544 - 0 - 1 - 1 - 0 - 0 - 360 - 0% - 0% - http://example.com/ - pageUrl==http%253A%252F%252Fexample.com%252F - - \ No newline at end of file diff --git a/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml b/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml deleted file mode 100644 index d4aa297..0000000 --- a/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 1 - 1 - MyName1 - 1 - visit - 1 - - - 1 - - - 2 - 1 - MyName2 - 1 - action - 1 - - - 1 - - - 3 - 1 - MyName3 - 2 - action - 0 - - - 1 - - \ No newline at end of file diff --git a/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml b/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 1f6f55a..0000000 --- a/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,374 +0,0 @@ - - - - 1 - 2 - 56.11.55.73 - - 3d7de8315a349072 - - - action - http://example.com/sub/page - Viewing homepage - - - - 3 - - 360 - 6 min 0s - 1 - Viewing homepage - http://example.com/sub/page - - plugins/Morpheus/images/action.svg - - - 0 M - - - search - - - - - 4 - - 361 - 6 min 1s - this is a site search query - - - 2 - plugins/Morpheus/images/search.png - plugins/Morpheus/images/search.svg - Site Search - this is a site search query - - - 0 M - - - ecommerceAbandonedCart - 2541 - 1 - - - - - SKU_ID2 - A durable item - Best seller - 321 - 1 - - Best seller - - - - plugins/Morpheus/images/ecommerceAbandonedCart.png - plugins/Morpheus/images/ecommerceAbandonedCart.svg - Abandoned Cart - $2,541 revenue - 1 items: A durable item) - - - - - 0 - USD - $ - - - - - MigrationSite - - - - - - - - new - - 0 - - 1 - abandonedCart - plugins/Morpheus/images/ecommerceAbandonedCart.svg - 0 - 0 - 0 - - 721 - 12 min 1s - 1 - 2 - 2 - direct - Direct Entry - - - - - - - - - fr - French - Desktop - plugins/Morpheus/icons/dist/devices/desktop.png - Unknown - Generic Desktop - Windows XP - Windows - plugins/Morpheus/icons/dist/os/WIN.png - WIN - XP - Gecko - Gecko (Firefox) - Firefox 3.6 - Firefox - plugins/Morpheus/icons/dist/browsers/FF.png - FF - 3.6 - 0 - 0 - 0 - 2541 - 1 - 1 - 0 - Europe - eur - France - fr - plugins/Morpheus/icons/dist/flags/fr.png - - - - France - - - 12:34:06 - 12 - 0 - 0 - 1024x768 - cookie, flash, java - - - plugins/Morpheus/icons/dist/plugins/cookie.png - cookie - - - plugins/Morpheus/icons/dist/plugins/flash.png - flash - - - plugins/Morpheus/icons/dist/plugins/java.png - java - - - - - - - - 1 - 1 - 156.5.3.2 - - e16cf2bbaeea2c88 - - - action - http://example.com/ - Viewing homepage - - - - 1 - - 360 - 6 min 0s - 1 - Viewing homepage - http://example.com/ - - plugins/Morpheus/images/action.svg - - - 0 M - - - action - http://example.com/sub/page - Second page view - - - - 2 - - 184 - 3 min 4s - 2 - Second page view - http://example.com/sub/page - - plugins/Morpheus/images/action.svg - - - 0 M - - - ecommerceOrder - TestingOrder - 2541 - 0 - 0 - 0 - 0 - 33 - - - - - SKU_ID - Test item! - Test & Category - 777 - 33 - - Test & Category - - - - plugins/Morpheus/images/ecommerceOrder.png - plugins/Morpheus/images/ecommerceOrder.svg - Ordered (TestingOrder) - $2,541 revenue - 33 items: Test item!) - - - - - goal - Download Software - 1 - - 5 - - - http://example.com/sub/page - plugins/Morpheus/images/goal.png - plugins/Morpheus/images/goal.svg - Goal conversion - Download Software ($5 revenue) - - - - - 1 - USD - $ - - - - - MigrationSite - - - - - - - - new - - 1 - plugins/Morpheus/images/goal.svg - 1 - ordered - plugins/Morpheus/images/ecommerceOrder.svg - 0 - 0 - 0 - 0 - 544 - 9 min 4s - 0 - 2 - 2 - direct - Direct Entry - - - - - - - - - fr - French - Desktop - plugins/Morpheus/icons/dist/devices/desktop.png - Unknown - Generic Desktop - Windows XP - Windows - plugins/Morpheus/icons/dist/os/WIN.png - WIN - XP - Gecko - Gecko (Firefox) - Firefox 3.6 - Firefox - plugins/Morpheus/icons/dist/browsers/FF.png - FF - 3.6 - 2541 - 1 - 33 - 0 - 0 - 0 - 0 - Europe - eur - France - fr - plugins/Morpheus/icons/dist/flags/fr.png - - - - France - - - 12:34:06 - 12 - 0 - 0 - 1024x768 - cookie, flash, java - - - plugins/Morpheus/icons/dist/plugins/cookie.png - cookie - - - plugins/Morpheus/icons/dist/plugins/flash.png - flash - - - plugins/Morpheus/icons/dist/plugins/java.png - java - - - - - - - \ No newline at end of file diff --git a/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml b/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml deleted file mode 100644 index 1f6f55a..0000000 --- a/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml +++ /dev/null @@ -1,374 +0,0 @@ - - - - 1 - 2 - 56.11.55.73 - - 3d7de8315a349072 - - - action - http://example.com/sub/page - Viewing homepage - - - - 3 - - 360 - 6 min 0s - 1 - Viewing homepage - http://example.com/sub/page - - plugins/Morpheus/images/action.svg - - - 0 M - - - search - - - - - 4 - - 361 - 6 min 1s - this is a site search query - - - 2 - plugins/Morpheus/images/search.png - plugins/Morpheus/images/search.svg - Site Search - this is a site search query - - - 0 M - - - ecommerceAbandonedCart - 2541 - 1 - - - - - SKU_ID2 - A durable item - Best seller - 321 - 1 - - Best seller - - - - plugins/Morpheus/images/ecommerceAbandonedCart.png - plugins/Morpheus/images/ecommerceAbandonedCart.svg - Abandoned Cart - $2,541 revenue - 1 items: A durable item) - - - - - 0 - USD - $ - - - - - MigrationSite - - - - - - - - new - - 0 - - 1 - abandonedCart - plugins/Morpheus/images/ecommerceAbandonedCart.svg - 0 - 0 - 0 - - 721 - 12 min 1s - 1 - 2 - 2 - direct - Direct Entry - - - - - - - - - fr - French - Desktop - plugins/Morpheus/icons/dist/devices/desktop.png - Unknown - Generic Desktop - Windows XP - Windows - plugins/Morpheus/icons/dist/os/WIN.png - WIN - XP - Gecko - Gecko (Firefox) - Firefox 3.6 - Firefox - plugins/Morpheus/icons/dist/browsers/FF.png - FF - 3.6 - 0 - 0 - 0 - 2541 - 1 - 1 - 0 - Europe - eur - France - fr - plugins/Morpheus/icons/dist/flags/fr.png - - - - France - - - 12:34:06 - 12 - 0 - 0 - 1024x768 - cookie, flash, java - - - plugins/Morpheus/icons/dist/plugins/cookie.png - cookie - - - plugins/Morpheus/icons/dist/plugins/flash.png - flash - - - plugins/Morpheus/icons/dist/plugins/java.png - java - - - - - - - - 1 - 1 - 156.5.3.2 - - e16cf2bbaeea2c88 - - - action - http://example.com/ - Viewing homepage - - - - 1 - - 360 - 6 min 0s - 1 - Viewing homepage - http://example.com/ - - plugins/Morpheus/images/action.svg - - - 0 M - - - action - http://example.com/sub/page - Second page view - - - - 2 - - 184 - 3 min 4s - 2 - Second page view - http://example.com/sub/page - - plugins/Morpheus/images/action.svg - - - 0 M - - - ecommerceOrder - TestingOrder - 2541 - 0 - 0 - 0 - 0 - 33 - - - - - SKU_ID - Test item! - Test & Category - 777 - 33 - - Test & Category - - - - plugins/Morpheus/images/ecommerceOrder.png - plugins/Morpheus/images/ecommerceOrder.svg - Ordered (TestingOrder) - $2,541 revenue - 33 items: Test item!) - - - - - goal - Download Software - 1 - - 5 - - - http://example.com/sub/page - plugins/Morpheus/images/goal.png - plugins/Morpheus/images/goal.svg - Goal conversion - Download Software ($5 revenue) - - - - - 1 - USD - $ - - - - - MigrationSite - - - - - - - - new - - 1 - plugins/Morpheus/images/goal.svg - 1 - ordered - plugins/Morpheus/images/ecommerceOrder.svg - 0 - 0 - 0 - 0 - 544 - 9 min 4s - 0 - 2 - 2 - direct - Direct Entry - - - - - - - - - fr - French - Desktop - plugins/Morpheus/icons/dist/devices/desktop.png - Unknown - Generic Desktop - Windows XP - Windows - plugins/Morpheus/icons/dist/os/WIN.png - WIN - XP - Gecko - Gecko (Firefox) - Firefox 3.6 - Firefox - plugins/Morpheus/icons/dist/browsers/FF.png - FF - 3.6 - 2541 - 1 - 33 - 0 - 0 - 0 - 0 - Europe - eur - France - fr - plugins/Morpheus/icons/dist/flags/fr.png - - - - France - - - 12:34:06 - 12 - 0 - 0 - 1024x768 - cookie, flash, java - - - plugins/Morpheus/icons/dist/plugins/cookie.png - cookie - - - plugins/Morpheus/icons/dist/plugins/flash.png - flash - - - plugins/Morpheus/icons/dist/plugins/java.png - java - - - - - - - \ No newline at end of file diff --git a/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml b/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml deleted file mode 100644 index baed96d..0000000 --- a/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 1 - MigrationSite - http://piwik.net - 2013-01-22 00:00:00 - 1 - 1 - - - UTC - USD - 0 - - - - - website - 0 - superUserLogin - UTC - US Dollar - - \ No newline at end of file