diff options
author | sgiehl <stefan@piwik.org> | 2014-09-28 20:01:11 +0400 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-09-28 20:01:11 +0400 |
commit | bfda8f319d33440c809522e91a8bf14c28acb4b1 (patch) | |
tree | 01140fc2eb55c193c5abd1558fce3bb76a42ee4a | |
parent | 1fdc07b73b65182da0bea943a9df19dc305cea15 (diff) |
auto suggest all available browser engines for segment; fixed some tests
6 files changed, 157 insertions, 136 deletions
diff --git a/plugins/DevicesDetection/Columns/BrowserEngine.php b/plugins/DevicesDetection/Columns/BrowserEngine.php index e14f41322a..d73ab7aecb 100644 --- a/plugins/DevicesDetection/Columns/BrowserEngine.php +++ b/plugins/DevicesDetection/Columns/BrowserEngine.php @@ -25,6 +25,7 @@ class BrowserEngine extends Base $segment->setSegment('browserEngine'); $segment->setName('DevicesDetection_BrowserEngine'); $segment->setAcceptedValues('Trident, WebKit, Presto, Gecko, Blink, etc.'); + $segment->setSuggestedValuesCallback("\DeviceDetector\Parser\Client\Browser\Engine::getAvailableEngines"); $this->addSegment($segment); } diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php index 552c99129d..8f529ae9d8 100644 --- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php @@ -41,7 +41,7 @@ class Core_WidgetsListTest extends DatabaseTestCase 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, 'General_Visitors' => 12, - 'UserSettings_VisitorSettings' => 12, + 'UserSettings_VisitorSettings' => 11, 'General_Actions' => 10, 'Events_Events' => 3, 'Actions_SubmenuSitesearch' => 5, @@ -49,7 +49,7 @@ class Core_WidgetsListTest extends DatabaseTestCase 'Goals_Goals' => 1, 'SEO' => 2, 'Example Widgets' => 4, - 'DevicesDetection_DevicesDetection' => 7, + 'DevicesDetection_DevicesDetection' => 8, 'Insights_WidgetCategory' => 2 ); diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 6f772e2ef7..ef32d680f8 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -33,7 +33,7 @@ - + <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -60,8 +60,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -81,6 +79,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -181,7 +181,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -208,8 +208,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -229,6 +227,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -306,7 +306,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -333,8 +333,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -354,6 +352,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -445,7 +445,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -472,8 +472,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -493,6 +491,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -570,7 +570,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -597,8 +597,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -618,6 +616,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -726,7 +726,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -753,8 +753,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -774,6 +772,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -851,7 +851,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -878,8 +878,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -899,6 +897,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -990,7 +990,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1017,8 +1017,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1038,6 +1036,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1115,7 +1115,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1142,8 +1142,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1163,6 +1161,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1271,7 +1271,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1298,8 +1298,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1319,6 +1317,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1396,7 +1396,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1423,8 +1423,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1444,6 +1442,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1535,7 +1535,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1562,8 +1562,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1583,6 +1581,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1674,7 +1674,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1701,8 +1701,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -1722,6 +1720,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -1791,7 +1791,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1818,8 +1818,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -1839,6 +1837,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -1916,7 +1916,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1943,8 +1943,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -1964,6 +1962,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -2072,7 +2072,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2099,8 +2099,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -2120,6 +2118,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2228,7 +2228,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2255,8 +2255,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -2276,6 +2274,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>1</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -2345,7 +2345,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2372,8 +2372,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -2393,6 +2391,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2470,7 +2470,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2497,8 +2497,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -2518,6 +2516,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>0</events> <continent>Unknown</continent> <continentCode>unk</continentCode> @@ -2609,7 +2609,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2636,8 +2636,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -2657,6 +2655,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -2748,7 +2748,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2775,8 +2775,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -2796,6 +2794,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -2887,7 +2887,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2914,8 +2914,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -2935,6 +2933,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3018,7 +3018,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3045,8 +3045,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3066,6 +3064,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3143,7 +3143,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3170,8 +3170,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3191,6 +3189,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -3268,7 +3268,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3295,8 +3295,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3316,6 +3314,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3393,7 +3393,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3420,8 +3420,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -3441,6 +3439,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3518,7 +3518,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3545,8 +3545,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3566,6 +3564,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3674,7 +3674,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3701,8 +3701,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3722,6 +3720,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -3830,7 +3830,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3857,8 +3857,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -3878,6 +3876,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -3986,7 +3986,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -4013,8 +4013,6 @@ <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> - <browserFamily>unknown</browserFamily> - <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> @@ -4034,6 +4032,8 @@ </row> </pluginsIcons> <deviceType>Unknown</deviceType> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -4134,7 +4134,7 @@ - + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -4161,8 +4161,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -4182,6 +4180,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4259,7 +4259,7 @@ - + <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4286,8 +4286,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -4307,6 +4305,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4384,7 +4384,7 @@ - + <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4411,8 +4411,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -4432,6 +4430,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4509,7 +4509,7 @@ - + <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4536,8 +4536,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -4557,6 +4555,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -4634,7 +4634,7 @@ - + <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4661,8 +4661,6 @@ <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> @@ -4682,6 +4680,8 @@ </row> </pluginsIcons> <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..73c3594e16 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>WebKit</row> + <row>Blink</row> + <row>Trident</row> + <row>Text-based</row> + <row>Dillo</row> + <row>iCab</row> + <row>Presto</row> + <row>Gecko</row> + <row>KHTML</row> + <row>NetFront</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index a0c585b68a..52257420bd 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -270,35 +270,6 @@ </row> <row> <category>Visitor Settings</category> - <name>Browser Family</name> - <module>UserSettings</module> - <action>getBrowserType</action> - <dimension>Browser family</dimension> - <documentation>This chart shows your visitors' browsers broken down into browser families. <br /> The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserType&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getBrowserType&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getBrowserType</uniqueId> - </row> - <row> - <category>Visitor Settings</category> <name>Browser Plugins</name> <module>UserSettings</module> <action>getPlugin</action> @@ -2046,6 +2017,34 @@ <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> </row> <row> + <category>Visitor Devices</category> + <name>Browser engines</name> + <module>DevicesDetection</module> + <action>getBrowserEngines</action> + <dimension>Browser engine</dimension> + <metrics> + <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> + </metrics> + <metricsDocumentation> + <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> + </metricsDocumentation> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + </processedMetrics> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserEngines&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserEngines&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowserEngines</uniqueId> + </row> + <row> <category>API</category> <name>Main metrics</name> <module>API</module> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 9709fdfbaf..10e7fd78e3 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -117,6 +117,14 @@ <row> <type>dimension</type> <category>Visit</category> + <name>Browser engine</name> + <segment>browserEngine</segment> + <acceptedValues>Trident, WebKit, Presto, Gecko, Blink, etc.</acceptedValues> + <suggestedValuesCallback>\DeviceDetector\Parser\Client\Browser\Engine::getAvailableEngines</suggestedValuesCallback> + </row> + <row> + <type>dimension</type> + <category>Visit</category> <name>Browser version</name> <segment>browserVersion</segment> <acceptedValues>1.0, 8.0, etc.</acceptedValues> |