diff options
| author | Benaka <diosmosis@users.noreply.github.com> | 2017-06-09 12:10:14 +0300 |
|---|---|---|
| committer | Stefan Giehl <stefan@piwik.org> | 2017-06-09 12:10:14 +0300 |
| commit | e1dd7122b58e1490a0158e06f48408df771d6ebd (patch) | |
| tree | f509b78038b08bd28791c0cad0b188740042d894 /tests/PHPUnit | |
| parent | 73a00c020d1668d866a2196c3e1a0a6e7aed06b7 (diff) | |
Fixes to some local testing issues (#11760)
* Fixing travis-ci/local inconsistencies in AutoSuggestAPITest.php. (userAgent was not correctly set in fixture)
* In CliMulti, ignore zombie processes when parsing ps output.
* Set URL of tracker in ThreeVisitsWithCustomEvents fixture, so test does not depend on _SERVER["HTTP_HOST"] which in turn depends on dynamic INI config value.
* PHPUnit tests should not refer to each other, otherwise the PSR autoloader will be used, and PHPUnit will not load the file itself (resulting in the test not being run).
* Update OneVisitorTwoVisitsTest expected files.
* URL encode attribution date time in fixture since the tracker will not do it itself.
Diffstat (limited to 'tests/PHPUnit')
26 files changed, 583 insertions, 236 deletions
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index 7faeaee97a..efba2d8c83 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -116,9 +116,13 @@ class ManyVisitsWithGeoIP extends Fixture $t->setTokenAuth(self::getTokenAuth()); for ($i = 0; $i != $visitorCount; ++$i) { $t->setVisitorId( substr(md5($i + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); + + $userAgent = null; if ($setIp) { + $userAgent = current($this->userAgents); + $t->setIp(current($this->ips)); - $t->setUserAgent(current($this->userAgents)); + $t->setUserAgent($userAgent); next($this->userAgents); next($this->ips); } else { @@ -140,6 +144,10 @@ class ManyVisitsWithGeoIP extends Fixture } // second visit + if ($userAgent) { + $t->setUserAgent($userAgent); // unset in doTrack... + } + $date = $date->addHour(1); $t->setForceVisitDateTime($date->getDatetime()); $t->setUrl("http://piwik.net/space/quest/iv"); @@ -157,6 +165,10 @@ class ManyVisitsWithGeoIP extends Fixture self::checkResponse($r); } + if ($userAgent) { + $t->setUserAgent($userAgent); // unset in doTrack... + } + // Track site search (for AutoSuggestAPI test) // Only for half visitors so they don't all have a "site search" as last action and some of them have a standard page view as last action $date = $date->addHour(0.1); diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php index c190cb2f77..5061a84cce 100644 --- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php +++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php @@ -208,4 +208,12 @@ class OneVisitorTwoVisits extends Fixture // - // End of second visit } + + /** + * @return string + */ + public static function getValueForHideColumns() + { + return 'nb_users,sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth'; + } }
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php index 03cb78f9da..e4e711cd73 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php @@ -194,7 +194,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture $t5->setUrl('http://asteroidm.com'); // all params suppplied, one that differs from url referrer $t5->setAttributionInfo(json_encode(array('Recruiting Drive', 'am i a mutant?', - Date::factory($dateTime)->addHour(1)->getDatetime(), 'http://sentinelwatch.org'))); + urlencode(Date::factory($dateTime)->addHour(1)->getDatetime()), 'http://sentinelwatch.org'))); self::checkResponse($t5->doTrackPageView('Fighting Back')); $t5->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime()); @@ -202,7 +202,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture $t5->setUrl('http://mutantrights.org'); // params supplied, for existing campaign $t5->setAttributionInfo(json_encode(array('GA Campaign', 'some keyword', - Date::factory($dateTime)->addHour(2)->getDatetime()))); + urlencode(Date::factory($dateTime)->addHour(2)->getDatetime())))); self::checkResponse($t5->doTrackPageView('Mutant Registration')); } diff --git a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php index 3471c3b3e7..874a31d16f 100644 --- a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php @@ -61,6 +61,7 @@ class ThreeVisitsWithCustomEvents extends Fixture $this->dateTime = Date::factory($this->dateTime)->addHour(0.5); $vis2 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal); + $vis2->setUrl('http://example.com/piwik/'); $vis2->setIp('111.1.1.1'); $vis2->setPlugins($flash = false, $java = false, $director = true); @@ -70,6 +71,7 @@ class ThreeVisitsWithCustomEvents extends Fixture $this->dateTime = Date::factory($this->dateTime)->addDay(1); $vis3 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal); + $vis3->setUrl('http://example.com/piwik/'); $vis3->setIp('111.1.1.2'); $vis3->setPlugins($flash = false, $java = false, $director = true); diff --git a/tests/PHPUnit/System/AutoSuggestAPITest.php b/tests/PHPUnit/System/AutoSuggestAPITest.php index 014625b689..8a3900cf8d 100644 --- a/tests/PHPUnit/System/AutoSuggestAPITest.php +++ b/tests/PHPUnit/System/AutoSuggestAPITest.php @@ -54,7 +54,7 @@ class AutoSuggestAPITest extends SystemTestCase $apiForTesting[] = $this->getApiForTestingForSegment($idSite, $segment); } - if (self::isMysqli() || self::isTravisCI()) { + if (self::isMysqli()) { // Skip the test on Mysqli as it fails due to rounding Float errors on latitude/longitude // then the test started failing after bc19503 and I cannot understand why echo "Skipped test \n"; @@ -121,10 +121,6 @@ class AutoSuggestAPITest extends SystemTestCase $apiForTesting = array(); foreach ($segments as $segment) { - if(self::isTravisCI() && $segment == 'deviceType') { - // test started failing after bc19503 and I cannot understand why - continue; - } $apiForTesting[] = array('VisitsSummary.get', array('idSite' => self::$fixture->idSite, 'date' => date("Y-m-d", strtotime(self::$fixture->dateTime)) . ',today', diff --git a/tests/PHPUnit/System/CliMultiTest.php b/tests/PHPUnit/System/CliMultiTest.php index 23ea2e68a3..f5d0fa85b0 100644 --- a/tests/PHPUnit/System/CliMultiTest.php +++ b/tests/PHPUnit/System/CliMultiTest.php @@ -144,7 +144,7 @@ class CliMultiTest extends SystemTestCase { $this->cliMulti->runAsSuperUser(); $response = $this->cliMulti->request(array($this->completeUrl(''))); - $this->assertStringStartsWith('Error in Piwik: Error: no website was found', $response[0]); + $this->assertContains('Error: no website was found', $response[0]); } public function test_request_shouldBeAbleToRenderARegularPageInPiwik() diff --git a/tests/PHPUnit/System/DuplicateActionsTest.php b/tests/PHPUnit/System/DuplicateActionsTest.php index 2ffd14be76..f8ab781455 100644 --- a/tests/PHPUnit/System/DuplicateActionsTest.php +++ b/tests/PHPUnit/System/DuplicateActionsTest.php @@ -64,7 +64,7 @@ class DuplicateActionsTest extends SystemTestCase 'date' => $dateTime, 'compareAgainst' => 'OneVisitorTwoVisits', 'otherRequestParameters' => array( - 'hideColumns' => OneVisitorTwoVisitsTest::getValueForHideColumns(), + 'hideColumns' => OneVisitorTwoVisits::getValueForHideColumns(), ) )) ); diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php index b6a0d0c201..2098ccce14 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php @@ -33,14 +33,6 @@ class OneVisitorTwoVisitsTest extends SystemTestCase */ public static $fixture = null; // initialized below class - /** - * @return string - */ - public static function getValueForHideColumns() - { - return 'nb_users,sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth'; - } - public function setUp() { Proxy::getInstance()->setHideIgnoredFunctions(false); @@ -90,7 +82,7 @@ class OneVisitorTwoVisitsTest extends SystemTestCase array('all', array('idSite' => $idSite, 'date' => $dateTime, 'otherRequestParameters' => array( - 'hideColumns' => self::getValueForHideColumns(), + 'hideColumns' => OneVisitorTwoVisits::getValueForHideColumns(), ) )), diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index e9722c1864..a79a0dba17 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -96,9 +96,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -112,6 +116,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -196,7 +206,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -223,7 +233,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -289,9 +299,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -305,6 +319,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -354,7 +374,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -420,9 +440,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -436,6 +460,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -501,7 +531,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -528,7 +558,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -594,9 +624,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -610,6 +644,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -659,7 +699,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -725,9 +765,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -741,6 +785,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -825,7 +875,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -852,7 +902,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -918,9 +968,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -934,6 +988,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -983,7 +1043,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1049,9 +1109,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1065,6 +1129,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1130,7 +1200,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1157,7 +1227,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1223,9 +1293,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1239,6 +1313,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1288,7 +1368,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1354,9 +1434,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1370,6 +1454,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1454,7 +1544,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1481,7 +1571,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1547,9 +1637,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1563,6 +1657,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1612,7 +1712,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1678,9 +1778,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1694,6 +1798,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1759,7 +1869,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1786,7 +1896,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1852,9 +1962,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1868,6 +1982,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -1933,7 +2053,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -1960,7 +2080,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -1984,22 +2104,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <deviceType>Tablet</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/tablet.png</deviceTypeIcon> + <deviceBrand>Sony</deviceBrand> + <deviceModel>Xperia Tablet S</deviceModel> + <operatingSystem>Android 4.1</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.1</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 34.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>34.0</browserVersion> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -2018,9 +2138,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2034,6 +2158,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2083,7 +2213,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2149,9 +2279,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2165,6 +2299,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2214,7 +2354,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2280,9 +2420,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2296,6 +2440,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2380,7 +2530,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -2407,7 +2557,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2473,9 +2623,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2489,6 +2643,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2573,7 +2733,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -2600,7 +2760,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2624,22 +2784,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Dell</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 11.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>11.0</browserVersion> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -2658,9 +2818,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2674,6 +2838,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2723,7 +2893,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2789,9 +2959,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2805,6 +2979,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -2854,7 +3034,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -2920,9 +3100,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -2936,6 +3120,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3001,7 +3191,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -3028,7 +3218,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3094,9 +3284,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3110,6 +3304,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3175,7 +3375,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -3202,7 +3402,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3268,9 +3468,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3284,6 +3488,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3349,7 +3559,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -3376,7 +3586,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3400,22 +3610,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>Vista</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 8.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3434,9 +3644,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3450,6 +3664,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3515,7 +3735,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -3542,7 +3762,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3608,9 +3828,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3624,6 +3848,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3673,7 +3903,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3739,9 +3969,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3755,6 +3989,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3804,7 +4044,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -3870,9 +4110,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3886,6 +4130,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -3935,7 +4185,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4001,9 +4251,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4017,6 +4271,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -4066,7 +4326,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4132,9 +4392,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4148,6 +4412,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -4232,7 +4502,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -4259,7 +4529,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4325,9 +4595,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4341,6 +4615,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -4425,7 +4705,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -4452,7 +4732,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4518,9 +4798,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4534,6 +4818,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -4618,7 +4908,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -4645,7 +4935,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4669,22 +4959,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows 8.1</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>8.1</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 32.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>32.0</browserVersion> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -4703,9 +4993,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4719,6 +5013,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -4803,7 +5103,7 @@ <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <icon>plugins/Morpheus/images/link.gif</icon> + <icon>plugins/Morpheus/images/link.png</icon> </row> <row> @@ -4830,7 +5130,7 @@ <userId /> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> @@ -4855,7 +5155,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Phablet</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/phablet.png</deviceTypeIcon> <deviceBrand>Samsung</deviceBrand> <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> @@ -4896,9 +5196,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -4912,6 +5216,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -5027,9 +5337,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -5043,6 +5357,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -5158,9 +5478,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -5174,6 +5498,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -5289,9 +5619,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -5305,6 +5639,12 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -5379,7 +5719,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Phablet</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/phablet.png</deviceTypeIcon> <deviceBrand>Samsung</deviceBrand> <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> @@ -5420,9 +5760,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -5436,5 +5780,11 @@ + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml index 2479501ff3..43031de55b 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>FF</row> - <row>UNK</row> - <row>CM</row> - <row>QQ</row> - <row>AN</row> <row>CH</row> <row>IE</row> + <row>QQ</row> + <row>CM</row> + <row>AN</row> <row>SF</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml index c3c7ec0152..91740cd18d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>3.6</row> - <row>33</row> - <row>5</row> - <row>3</row> <row>32</row> + <row>5</row> + <row>33</row> + <row>8</row> <row>34</row> <row>11</row> - <row>8</row> + <row>3</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml index e421ad0903..6929bcb5c1 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>Unknown</row> - <row>HTC</row> <row>Samsung</row> <row>Google</row> <row>Dell</row> <row>Sony</row> + <row>HTC</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml index 828ec1e21b..e5851e11e6 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> - <nb_actions>76</nb_actions> - <nb_visits_converted>27</nb_visits_converted> + <nb_visits>25</nb_visits> + <nb_actions>67</nb_actions> + <nb_visits_converted>25</nb_visits_converted> <bounce_count>13</bounce_count> - <sum_visit_length>22694</sum_visit_length> + <sum_visit_length>19452</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>48%</bounce_rate> - <nb_actions_per_visit>2.8</nb_actions_per_visit> - <avg_time_on_site>841</avg_time_on_site> + <bounce_rate>52%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>778</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml index 3ce6d98183..602805c283 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>28</nb_visits> - <nb_actions>74</nb_actions> - <nb_visits_converted>28</nb_visits_converted> - <bounce_count>15</bounce_count> + <nb_visits>27</nb_visits> + <nb_actions>73</nb_actions> + <nb_visits_converted>27</nb_visits_converted> + <bounce_count>14</bounce_count> <sum_visit_length>21073</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>54%</bounce_rate> - <nb_actions_per_visit>2.6</nb_actions_per_visit> - <avg_time_on_site>753</avg_time_on_site> + <bounce_rate>52%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>780</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml index 90e7df368b..c79c69b966 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml @@ -2,7 +2,6 @@ <result> <row>WIN</row> <row>AND</row> - <row>UNK</row> <row>UBT</row> <row>MLD</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml index fc9d2e2c5a..a2651f3ccd 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>22</nb_visits> - <nb_actions>54</nb_actions> - <nb_visits_converted>22</nb_visits_converted> + <nb_visits>25</nb_visits> + <nb_actions>68</nb_actions> + <nb_visits_converted>25</nb_visits_converted> <bounce_count>13</bounce_count> - <sum_visit_length>14589</sum_visit_length> + <sum_visit_length>19452</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>59%</bounce_rate> - <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>663</avg_time_on_site> + <bounce_rate>52%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>778</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml index efcc22ca70..4d86f11bfd 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>XP</row> - <row>UNK</row> <row>4.4</row> + <row>8.1</row> <row>4.3</row> <row>9.04</row> - <row>8</row> - <row>8.1</row> + <row>Vista</row> <row>4.1</row> <row>7</row> - <row>Vista</row> + <row>8</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 64cee9f3ac..8c48d07315 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -294,7 +294,7 @@ Another line</defaultValue> </row> <row> <name>redisHost</name> - <title>Redis host</title> + <title>Redis host or unix socket</title> <value>127.0.0.1</value> <defaultValue>127.0.0.1</defaultValue> <type>string</type> @@ -304,7 +304,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> + <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -321,7 +321,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535.</inlineHelp> + <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index da99abbc01..68eb0c2cb1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -22,7 +22,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>43</revenue> - <logo>plugins/Morpheus/icons/dist/brand/Unknown.ico</logo> + <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml index aa4fc41878..faf5f2c061 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml @@ -9,15 +9,15 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> - <row idgoal='2'> + <row idgoal='1'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> - <revenue>1</revenue> + <revenue>42</revenue> </row> - <row idgoal='1'> + <row idgoal='2'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> - <revenue>42</revenue> + <revenue>1</revenue> </row> </goals> <nb_conversions>2</nb_conversions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 6d304e257f..80be0570eb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -9,14 +9,19 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> <revenue>1</revenue> </row> </goals> - <nb_conversions>1</nb_conversions> - <revenue>1</revenue> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> <segment>deviceType==desktop</segment> <logo>plugins/Morpheus/icons/dist/devices/desktop.png</logo> </row> @@ -30,37 +35,37 @@ <label>Car browser</label> <nb_visits>0</nb_visits> <segment>deviceType==car+browser</segment> - <logo>plugins/Morpheus/icons/dist/devices/carbrowser.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/car_browser.png</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> <segment>deviceType==console</segment> - <logo>plugins/Morpheus/icons/dist/devices/console.gif</logo> + <logo>plugins/Morpheus/icons/dist/devices/console.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> <segment>deviceType==feature+phone</segment> - <logo>plugins/Morpheus/icons/dist/devices/mobile.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo> </row> <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> - <logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/phablet.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> <segment>deviceType==portable+media+player</segment> - <logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/portable_media_player.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> <segment>deviceType==smart+display</segment> - <logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/smart_display.png</logo> </row> <row> <label>Smartphone</label> @@ -80,18 +85,4 @@ <segment>deviceType==tv</segment> <logo>plugins/Morpheus/icons/dist/devices/tv.png</logo> </row> - <row> - <label>Unknown</label> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>42</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>42</revenue> - <nb_visits>0</nb_visits> - <logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 01c30c1a1b..9a80fd221e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -25,7 +25,6 @@ <code>fr</code> <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index d13ec92745..451f2f890b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -60,11 +60,11 @@ </row> </reportMetadata> <reportTotal> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> + <exit_nb_visits>2</exit_nb_visits> <entry_bounce_count>1</entry_bounce_count> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> - <exit_nb_visits>1</exit_nb_visits> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>8</entry_nb_actions> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv Binary files differindex 1b6a6591aa..2ff47c1417 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 90c254ce80..2fcd4a341f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -14,7 +14,7 @@ <nb_visits>Visits</nb_visits> </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_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <metricsGoal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml index 9bdbd47c3e..dba7ff2e2a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml @@ -12,7 +12,7 @@ <nb_visits>Visits</nb_visits> </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_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitsSummary&apiAction=get&period=day&date=2010-02-05,2010-03-06</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitsSummary&apiAction=get&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> |