diff options
8 files changed, 9 insertions, 21 deletions
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index b5c5739365..a75723e6c3 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -42,7 +42,7 @@ class Core_WidgetsListTest extends IntegrationTestCase 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, 'General_Visitors' => 12, - 'UserSettings_VisitorSettings' => 11, + 'UserSettings_VisitorSettings' => 6, 'General_Actions' => 10, 'Events_Events' => 3, 'Actions_SubmenuSitesearch' => 5, diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index f54a6aaafd..8048c31de5 100755 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -37,8 +37,8 @@ class BlobReportLimitingTest extends SystemTestCase 'CustomVariables.getCustomVariables', 'Referrers.getReferrerType', 'Referrers.getKeywords', 'Referrers.getSearchEngines', 'Referrers.getWebsites', 'Referrers.getAll', /* TODO 'Referrers.getCampaigns', */ - 'UserSettings.getResolution', 'UserSettings.getConfiguration', 'UserSettings.getOS', - 'UserSettings.getBrowserVersion', + 'UserSettings.getResolution', 'UserSettings.getConfiguration', 'DevicesDetection.getOsVersions', + 'DevicesDetection.getBrowserVersions', 'UserCountry.getRegion', 'UserCountry.getCity', ); diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 72dab998db..a968371537 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 803dcc4819..c58f00fa96 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> @@ -11,10 +11,9 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/LIN.gif</logo> - <shortLabel>Linux</shortLabel> </row> <row> - <label>Android</label> + <label>Android 4.0</label> <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/AND.gif</logo> - <shortLabel>Android</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml index 9f4d67971d..b90214c2e9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux / Firefox / 1920x1080</label> + <label>GNU/Linux / Firefox / 1920x1080</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 72dab998db..a968371537 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 803dcc4819..c58f00fa96 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux</label> + <label>GNU/Linux</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> @@ -11,10 +11,9 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/LIN.gif</logo> - <shortLabel>Linux</shortLabel> </row> <row> - <label>Android</label> + <label>Android 4.0</label> <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> @@ -24,7 +23,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/AND.gif</logo> - <shortLabel>Android</shortLabel> </row> <row> <label>Others</label> @@ -37,6 +35,5 @@ <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>-1</shortLabel> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml index 9f4d67971d..b90214c2e9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Linux / Firefox / 1920x1080</label> + <label>GNU/Linux / Firefox / 1920x1080</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> |