diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-02 07:32:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 07:32:03 +0300 |
| commit | 95dff7b6812f54c1afc67d6781a5d01d47c3ca60 (patch) | |
| tree | 3c49147c490360c0d436dba0e1c9690d9978bd0b /tests | |
| parent | 28409d4c92f46ce3b250501c769bb08ebb26884c (diff) | |
| parent | 59ba07cba11cd51a49ba5a4946abee0d34c4c7a9 (diff) | |
Merge pull request #10945 from piwik/3.x-dev3.0.0-b4
Piwik 3.0.0-b4 release
Diffstat (limited to 'tests')
96 files changed, 1837 insertions, 854 deletions
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 3a107c26bd..f89fc4948b 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -41,6 +41,8 @@ class ManySitesImportedLogs extends Fixture GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::setCurrentProvider('geoip_php'); + self::createSuperUser(); + $this->trackVisits(); $this->setupSegments(); } diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php index d7fe5e51a6..c190cb2f77 100644 --- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php +++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php @@ -13,6 +13,7 @@ use Piwik\Db; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Tests\Framework\Fixture; +use Piwik\Tracker\Cache; /** * This fixture adds one website and tracks two visits by one visitor. @@ -84,8 +85,12 @@ class OneVisitorTwoVisits extends Fixture APISitesManager::getInstance()->setSiteSpecificUserAgentExcludeEnabled(false); } + self::createSuperUser(); $t = self::getTracker($idSite, $dateTime, $defaultInit = true); + Cache::clearCacheGeneral(); + Cache::regenerateCacheWebsiteAttributes(array($idSite)); + if ($this->useThirdPartyCookies) { $t->DEBUG_APPEND_URL = '&forceUseThirdPartyCookie=1'; } diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index c0ea0ce4cd..131af64a0f 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -12,6 +12,7 @@ use Piwik\Application\Environment; use Piwik\Archive; use Piwik\ArchiveProcessor\PluginsArchiver; use Piwik\Auth; +use Piwik\Auth\Password; use Piwik\Cache\Backend\File; use Piwik\Cache as PiwikCache; use Piwik\Common; @@ -663,34 +664,38 @@ class Fixture extends \PHPUnit_Framework_Assert */ public static function getTokenAuth() { - return APIUsersManager::getInstance()->getTokenAuth( - self::ADMIN_USER_LOGIN, - UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD) - ); + $model = new \Piwik\Plugins\UsersManager\Model(); + $user = $model->getUser(self::ADMIN_USER_LOGIN); + + return $user['token_auth']; } public static function createSuperUser($removeExisting = true) { - $login = self::ADMIN_USER_LOGIN; - $password = UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD); - $token = self::getTokenAuth(); + $passwordHelper = new Password(); + + $login = self::ADMIN_USER_LOGIN; + $password = $passwordHelper->hash(UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD)); + $token = APIUsersManager::getInstance()->createTokenAuth($login); $model = new \Piwik\Plugins\UsersManager\Model(); + $user = $model->getUser($login); + if ($removeExisting) { $model->deleteUserOnly($login); } - $user = $model->getUser($login); - - if (empty($user)) { + if (!empty($user) && !$removeExisting) { + $token = $user['token_auth']; + } + if (empty($user) || $removeExisting) { $model->addUser($login, $password, 'hello@example.org', $login, $token, Date::now()->getDatetime()); } else { $model->updateUser($login, $password, 'hello@example.org', $login, $token); } - if (empty($user['superuser_access'])) { - $model->setSuperUserAccess($login, true); - } + $setSuperUser = empty($user) || !empty($user['superuser_access']); + $model->setSuperUserAccess($login, $setSuperUser); return $model->getUserByTokenAuth($token); } diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index 272c36c0e1..823b6037be 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -230,12 +230,17 @@ class HttpTest extends \PHPUnit_Framework_TestCase } /** + * erroe message can be: + * curl_exec: server certificate verification failed. CAfile: /home/travis/build/piwik/piwik/core/DataFiles/cacert.pem CRLfile: none. Hostname requested was: self-signed.badssl.com + * or + * curl_exec: SSL certificate problem: self signed certificate. Hostname requested was: self-signed.badssl.com * @expectedException \Exception - * @expectedExceptionMessage curl_exec: SSL + * @expectedExceptionMessageRegExp /curl_exec: .*certificate.* / */ public function testCurlHttpsFailsWithInvalidCertificate() { - Http::sendHttpRequestBy('curl', 'https://www.virtual-drums.com', 10); + // use a domain from https://badssl.com/ + Http::sendHttpRequestBy('curl', 'https://self-signed.badssl.com/', 10); } /** @@ -244,7 +249,8 @@ class HttpTest extends \PHPUnit_Framework_TestCase */ public function testFopenHttpsFailsWithInvalidCertificate() { - Http::sendHttpRequestBy('fopen', 'https://www.virtual-drums.com', 10); + // use a domain from https://badssl.com/ + Http::sendHttpRequestBy('fopen', 'https://self-signed.badssl.com/', 10); } /** diff --git a/tests/PHPUnit/Integration/NumberFormatterTest.php b/tests/PHPUnit/Integration/NumberFormatterTest.php index dc546ef9d8..c420b4bcb2 100644 --- a/tests/PHPUnit/Integration/NumberFormatterTest.php +++ b/tests/PHPUnit/Integration/NumberFormatterTest.php @@ -121,10 +121,10 @@ class NumberFormatterTest extends \PHPUnit_Framework_TestCase array('en', -5000000, 0, 0, '-5,000,000%'), // foreign languages - array('ar', 51239.56, 3, 0, '51٬239٫56٪'), + array('ar', 51239.56, 3, 0, '51٬239٫56 ٪'), array('be', 51239.56, 3, 0, '51 239,56 %'), array('de', 51239.56, 3, 0, '51.239,56 %'), - array('bn', 152551239.56, 3, 0, '15,25,51,239.56%'), + array('bn', 152551239.56, 3, 0, '152,551,239.56%'), array('hi', 152551239.56, 0, 0, '15,25,51,240%'), array('lt', -152551239.56, 0, 0, '−152 551 240 %'), ); diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php index 9558cc0929..20b23065db 100644 --- a/tests/PHPUnit/Integration/SegmentTest.php +++ b/tests/PHPUnit/Integration/SegmentTest.php @@ -426,6 +426,92 @@ class SegmentTest extends IntegrationTestCase $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); } + public function test_getSelectQuery_whenJoiningManyCustomTablesItShouldKeepTheOrderAsDefined() + { + $actionType = 3; + $idSite = 1; + $select = 'log_link_visit_action.custom_dimension_1, + log_action.name as url, + sum(log_link_visit_action.time_spent) as `13`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6`'; + $from = array( + 'log_link_visit_action', + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => 'log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit', + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => 'log_link_visit_action_foo.idaction_url = log_action_foo.idaction', + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_bar', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_bar.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_bar', + 'joinOn' => "log_link_visit_action_bar.idaction_url = log_action_bar.idaction" + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_baz', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_baz.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_baz', + 'joinOn' => "log_link_visit_action_baz.idaction_url = log_action_baz.idaction" + ), + 'log_action', + ); + + $where = 'log_link_visit_action.server_time >= ? + AND log_link_visit_action.server_time <= ? + AND log_link_visit_action.idsite = ?'; + $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite); + + $segment = 'actionType==' . $actionType; + $segment = new Segment($segment, $idSites = array()); + + $query = $segment->getSelectQuery($select, $from, $where, $bind); + + $logActionTable = Common::prefixTable('log_action'); + $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action'); + + $expected = array( + "sql" => " + SELECT log_link_visit_action.custom_dimension_1, + log_action.name as url, + sum(log_link_visit_action.time_spent) as `13`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6` + FROM $logLinkVisitActionTable AS log_link_visit_action + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_foo + ON log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit + LEFT JOIN $logActionTable AS log_action_foo + ON log_link_visit_action_foo.idaction_url = log_action_foo.idaction + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_bar + ON log_link_visit_action.idvisit = log_link_visit_action_bar.idvisit + LEFT JOIN $logActionTable AS log_action_bar + ON log_link_visit_action_bar.idaction_url = log_action_bar.idaction + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_baz + ON log_link_visit_action.idvisit = log_link_visit_action_baz.idvisit + LEFT JOIN $logActionTable AS log_action_baz + ON log_link_visit_action_baz.idaction_url = log_action_baz.idaction + LEFT JOIN $logActionTable AS log_action + ON log_link_visit_action.idaction_url = log_action.idaction + WHERE ( log_link_visit_action.server_time >= ? + AND log_link_visit_action.server_time <= ? + AND log_link_visit_action.idsite = ? ) + AND ( log_action.type = ? )", + "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType)); + + $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); + } + public function test_getSelectQuery_whenJoinLogLinkVisitActionOnActionOnVisit_WithSameTableAliasButDifferentJoin() { $actionType = 3; diff --git a/tests/PHPUnit/Integration/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php index 5eab999b66..724fe963a0 100644 --- a/tests/PHPUnit/Integration/Tracker/ActionTest.php +++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php @@ -174,6 +174,21 @@ class ActionTest extends IntegrationTestCase } /** + * Testing with some website specific parameters excluded using regular expressions + * @dataProvider getTestUrls + */ + public function testExcludeQueryParametersRegExSiteExcluded($url, $filteredUrl) + { + $excludedQueryParameters = '/p[4|2]/, /^var.*/'; + $this->setUpRootAccess(); + $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, + $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, + $excludedIps = '', $excludedQueryParameters, $timezone = null, $currency = null, + $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); + $this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite)); + } + + /** * Testing with some website specific and some global excluded query parameters * @dataProvider getTestUrls */ diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php index bff3c80b08..05eee7ea30 100644 --- a/tests/PHPUnit/Integration/Tracker/RequestTest.php +++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php @@ -293,7 +293,7 @@ class RequestTest extends IntegrationTestCase $login = 'myadmin'; $passwordHash = UsersManager::getPasswordHash('password'); - $token = API::getInstance()->getTokenAuth($login, $passwordHash); + $token = API::getInstance()->createTokenAuth($login); $user = new Model(); $user->addUser($login, $passwordHash, 'admin@piwik', 'alias', $token, '2014-01-01 00:00:00'); diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index a8787cc5ee..f596684d92 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -26,11 +26,12 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")), $pageCustomVariables = array(array("page cvar", "page cvar value")), $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", - $doNotTrack = true); + $doNotTrack = true, $disableCookies = false, $trackNoScript = true); $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -50,7 +51,33 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript> +<!-- End Piwik Code --> +"; + + $this->assertEquals($expected, $jsTag); + } + + public function testJavascriptTrackingCode_noScriptTrackingDisabled_defaultTrackingCode() + { + $generator = new TrackerCodeGenerator(); + + $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik'); + + $expected = "<!-- Piwik --> +<script type="text/javascript"> + var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//localhost/piwik/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', '1']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); +</script> <!-- End Piwik Code --> "; @@ -78,6 +105,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -97,7 +125,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="https://localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -125,6 +152,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -145,7 +173,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -169,6 +196,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); @@ -180,7 +208,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase })(); </script> <script type='text/javascript' src="//localhost/piwik/piwik.js"></script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -206,6 +233,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = '<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "visit"]); @@ -223,7 +251,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//abc"def/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> '; diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index ca6aa942fb..b42228ab18 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -30,6 +30,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -56,6 +57,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -136,6 +138,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -162,6 +165,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -242,6 +246,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -268,6 +273,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -348,6 +354,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -374,6 +381,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -454,6 +462,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -480,6 +489,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -560,6 +570,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -586,6 +597,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -666,6 +678,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -692,6 +705,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -772,6 +786,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -798,6 +813,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -878,6 +894,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -904,6 +921,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 0a45cfa38e..dea1215c4e 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -20,6 +20,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -50,6 +51,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>5</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -69,6 +71,7 @@ </row> </customVariables> <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> <timeSpent>52</timeSpent> <timeSpentPretty>52s</timeSpentPretty> <icon /> @@ -88,6 +91,7 @@ </row> </customVariables> <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>50</timeSpent> <timeSpentPretty>50s</timeSpentPretty> <icon /> @@ -107,6 +111,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> <timeSpent>49</timeSpent> <timeSpentPretty>49s</timeSpentPretty> <icon /> @@ -126,6 +131,7 @@ </row> </customVariables> <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -145,6 +151,7 @@ </row> </customVariables> <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -164,6 +171,7 @@ </row> </customVariables> <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -183,6 +191,7 @@ </row> </customVariables> <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> <timeSpent>8</timeSpent> <timeSpentPretty>8s</timeSpentPretty> <icon /> @@ -202,6 +211,7 @@ </row> </customVariables> <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> <icon /> </row> @@ -228,6 +238,7 @@ <visitDurationPretty>54s</visitDurationPretty> <searches>0</searches> <actions>10</actions> + <interactions>10</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -316,6 +327,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -342,6 +354,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -435,6 +448,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -461,6 +475,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -545,6 +560,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -571,6 +587,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -644,6 +661,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -673,6 +691,7 @@ <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -699,6 +718,7 @@ <visitDurationPretty>3 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -772,6 +792,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -790,6 +811,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -808,6 +830,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -834,6 +857,7 @@ <visitDurationPretty>2 min 3s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -918,6 +942,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -944,6 +969,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1028,6 +1054,7 @@ <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1054,6 +1081,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1127,6 +1155,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1153,6 +1182,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1237,6 +1267,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1263,6 +1294,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> 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 df849a8f3f..9079f5d43c 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -20,10 +20,11 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s pitch black...</pageTitle> + <pageTitle>It's pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -173,9 +177,10 @@ <type>download</type> <url>http://example.org/path/file8.zip</url> <pageTitle /> - <pageIdAction>46</pageIdAction> + <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -185,9 +190,10 @@ <type>outlink</type> <url>http://example-outlink.org/8.html</url> <pageTitle /> - <pageIdAction>47</pageIdAction> + <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -196,13 +202,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>50</pageId> <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -318,7 +326,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>45</pageId> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -471,9 +482,10 @@ <type>download</type> <url>http://example.org/path/file7.zip</url> <pageTitle /> - <pageIdAction>41</pageIdAction> + <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -483,9 +495,10 @@ <type>outlink</type> <url>http://example-outlink.org/7.html</url> <pageTitle /> - <pageIdAction>42</pageIdAction> + <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -494,13 +507,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>44</pageId> <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -616,7 +631,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>40</pageId> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -787,9 +806,10 @@ <type>download</type> <url>http://example.org/path/file6.zip</url> <pageTitle /> - <pageIdAction>36</pageIdAction> + <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -799,9 +819,10 @@ <type>outlink</type> <url>http://example-outlink.org/6.html</url> <pageTitle /> - <pageIdAction>37</pageIdAction> + <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -810,13 +831,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>39</pageId> <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -932,7 +955,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>34</pageId> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1054,6 +1079,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1085,9 +1111,10 @@ <type>download</type> <url>http://example.org/path/file5.zip</url> <pageTitle /> - <pageIdAction>31</pageIdAction> + <pageIdAction>32</pageIdAction> <pageId>31</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1097,9 +1124,10 @@ <type>outlink</type> <url>http://example-outlink.org/5.html</url> <pageTitle /> - <pageIdAction>32</pageIdAction> + <pageIdAction>33</pageIdAction> <pageId>32</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1108,13 +1136,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>33</pageId> <eventCategory>Cat5</eventCategory> <eventAction>Action5</eventAction> <eventName>Name5</eventName> <eventValue>350.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1141,6 +1170,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1230,7 +1260,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -1244,6 +1274,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1270,6 +1301,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1352,6 +1384,7 @@ <pageIdAction>4</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -1381,6 +1414,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -1401,9 +1435,10 @@ <type>download</type> <url>http://example.org/path/file4.zip</url> <pageTitle /> - <pageIdAction>26</pageIdAction> + <pageIdAction>27</pageIdAction> <pageId>26</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1413,9 +1448,10 @@ <type>outlink</type> <url>http://example-outlink.org/4.html</url> <pageTitle /> - <pageIdAction>27</pageIdAction> + <pageIdAction>28</pageIdAction> <pageId>27</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1424,13 +1460,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>28</pageId> <eventCategory>Cat4</eventCategory> <eventAction>Action4</eventAction> <eventName>Name4</eventName> <eventValue>349.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1457,6 +1494,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1546,7 +1584,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>23</pageId> @@ -1560,6 +1598,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1586,6 +1625,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1668,6 +1708,7 @@ <pageIdAction>4</pageIdAction> <pageId>19</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1699,9 +1740,10 @@ <type>download</type> <url>http://example.org/path/file3.zip</url> <pageTitle /> - <pageIdAction>21</pageIdAction> + <pageIdAction>22</pageIdAction> <pageId>20</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1711,9 +1753,10 @@ <type>outlink</type> <url>http://example-outlink.org/3.html</url> <pageTitle /> - <pageIdAction>22</pageIdAction> + <pageIdAction>23</pageIdAction> <pageId>21</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1722,13 +1765,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>22</pageId> <eventCategory>Cat3</eventCategory> <eventAction>Action3</eventAction> <eventName>Name3</eventName> <eventValue>348.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1755,6 +1799,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1837,6 +1882,7 @@ <pageIdAction>4</pageIdAction> <pageId>80</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1868,9 +1914,10 @@ <type>download</type> <url>http://example.org/path/file3.zip</url> <pageTitle /> - <pageIdAction>21</pageIdAction> + <pageIdAction>22</pageIdAction> <pageId>81</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1880,9 +1927,10 @@ <type>outlink</type> <url>http://example-outlink.org/3.html</url> <pageTitle /> - <pageIdAction>22</pageIdAction> + <pageIdAction>23</pageIdAction> <pageId>82</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1891,13 +1939,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>83</pageId> <eventCategory>Cat3</eventCategory> <eventAction>Action3</eventAction> <eventName>Name3</eventName> <eventValue>348.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1924,6 +1973,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1961,7 +2011,7 @@ <city>Lhasa</city> <location>Lhasa, Unknown, Tibet</location> <latitude>29.650000</latitude> - <longitude>91.099998</longitude> + <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -2005,7 +2055,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>18</pageId> @@ -2019,6 +2069,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2045,6 +2096,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2134,7 +2186,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>79</pageId> @@ -2148,6 +2200,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2174,6 +2227,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2184,22 +2238,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <deviceType>Tablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/tablet.png</deviceTypeIcon> + <deviceBrand>Sony</deviceBrand> + <deviceModel>Xperia Tablet S</deviceModel> + <operatingSystem>Android 4.1</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</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/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>34.0</browserVersion> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -2211,7 +2265,7 @@ <city>Lhasa</city> <location>Lhasa, Unknown, Tibet</location> <latitude>29.650000</latitude> - <longitude>91.099998</longitude> + <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -2256,6 +2310,7 @@ <pageIdAction>4</pageIdAction> <pageId>13</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -2285,6 +2340,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -2305,9 +2361,10 @@ <type>download</type> <url>http://example.org/path/file2.zip</url> <pageTitle /> - <pageIdAction>16</pageIdAction> + <pageIdAction>17</pageIdAction> <pageId>15</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2317,9 +2374,10 @@ <type>outlink</type> <url>http://example-outlink.org/2.html</url> <pageTitle /> - <pageIdAction>17</pageIdAction> + <pageIdAction>18</pageIdAction> <pageId>16</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2328,13 +2386,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>17</pageId> <eventCategory>Cat2</eventCategory> <eventAction>Action2</eventAction> <eventName>Name2</eventName> <eventValue>347.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2361,6 +2420,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2397,8 +2457,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> + <latitude>124.456000</latitude> + <longitude>22.231000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -2443,6 +2503,7 @@ <pageIdAction>4</pageIdAction> <pageId>74</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -2472,6 +2533,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -2492,9 +2554,10 @@ <type>download</type> <url>http://example.org/path/file2.zip</url> <pageTitle /> - <pageIdAction>16</pageIdAction> + <pageIdAction>17</pageIdAction> <pageId>76</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2504,9 +2567,10 @@ <type>outlink</type> <url>http://example-outlink.org/2.html</url> <pageTitle /> - <pageIdAction>17</pageIdAction> + <pageIdAction>18</pageIdAction> <pageId>77</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2515,13 +2579,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>78</pageId> <eventCategory>Cat2</eventCategory> <eventAction>Action2</eventAction> <eventName>Name2</eventName> <eventValue>347.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2548,6 +2613,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2629,7 +2695,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>12</pageId> @@ -2643,6 +2709,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2669,6 +2736,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2705,8 +2773,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> + <latitude>124.456000</latitude> + <longitude>22.231000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -2758,7 +2826,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>73</pageId> @@ -2772,6 +2840,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2798,6 +2867,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2808,22 +2878,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceBrand>Dell</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</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/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>11.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -2880,6 +2950,7 @@ <pageIdAction>4</pageIdAction> <pageId>8</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -2911,9 +2982,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>9</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2923,9 +2995,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>10</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2934,13 +3007,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>11</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2967,6 +3041,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3049,6 +3124,7 @@ <pageIdAction>4</pageIdAction> <pageId>58</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3080,9 +3156,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>59</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3092,9 +3169,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>60</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3103,13 +3181,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>61</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3136,6 +3215,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3146,22 +3226,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>HTC</deviceBrand> + <deviceModel>Desire</deviceModel> + <operatingSystem>MildWild 8.0</operatingSystem> + <operatingSystemName>MildWild</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>MLD</operatingSystemCode> + <operatingSystemVersion>8.0</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3173,7 +3253,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -3218,6 +3298,7 @@ <pageIdAction>4</pageIdAction> <pageId>69</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3249,9 +3330,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>70</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3261,9 +3343,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>71</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3272,13 +3355,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>72</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3305,6 +3389,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3342,7 +3427,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -3379,6 +3464,7 @@ <pageIdAction>4</pageIdAction> <pageId>91</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3410,9 +3496,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>92</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3422,9 +3509,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>93</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3433,13 +3521,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>94</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3466,6 +3555,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3480,18 +3570,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> + <operatingSystem>Ubuntu 9.04</operatingSystem> + <operatingSystemName>Ubuntu</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemCode>UBT</operatingSystemCode> + <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> + <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <browserVersion>3.0</browserVersion> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3555,7 +3645,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>7</pageId> @@ -3569,6 +3659,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3595,6 +3686,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3684,7 +3776,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>57</pageId> @@ -3698,6 +3790,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3724,6 +3817,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3734,22 +3828,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>HTC</deviceBrand> + <deviceModel>Desire</deviceModel> + <operatingSystem>MildWild 8.0</operatingSystem> + <operatingSystemName>MildWild</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>MLD</operatingSystemCode> + <operatingSystemVersion>8.0</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3761,7 +3855,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -3813,7 +3907,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>68</pageId> @@ -3827,6 +3921,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3853,6 +3948,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3863,22 +3959,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</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/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3890,7 +3986,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -3942,7 +4038,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>90</pageId> @@ -3956,6 +4052,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3982,6 +4079,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3996,18 +4094,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> + <operatingSystem>Ubuntu 9.04</operatingSystem> + <operatingSystemName>Ubuntu</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemCode>UBT</operatingSystemCode> + <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> + <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <browserVersion>3.0</browserVersion> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -4064,6 +4162,7 @@ <pageIdAction>4</pageIdAction> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4093,6 +4192,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4116,6 +4216,7 @@ <pageIdAction>6</pageIdAction> <pageId>4</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4128,6 +4229,7 @@ <pageIdAction>7</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4136,13 +4238,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>6</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4169,6 +4272,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4205,8 +4309,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> + <latitude>123.456000</latitude> + <longitude>21.321000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -4251,6 +4355,7 @@ <pageIdAction>4</pageIdAction> <pageId>52</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4280,6 +4385,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4303,6 +4409,7 @@ <pageIdAction>6</pageIdAction> <pageId>54</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4315,6 +4422,7 @@ <pageIdAction>7</pageIdAction> <pageId>55</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4323,13 +4431,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>56</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4356,6 +4465,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4366,22 +4476,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>Google</deviceBrand> + <deviceModel>Nexus 4</deviceModel> + <operatingSystem>Android 4.4</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.4</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 33.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>33.0</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4392,7 +4502,7 @@ <regionCode>A6</regionCode> <city>Besançon</city> <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> + <latitude>47.249000</latitude> <longitude>6.018000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> @@ -4438,6 +4548,7 @@ <pageIdAction>4</pageIdAction> <pageId>63</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4467,6 +4578,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4490,6 +4602,7 @@ <pageIdAction>6</pageIdAction> <pageId>65</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4502,6 +4615,7 @@ <pageIdAction>7</pageIdAction> <pageId>66</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4510,13 +4624,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>67</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4543,6 +4658,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4580,7 +4696,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -4617,6 +4733,7 @@ <pageIdAction>4</pageIdAction> <pageId>85</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4646,6 +4763,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4669,6 +4787,7 @@ <pageIdAction>6</pageIdAction> <pageId>87</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4681,6 +4800,7 @@ <pageIdAction>7</pageIdAction> <pageId>88</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4689,13 +4809,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>89</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4722,6 +4843,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4732,22 +4854,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Phablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceBrand>Samsung</deviceBrand> + <deviceModel>GALAXY Note 3</deviceModel> + <operatingSystem>Android 4.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.3</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>QQ Browser 5.0</browser> + <browserName>QQ Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserCode>QQ</browserCode> + <browserVersion>5.0</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4811,7 +4933,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>1</pageId> @@ -4825,6 +4947,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4851,6 +4974,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4887,8 +5011,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> + <latitude>123.456000</latitude> + <longitude>21.321000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -4940,7 +5064,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>51</pageId> @@ -4954,6 +5078,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4980,6 +5105,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4990,22 +5116,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>Google</deviceBrand> + <deviceModel>Nexus 4</deviceModel> + <operatingSystem>Android 4.4</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.4</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 33.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -5016,7 +5142,7 @@ <regionCode>A6</regionCode> <city>Besançon</city> <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> + <latitude>47.249000</latitude> <longitude>6.018000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> @@ -5069,7 +5195,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>62</pageId> @@ -5083,6 +5209,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5109,6 +5236,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5123,18 +5251,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> + <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <operatingSystemVersion>8.1</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 32.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>32.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -5146,7 +5274,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5198,7 +5326,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>84</pageId> @@ -5212,6 +5340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5238,6 +5367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5248,22 +5378,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Phablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceBrand>Samsung</deviceBrand> + <deviceModel>GALAXY Note 3</deviceModel> + <operatingSystem>Android 4.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.3</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>QQ Browser 5.0</browser> + <browserName>QQ Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserCode>QQ</browserCode> + <browserVersion>5.0</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..35bc2d8319 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>1</row> + <row>2</row> + <row>3</row> + <row>4</row> + <row>5</row> + <row>6</row> + <row>7</row> + <row>8</row> + <row>9</row> + <row>10</row> + <row>11</row> + <row>12</row> + <row>13</row> + <row>14</row> + <row>15</row> + <row>16</row> + <row>17</row> + <row>18</row> + <row>19</row> + <row>20</row> + <row>21</row> + <row>22</row> + <row>23</row> + <row>24</row> + <row>25</row> + <row>26</row> + <row>27</row> + <row>28</row> + <row>29</row> + <row>30</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..7c9bf3fd36 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>26</nb_visits> + <nb_actions>50</nb_actions> + <nb_visits_converted>26</nb_visits_converted> + <bounce_count>18</bounce_count> + <sum_visit_length>12968</sum_visit_length> + <max_actions>4</max_actions> + <bounce_rate>69%</bounce_rate> + <nb_actions_per_visit>1.9</nb_actions_per_visit> + <avg_time_on_site>499</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index 3cfabafb6c..9cc9faa5e0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -179,15 +179,6 @@ <avg_event_value>0</avg_event_value> </row> <row> - <label>Purchase</label> - <nb_events>2</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> - <row> <label>rating - La fiancée de l'eau</label> <nb_events>4</nb_events> <nb_events_with_value>4</nb_events_with_value> @@ -215,6 +206,15 @@ <avg_event_value>0</avg_event_value> </row> <row> + <label>Purchase</label> + <nb_events>2</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + <row> <label>This is an event without a URL</label> <nb_events>1</nb_events> <nb_events_with_value>0</nb_events_with_value> @@ -361,15 +361,6 @@ <avg_event_value>0</avg_event_value> </row> <row> - <label>Purchase</label> - <nb_events>1</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> - <row> <label>rating - La fiancée de l'eau</label> <nb_events>2</nb_events> <nb_events_with_value>2</nb_events_with_value> @@ -396,6 +387,15 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>Purchase</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> <result prettyDate="Wednesday, January 6, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 3c677f06fd..10d41c5fe3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -40,6 +41,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -119,6 +121,7 @@ <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -145,6 +148,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -225,6 +229,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -239,6 +244,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -253,6 +259,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -267,6 +274,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -282,6 +290,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -297,6 +306,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -323,6 +333,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -402,6 +413,7 @@ <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -428,6 +440,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -518,6 +531,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -538,6 +552,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -558,6 +573,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -578,6 +594,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -598,6 +615,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -618,6 +636,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -639,6 +658,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -660,6 +680,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -684,6 +705,7 @@ <pageId>9</pageId> <eventCategory>CategoryTriggersGoal here</eventCategory> <eventAction>This is an event without a URL</eventAction> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -697,6 +719,7 @@ <pageId>10</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -711,6 +734,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -725,6 +749,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -739,6 +764,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -753,6 +779,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -767,6 +794,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -781,6 +809,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -807,6 +836,7 @@ <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> <actions>16</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -886,6 +916,7 @@ <pageId>45</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -912,6 +943,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -987,6 +1019,7 @@ <pageId>44</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1013,6 +1046,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1089,6 +1123,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1103,6 +1138,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1117,6 +1153,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1131,6 +1168,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1146,6 +1184,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1161,6 +1200,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1187,6 +1227,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1262,6 +1303,7 @@ <pageId>42</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1288,6 +1330,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1370,6 +1413,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1390,6 +1434,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,6 +1455,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1430,6 +1476,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1450,6 +1497,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1471,6 +1519,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1492,6 +1541,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1505,6 +1555,7 @@ <pageId>33</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1519,6 +1570,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1533,6 +1585,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1547,6 +1600,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1561,6 +1615,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1575,6 +1630,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1589,6 +1645,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1615,6 +1672,7 @@ <visitDurationPretty>59 min 1s</visitDurationPretty> <searches>0</searches> <actions>14</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 6c7b19157a..596636339a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -14,6 +14,7 @@ <pageId>68</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -40,6 +41,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -115,6 +117,7 @@ <pageId>67</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -141,6 +144,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -217,6 +221,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -231,6 +236,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -245,6 +251,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -259,6 +266,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -274,6 +282,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -289,6 +298,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -315,6 +325,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -390,6 +401,7 @@ <pageId>65</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -416,6 +428,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -498,6 +511,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -518,6 +532,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -538,6 +553,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -558,6 +574,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -578,6 +595,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -599,6 +617,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -620,6 +639,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -633,6 +653,7 @@ <pageId>56</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -647,6 +668,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -661,6 +683,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -675,6 +698,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -689,6 +713,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -703,6 +728,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -717,6 +743,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -743,6 +770,7 @@ <visitDurationPretty>59 min 1s</visitDurationPretty> <searches>0</searches> <actions>14</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -818,6 +846,7 @@ <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -844,6 +873,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -923,6 +953,7 @@ <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -949,6 +980,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1029,6 +1061,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1043,6 +1076,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1057,6 +1091,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1071,6 +1106,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1086,6 +1122,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1101,6 +1138,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1127,6 +1165,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1206,6 +1245,7 @@ <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1232,6 +1272,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1322,6 +1363,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1342,6 +1384,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1362,6 +1405,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1382,6 +1426,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1402,6 +1447,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1422,6 +1468,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1443,6 +1490,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1464,6 +1512,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1488,6 +1537,7 @@ <pageId>9</pageId> <eventCategory>CategoryTriggersGoal here</eventCategory> <eventAction>This is an event without a URL</eventAction> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1501,6 +1551,7 @@ <pageId>10</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1515,6 +1566,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1529,6 +1581,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1543,6 +1596,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1557,6 +1611,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1571,6 +1626,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1585,6 +1641,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1611,6 +1668,7 @@ <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> <actions>16</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml index 3ba555ab1a..e98af60cdc 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml @@ -211,7 +211,7 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>page1.html</label> + <label>sub/dir/dir1/page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -222,19 +222,22 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> + <url>http://example.org/sub/dir/dir1/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> </row> <row> - <label>sub/dir/dir1/page1.html</label> + <label>page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -245,18 +248,15 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/sub/dir/dir1/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> + <url>http://example.org/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml index 6d6e6128de..a26e381adb 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml @@ -30,6 +30,24 @@ <is_aggregate>1</is_aggregate> </row> <row> + <label>CustomVarPage - CustomVarValue0</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarPage - CustomVarValue1</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarPage - CustomVarValue2</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> <label>CustomVarVisit - CustomVarValue1</label> <nb_visits>3</nb_visits> <nb_actions>9</nb_actions> @@ -51,24 +69,6 @@ <nb_visits_converted>0</nb_visits_converted> <is_aggregate>0</is_aggregate> </row> - <row> - <label>CustomVarPage - CustomVarValue0</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue1</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue2</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> </result> <result date="2010-03-06"> <row> @@ -89,23 +89,6 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>CustomVarVisit - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> <label>CustomVarPage</label> <nb_actions>1</nb_actions> <slots> @@ -116,6 +99,23 @@ </slots> <is_aggregate>1</is_aggregate> </row> + <row> + <label>CustomVarPage - CustomVarValue1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarVisit - CustomVarValue1</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <is_aggregate>0</is_aggregate> + </row> </result> <result date="2010-03-07" /> <result date="2010-03-08" /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml index 155db4a5b8..760c5bb869 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml @@ -25,54 +25,6 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>dir1/sub</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> - <label>dir1/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>dir2</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> @@ -97,13 +49,13 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>dir2/sub</label> + <label>dir3</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -117,65 +69,64 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> + <avg_time_generation>0.9</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir2/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <label>page1.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> - <is_aggregate>1</is_aggregate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <url>http://example.org/page1.html</url> + <is_aggregate>0</is_aggregate> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> - <label>dir3</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <label>sub</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <exit_rate>0%</exit_rate> + <avg_time_generation>0</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir3/sub</label> + <label>dir1/sub</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -189,17 +140,17 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <avg_time_generation>0.3</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir3/sub/dir</label> + <label>dir1/sub/dir</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -213,7 +164,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <avg_time_generation>0.3</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> @@ -290,6 +241,54 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> + <label>dir2/sub</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.6</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> + <label>dir2/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.6</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>dir2/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -363,6 +362,54 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> + <label>dir3/sub</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.9</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> + <label>dir3/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.9</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>dir3/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -436,53 +483,6 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>page1.html</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <is_aggregate>0</is_aggregate> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> - </row> - <row> - <label>sub</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>sub/dir</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,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> @@ -289,7 +289,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> <introduction /> <condition /> </row> @@ -305,7 +305,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> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index d4fde8bad5..0fc8515f43 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -31,6 +31,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -57,6 +58,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>blog.comperiosearch.com</referrerName> @@ -145,6 +147,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> @@ -174,6 +177,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -200,6 +204,7 @@ <visitDurationPretty>1 min 21s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -287,6 +292,7 @@ </row> </customVariables> <generationTime>0.41s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -313,6 +319,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -413,6 +420,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> <icon /> @@ -442,6 +450,7 @@ <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -468,6 +477,7 @@ <visitDurationPretty>34s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -560,6 +570,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -586,6 +597,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -690,6 +702,7 @@ </row> </customVariables> <generationTime>0.39s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -716,6 +729,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -827,6 +841,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -853,6 +868,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -953,6 +969,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -979,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>berndjung.com</referrerName> @@ -1071,6 +1089,7 @@ </row> </customVariables> <generationTime>0.15s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1097,6 +1116,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>forum.golem.de</referrerName> @@ -1198,6 +1218,7 @@ </row> </customVariables> <generationTime>0.18s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>2</timeSpent> <timeSpentPretty>2s</timeSpentPretty> <icon /> @@ -1228,6 +1249,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1246,6 +1268,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1272,6 +1295,7 @@ <visitDurationPretty>10s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -1368,6 +1392,7 @@ </row> </customVariables> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1394,6 +1419,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1498,6 +1524,7 @@ </row> </customVariables> <generationTime>0.06s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1524,6 +1551,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -1617,6 +1645,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1647,6 +1676,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>5</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1666,6 +1696,7 @@ </row> </customVariables> <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> <timeSpent>52</timeSpent> <timeSpentPretty>52s</timeSpentPretty> <icon /> @@ -1685,6 +1716,7 @@ </row> </customVariables> <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>50</timeSpent> <timeSpentPretty>50s</timeSpentPretty> <icon /> @@ -1704,6 +1736,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> <timeSpent>49</timeSpent> <timeSpentPretty>49s</timeSpentPretty> <icon /> @@ -1723,6 +1756,7 @@ </row> </customVariables> <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -1742,6 +1776,7 @@ </row> </customVariables> <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -1761,6 +1796,7 @@ </row> </customVariables> <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1780,6 +1816,7 @@ </row> </customVariables> <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> <timeSpent>8</timeSpent> <timeSpentPretty>8s</timeSpentPretty> <icon /> @@ -1799,6 +1836,7 @@ </row> </customVariables> <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> <icon /> </row> @@ -1825,6 +1863,7 @@ <visitDurationPretty>54s</visitDurationPretty> <searches>0</searches> <actions>10</actions> + <interactions>10</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1908,6 +1947,7 @@ </row> </customVariables> <generationTime>0.001s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1934,6 +1974,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2005,6 +2046,7 @@ <customVariablePageValue1>302</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>240</timeSpent> <timeSpentPretty>4 min 0s</timeSpentPretty> <icon /> @@ -2034,6 +2076,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -2060,6 +2103,7 @@ <visitDurationPretty>4 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2151,6 +2195,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2177,6 +2222,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2253,6 +2299,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2282,6 +2329,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2309,6 +2357,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -2335,6 +2384,7 @@ <visitDurationPretty>2s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>example.com</referrerName> @@ -2422,6 +2472,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2448,6 +2499,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2528,6 +2580,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2558,6 +2611,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2584,6 +2638,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2674,6 +2729,7 @@ <customVariablePageValue3>301</customVariablePageValue3> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2700,6 +2756,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2794,6 +2851,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2820,6 +2878,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -2915,6 +2974,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2941,6 +3001,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>sn110w.snt110.mail.live.com</referrerName> @@ -3053,6 +3114,7 @@ </row> </customVariables> <generationTime>0.001s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3079,6 +3141,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>www.test.nl</referrerName> @@ -3162,6 +3225,7 @@ </row> </customVariables> <generationTime>0.009s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3188,6 +3252,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3261,6 +3326,7 @@ </row> </customVariables> <eventName>myvideo</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3287,6 +3353,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3359,6 +3426,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3385,6 +3453,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3467,6 +3536,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3493,6 +3563,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3579,6 +3650,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3605,6 +3677,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3680,6 +3753,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3709,6 +3783,7 @@ <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -3735,6 +3810,7 @@ <visitDurationPretty>3 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3810,6 +3886,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3828,6 +3905,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3846,6 +3924,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -3872,6 +3951,7 @@ <visitDurationPretty>2 min 3s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3958,6 +4038,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3984,6 +4065,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4070,6 +4152,7 @@ <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4096,6 +4179,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4171,6 +4255,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -4197,6 +4282,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4283,6 +4369,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4309,6 +4396,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4395,6 +4483,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4421,6 +4510,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4507,6 +4597,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4533,6 +4624,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4615,6 +4707,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4641,6 +4734,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4723,6 +4817,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4749,6 +4844,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4831,6 +4927,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4857,6 +4954,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4939,6 +5037,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4965,6 +5064,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5047,6 +5147,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5073,6 +5174,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5155,6 +5257,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5181,6 +5284,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5263,6 +5367,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5289,6 +5394,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5371,6 +5477,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5397,6 +5504,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5479,6 +5587,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5505,6 +5614,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5587,6 +5697,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5613,6 +5724,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5695,6 +5807,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5721,6 +5834,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5803,6 +5917,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5829,6 +5944,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5911,6 +6027,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5937,6 +6054,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6019,6 +6137,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6045,6 +6164,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6127,6 +6247,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6153,6 +6274,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6235,6 +6357,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6261,6 +6384,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 9d638427bf..adef933973 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -20,6 +20,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -46,6 +47,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>blog.comperiosearch.com</referrerName> @@ -134,6 +136,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> @@ -152,6 +155,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -178,6 +182,7 @@ <visitDurationPretty>1 min 20s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -254,6 +259,7 @@ </row> </customVariables> <generationTime>0.41s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -280,6 +286,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -380,6 +387,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> <icon /> @@ -398,6 +406,7 @@ <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -424,6 +433,7 @@ <visitDurationPretty>33s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -516,6 +526,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -542,6 +553,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -635,6 +647,7 @@ </row> </customVariables> <generationTime>0.39s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -661,6 +674,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -761,6 +775,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -787,6 +802,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -876,6 +892,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -902,6 +919,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>berndjung.com</referrerName> @@ -983,6 +1001,7 @@ </row> </customVariables> <generationTime>0.15s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1009,6 +1028,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>forum.golem.de</referrerName> @@ -1110,6 +1130,7 @@ </row> </customVariables> <generationTime>0.18s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>2</timeSpent> <timeSpentPretty>2s</timeSpentPretty> <icon /> @@ -1129,6 +1150,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1147,6 +1169,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1173,6 +1196,7 @@ <visitDurationPretty>10s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -1258,6 +1282,7 @@ </row> </customVariables> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1284,6 +1309,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1377,6 +1403,7 @@ </row> </customVariables> <generationTime>0.06s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1403,6 +1430,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -1503,6 +1531,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1529,6 +1558,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -1613,6 +1643,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1639,6 +1670,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>sn110w.snt110.mail.live.com</referrerName> @@ -1739,6 +1771,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1761,6 +1794,7 @@ <customVariablePageValue4>PRODUCT name</customVariablePageValue4> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1779,6 +1813,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -1805,6 +1840,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 23daf4bf06..75c89e1aa1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -13,6 +13,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -65,6 +67,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -77,6 +80,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -92,6 +96,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -118,6 +123,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -221,6 +227,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -247,6 +254,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -329,6 +337,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -363,6 +372,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -375,6 +385,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -390,6 +401,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -416,6 +428,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 69d9272531..13e2249fbb 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -34,6 +34,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -60,6 +61,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -142,6 +144,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -171,6 +174,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -194,6 +198,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -206,6 +211,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -221,6 +227,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -247,6 +254,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -350,6 +358,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -376,6 +385,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 0323bd788c..0861763ac1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 0323bd788c..0861763ac1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 4665c485f0..a836236262 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1054,6 +1079,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1088,6 +1114,7 @@ <pageIdAction>32</pageIdAction> <pageId>31</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1100,6 +1127,7 @@ <pageIdAction>33</pageIdAction> <pageId>32</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1115,6 +1143,7 @@ <eventAction>Action5</eventAction> <eventName>Name5</eventName> <eventValue>350.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1141,6 +1170,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1244,6 +1274,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1270,6 +1301,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1352,6 +1384,7 @@ <pageIdAction>4</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -1381,6 +1414,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -1404,6 +1438,7 @@ <pageIdAction>27</pageIdAction> <pageId>26</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1416,6 +1451,7 @@ <pageIdAction>28</pageIdAction> <pageId>27</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1431,6 +1467,7 @@ <eventAction>Action4</eventAction> <eventName>Name4</eventName> <eventValue>349.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1457,6 +1494,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml index 0e8f519c31..da61c550e1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -10,15 +10,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_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 37691b2a89..e809cc9f97 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -10,14 +10,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/DevicesDetection/images/screens/normal.gif</logo> </row> @@ -81,18 +86,4 @@ <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/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/DevicesDetection/images/screens/unknown.gif</logo> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index eb5982c49b..453d9a946e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -25,6 +25,7 @@ <pageId>9</pageId> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -51,6 +52,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Yahoo!</referrerName> @@ -126,6 +128,7 @@ <pageId>1</pageId> <generationTime>0.23s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -139,6 +142,7 @@ <pageId>2</pageId> <generationTime>0.22s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -151,6 +155,7 @@ <pageIdAction>5</pageIdAction> <pageId>3</pageId> + <interactionPosition /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -163,6 +168,7 @@ <pageIdAction>6</pageIdAction> <pageId>4</pageId> + <interactionPosition /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -175,6 +181,7 @@ <pageIdAction>7</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -187,6 +194,7 @@ <pageIdAction>8</pageIdAction> <pageId>6</pageId> + <interactionPosition /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -211,6 +219,7 @@ <pageId>7</pageId> <siteSearchKeyword>Banks Own The World</siteSearchKeyword> <generationTime>0.81s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -224,6 +233,7 @@ <pageId>8</pageId> <generationTime>0.02s</generationTime> + <interactionPosition>4</interactionPosition> <icon /> </row> @@ -250,6 +260,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>8</actions> + <interactions>4</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>referrer.com</referrerName> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 8d118edb9a..480d02e41e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> @@ -113,6 +115,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>1084</timeSpent> <timeSpentPretty>18 min 4s</timeSpentPretty> <icon /> @@ -152,6 +155,7 @@ <visitDurationPretty>18 min 4s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 73cc01ca74..2fc3bd1b69 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -18,6 +18,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365328800</timestamp> </row> @@ -44,6 +45,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -114,6 +116,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365246000</timestamp> </row> @@ -140,6 +143,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -210,6 +214,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365163200</timestamp> </row> @@ -236,6 +241,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 8bdcb100dc..483c51771c 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 448942b60a..893c2dbf6f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -1,7 +1,7 @@ All Websites dashboard -label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,nb_conversions_evolution,revenue_evolution,orders_evolution,ecommerce_revenue_evolution -Site 1,11,43,43,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0 -Site 2,1,3,3,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0 +label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,ecommerce_revenue,orders_evolution,ecommerce_revenue_evolution +Site 1,11,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 +Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 Visits Summary nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -236,8 +236,8 @@ Saturday,1,5,0%,5,00:15:01,0% Sunday,3,7,0%,2.3,00:05:00,67% Actions - Main metrics -nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords -43,27,0,0,0,0,0,0 +nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation +43,27,0,0,0,0,0,0,0.3s Bandwidth - Main metrics nb_total_overall_bandwidth,nb_total_pageview_bandwidth,nb_total_download_bandwidth @@ -257,8 +257,8 @@ products,1,1,100%,0.15s Entry page titles label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation -second visitor/two days later/a new visit,8,0,0%,0.32s first page view,2,2,100%,0.14s +second visitor/two days later/a new visit,8,0,0%,0.32s Exit pages label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation @@ -268,16 +268,16 @@ products,1,1,100%,0.15s Exit page titles label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation -Checkout/Purchasing...,8,8,100%,0.45s first page view,2,2,100%,0.14s +Checkout/Purchasing...,8,8,100%,0.45s Page titles label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation +first page view,2,2,100%,00:00:00,100%,0.14s +Page Name not defined,1,1,0%,00:00:00,0%,0.22s Checkout/Purchasing...,8,8,0%,00:00:00,100%,0.45s second visitor/two days later/a new visit,8,8,0%,00:06:00,0%,0.32s second visitor/two days later/second page view,8,8,0%,00:09:00,0%,0.17s -first page view,2,2,100%,00:00:00,100%,0.14s -Page Name not defined,1,1,0%,00:00:00,0%,0.22s Site Search Keywords No data available @@ -317,9 +317,9 @@ No data available Referrer Type label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Websites - referrer.com,6,22,3.7,00:10:01,33%,$ 0 -Campaigns - goal-matching-url-parameter,4,20,5,00:15:01,0%,$ 0 Direct Entry,1,1,1,00:00:00,100%,$ 0 +Websites,6,22,3.7,00:10:01,33%,$ 0 +Campaigns,4,20,5,00:15:01,0%,$ 0 All Referrers label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index fab3a92721..06bf981720 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -4100,6 +4100,14 @@ 0 </td> </tr> + + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + Avg. generation time </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0.3s + </td> + </tr> </tbody> </table> <br/> @@ -4386,35 +4394,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.32s </td> </tr> </tbody> @@ -4539,35 +4547,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.45s </td> </tr> </tbody> @@ -4610,38 +4618,38 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + Page Name not defined </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:06:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4650,13 +4658,13 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.22s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/second page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4664,53 +4672,53 @@ 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:09:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.17s + 0.45s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:06:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.32s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Page Name not defined </td> + second visitor/two days later/second page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:09:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4719,7 +4727,7 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.22s + 0.17s </td> </tr> </tbody> @@ -4822,21 +4830,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Websites - referrer.com </td> + Direct Entry </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 6 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 22 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.7 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:01 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 33% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4845,21 +4853,21 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Campaigns - goal-matching-url-parameter </td> + Websites </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 4 + 6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 20 + 22 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 5 + 3.7 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:15:01 + 00:10:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 33% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4868,21 +4876,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Direct Entry </td> + Campaigns </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 20 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 5 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:15:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index ed2500e125..1bafbae6e3 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -11,6 +11,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 11:22:33</serverTimePretty> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267874553</timestamp> </row> @@ -30,6 +31,7 @@ <pageIdAction>3</pageIdAction> <serverTimePretty>Mar 6, 2010 11:25:33</serverTimePretty> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -42,6 +44,7 @@ <pageIdAction>4</pageIdAction> <serverTimePretty>Mar 6, 2010 11:28:33</serverTimePretty> <pageId>3</pageId> + <interactionPosition>2</interactionPosition> <icon /> <timestamp>1267874913</timestamp> </row> @@ -61,6 +64,7 @@ <pageIdAction>6</pageIdAction> <serverTimePretty>Mar 6, 2010 13:16:33</serverTimePretty> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -73,6 +77,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:22:33</serverTimePretty> <pageId>5</pageId> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -85,6 +90,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:28:33</serverTimePretty> <pageId>6</pageId> + <interactionPosition>3</interactionPosition> <icon /> <timestamp>1267882113</timestamp> </row> @@ -104,6 +110,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:34:33</serverTimePretty> <pageId>7</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267882473</timestamp> </row> @@ -123,6 +130,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>10</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267892913</timestamp> </row> @@ -142,6 +150,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:22:33</serverTimePretty> <pageId>8</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -154,6 +163,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>9</pageId> + <interactionPosition>2</interactionPosition> <timeSpent>721</timeSpent> <timeSpentPretty>12 min 1s</timeSpentPretty> <icon /> @@ -203,6 +213,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 14, 2010 11:22:33</serverTimePretty> <pageId>11</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1268565753</timestamp> </row> @@ -222,6 +233,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 14, 2010 11:46:33</serverTimePretty> <pageId>12</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1268567193</timestamp> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 4015aad321..3e5457c1ff 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -101,7 +101,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml index 2da072a826..5d14d04cd7 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml @@ -80,7 +80,7 @@ <nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning> <nb_users_returning>Returning Users</nb_users_returning> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> <interaction_rate>Interaction Rate</interaction_rate> <nb_visits_percentage>% Visits</nb_visits_percentage> <nb_hits_with_bandwidth>Recorded hits with bandwidth</nb_hits_with_bandwidth> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml index 097ddcd4c4..b14c503cb3 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml @@ -51,6 +51,11 @@ <documentation>The number of times this Page was visited after a visitor did a search on your website, and clicked on this page in the search results.</documentation> </row> <row> + <name>Content Interactions</name> + <id>nb_interactions</id> + <documentation>The number of times a content block was interacted with (eg, a 'click' on a banner or ad).</documentation> + </row> + <row> <name>Conversion Rate</name> <id>conversion_rate</id> <documentation>The percentage of visits that triggered a goal conversion.</documentation> @@ -91,11 +96,6 @@ <documentation>The ratio of content impressions to interactions.</documentation> </row> <row> - <name>Interactions</name> - <id>nb_interactions</id> - <documentation>The number of times a content block was interacted with (eg, a 'click' on a banner or ad).</documentation> - </row> - <row> <name>Maximum value</name> <id>max_event_value</id> <documentation>The maximum value for this event</documentation> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index ea1dbce1af..b2f868a1e0 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -1565,7 +1565,7 @@ <dimension>Content Name</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> @@ -1589,7 +1589,7 @@ <dimension>Content Piece</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 2cbc2807d4..75524fb54c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1430,7 +1430,7 @@ <name>Goal 1 - Thank you</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>15</order> + <order>2</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -1456,7 +1456,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>13</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -1484,7 +1484,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>14</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -1513,7 +1513,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>15</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -1535,7 +1535,7 @@ <name>Goal Goal 1 - Thank you conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>17</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2037,7 +2037,7 @@ <name>Goal 2 - Hello</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>20</order> + <order>3</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2063,7 +2063,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>18</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2091,7 +2091,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>19</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2120,7 +2120,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>20</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2142,7 +2142,7 @@ <name>Goal Goal 2 - Hello conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>22</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2644,7 +2644,7 @@ <name>triggered js</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>25</order> + <order>4</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2670,7 +2670,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>23</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2698,7 +2698,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>24</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2749,7 +2749,7 @@ <name>Goal triggered js conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>27</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3251,7 +3251,7 @@ <name>Overview</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>5</order> + <order>0</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3277,7 +3277,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>1</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -3304,7 +3304,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>2</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3331,7 +3331,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>3</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3361,7 +3361,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>4</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3391,7 +3391,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>5</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3412,7 +3412,7 @@ <name>Conversions overview by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>7</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3969,7 +3969,7 @@ <name>Overview</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>10</order> + <order>1</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3995,7 +3995,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>8</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -4023,7 +4023,7 @@ </subcategory> <module>Ecommerce</module> <action>getSparklines</action> - <order>9</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -4051,7 +4051,7 @@ </subcategory> <module>Ecommerce</module> <action>getConversionsOverview</action> - <order>10</order> + <order>25</order> <parameters> <module>Ecommerce</module> <action>getConversionsOverview</action> @@ -4197,7 +4197,7 @@ <name /> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>12</order> + <order>5</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 8499ae5bca..60d41d94be 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -27,6 +27,13 @@ <row> <type>metric</type> <category>Visit</category> + <name>Number of Interactions</name> + <segment>interactions</segment> + <acceptedValues>Any positive integer</acceptedValues> + </row> + <row> + <type>metric</type> + <category>Visit</category> <name>Number of Internal Searches</name> <segment>searches</segment> <acceptedValues>To select all visits who used internal Site Search, use: &segment=searches>0</acceptedValues> @@ -482,6 +489,13 @@ <row> <type>dimension</type> <category>Actions</category> + <name>Content Interaction</name> + <segment>contentInteraction</segment> + <acceptedValues>The type of interaction with the content. For instance "click" or "submit".</acceptedValues> + </row> + <row> + <type>dimension</type> + <category>Actions</category> <name>Content Name</name> <segment>contentName</segment> <acceptedValues>The name of a content block, for instance "Ad Sale"</acceptedValues> @@ -533,13 +547,6 @@ <row> <type>dimension</type> <category>Actions</category> - <name>Interaction</name> - <segment>contentInteraction</segment> - <acceptedValues>The type of interaction with the content. For instance "click" or "submit".</acceptedValues> - </row> - <row> - <type>dimension</type> - <category>Actions</category> <name>Keyword (Site Search)</name> <segment>siteSearchKeyword</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 17adcdc0ad..2607e36f1d 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -1740,7 +1740,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>10</order> + <order>1</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -1766,7 +1766,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>8</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -1794,7 +1794,7 @@ </subcategory> <module>Ecommerce</module> <action>getSparklines</action> - <order>9</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -1822,7 +1822,7 @@ </subcategory> <module>Ecommerce</module> <action>getConversionsOverview</action> - <order>10</order> + <order>25</order> <parameters> <module>Ecommerce</module> <action>getConversionsOverview</action> @@ -2028,7 +2028,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>5</order> + <order>0</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2054,7 +2054,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>1</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2081,7 +2081,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>2</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2108,7 +2108,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>3</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2138,7 +2138,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>4</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2168,7 +2168,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>5</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2200,7 +2200,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>15</order> + <order>2</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2226,7 +2226,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>13</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2254,7 +2254,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>14</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2283,7 +2283,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>15</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2316,7 +2316,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>20</order> + <order>3</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2342,7 +2342,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>18</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2370,7 +2370,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>19</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2399,7 +2399,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>20</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2432,7 +2432,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>25</order> + <order>4</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2458,7 +2458,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>23</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2486,7 +2486,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>24</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php index 80f9d11afe..f3d189a6a8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php @@ -1 +1 @@ -a:1:{i:0;a:90:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:12:"Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:20:"nb_visits_percentage";s:8:"% Visits";s:22:"nb_hits_with_bandwidth";s:28:"Recorded hits with bandwidth";s:13:"max_bandwidth";s:13:"Max Bandwidth";s:13:"min_bandwidth";s:13:"Min Bandwidth";s:13:"sum_bandwidth";s:13:"Sum Bandwidth";s:13:"avg_bandwidth";s:14:"Avg. Bandwidth";s:26:"nb_total_overall_bandwidth";s:25:"Bytes transferred overall";s:27:"nb_total_pageview_bandwidth";s:27:"Bytes transferred pageviews";s:27:"nb_total_download_bandwidth";s:27:"Bytes transferred downloads";}}
\ No newline at end of file +a:1:{i:0;a:90:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:20:"Content Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:20:"nb_visits_percentage";s:8:"% Visits";s:22:"nb_hits_with_bandwidth";s:28:"Recorded hits with bandwidth";s:13:"max_bandwidth";s:13:"Max Bandwidth";s:13:"min_bandwidth";s:13:"Min Bandwidth";s:13:"sum_bandwidth";s:13:"Sum Bandwidth";s:13:"avg_bandwidth";s:14:"Avg. Bandwidth";s:26:"nb_total_overall_bandwidth";s:25:"Bytes transferred overall";s:27:"nb_total_pageview_bandwidth";s:27:"Bytes transferred pageviews";s:27:"nb_total_download_bandwidth";s:27:"Bytes transferred downloads";}}
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml index d0c3b6b131..c12dc93c9b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml @@ -23,7 +23,7 @@ <row> <code>bn</code> <name>বাংলা</name> - <english_name>Bengali</english_name> + <english_name>Bangla</english_name> </row> <row> <code>bs</code> @@ -182,7 +182,7 @@ </row> <row> <code>pt-br</code> - <name>Português do Brasil</name> + <name>Português (Brasil)</name> <english_name>Brazilian Portuguese</english_name> </row> <row> @@ -242,7 +242,7 @@ </row> <row> <code>tl</code> - <name>Filipino</name> + <name>Tagalog</name> <english_name>Tagalog</english_name> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml index 3a3e734f39..d8a851d3c8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml @@ -2,6 +2,7 @@ <result><!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { @@ -12,6 +13,5 @@ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//example.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 90df5b1904..d9d1b68bf4 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex 489da99277..09cdb8f060 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 5b19eea90f..979634a932 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ <visitDurationPretty>6 min 3s</visitDurationPretty> <searches>0</searches> <actions>0</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -170,6 +171,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -200,6 +202,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -226,6 +229,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -285,6 +289,7 @@ <visitDurationPretty>18 min 1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index d391947a56..391d44947e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -31,6 +31,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -61,6 +62,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -87,6 +89,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -146,6 +149,7 @@ <visitDurationPretty>12 min 1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -238,6 +242,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -256,6 +261,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -286,6 +292,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon /> @@ -374,6 +381,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>4</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -404,6 +412,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>5</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -430,6 +439,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>6</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -489,6 +499,7 @@ <visitDurationPretty>1 hours 6 min</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>6</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -604,6 +615,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -634,6 +646,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -664,6 +677,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -690,6 +704,7 @@ <customVariablePageValue5>["Multiple Category 1","",0,"Multiple Category 2","Electronics & Cameras","Multiple Category 4","Multiple Category 5","SHOULD NOT BE REPORTEDSSSSSSSSSSSSSSssssssssssssssssssssssssssstttttttttttttttttt</customVariablePageValue5> </row> </customVariables> + <interactionPosition>4</interactionPosition> <icon /> </row> @@ -716,6 +731,7 @@ <visitDurationPretty>12 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>4</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index 488663282f..78902751cb 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -1,7 +1,7 @@ All Websites dashboard label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution -Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,0%,0%,0%,0%,0% -Piwik test,2,1,1,$ 250,1,1,$ 250,100%,100%,0%,0,0%,0,0 +Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100% +Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0 Visits Summary nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -18,7 +18,7 @@ VisitorName - Great name!,4,12,$ 13351.11,3,00:25:32,25% Device type label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,$ 250,3.2,00:22:49,20% +Desktop,5,16,$ 13361.11,3.2,00:22:49,20% Device model label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -327,7 +327,7 @@ No data available Ecommerce Orders nb_conversions,nb_visits_converted,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue,conversion_rate -4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,0% +4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,40% Ecommerce Orders - Visits to Conversion label,nb_conversions @@ -364,7 +364,7 @@ label,nb_conversions Abandoned Carts nb_conversions,revenue,items,avg_order_revenue,conversion_rate -3,$ 7530.33,12,$ 2510.11,0% +3,$ 7530.33,12,$ 2510.11,60% Abandoned Carts - Visits to Conversion label,nb_conversions @@ -401,35 +401,35 @@ label,nb_conversions Product SKU label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate -SKU2,$ 1500,1,1,1,$ 0,1,100% -SKU VERY nice indeed,$ 1011.22,3,2,4,$ 0,1.5,50% -ANOTHER SKU HERE,$ 600,6,1,0,$ 0,6,0% -TRIPOD SKU,$ 200,2,1,0,$ 0,2,0% +SKU2,$ 1500,1,1,1,$ 1500,1,100% +SKU VERY nice indeed,$ 1011.22,3,2,4,$ 255.61,1.5,50% +ANOTHER SKU HERE,$ 600,6,1,0,$ 100,6,0% +TRIPOD SKU,$ 200,2,1,0,$ 100,2,0% SKU IN ABANDONED CART TWO,$ 0,0,0,3,$ 0,0,0% Product Name label,revenue,quantity,orders,avg_price,avg_quantity,conversion_rate,nb_visits -Canon SLR,$ 1500,1,1,$ 0,1,0%,0 -PRODUCT name,$ 1011.22,3,2,$ 0,1.5,100%,2 -PRODUCT name BIS,$ 600,6,1,$ 0,6,0%,0 -TRIPOD - bought day after,$ 200,2,1,$ 0,2,0%,0 +Canon SLR,$ 1500,1,1,$ 1500,1,0%,0 +PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2 +PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0 +TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0 PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3 PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3 Product Category label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate -Electronics & Cameras,$ 2500,3,2,3,$ 0,1.5,66.67% -Multiple Category 1,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 2,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 4,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 5,$ 1000,2,1,1,$ 0,2,100% -Product Category not defined,$ 611.22,7,2,4,$ 0,3.5,50% -Tools,$ 200,2,1,0,$ 0,2,0% +Electronics & Cameras,$ 2500,3,2,3,$ 1000,1.5,66.67% +Multiple Category 1,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 2,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 4,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 5,$ 1000,2,1,1,$ 500,2,100% +Product Category not defined,$ 611.22,7,2,4,$ 55.61,3.5,50% +Tools,$ 200,2,1,0,$ 100,2,0% Category TWO LEFT in cart,$ 0,0,0,3,$ 0,0,0% Goals nb_conversions,nb_visits_converted,revenue,conversion_rate -5,4,$ 13361.11,0% +5,4,$ 13361.11,80% Visits to Conversion label,nb_conversions,revenue @@ -466,7 +466,7 @@ label,nb_conversions,revenue Goal title match triggered ONCE nb_conversions,nb_visits_converted,revenue,conversion_rate -1,1,$ 10,0% +1,1,$ 10,20% title match triggered ONCE - Visits to Conversion label,nb_conversions diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index f04022a9ad..bce9dd677d 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -476,10 +476,10 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 250 + $ 0 </td> </tr> </tbody> @@ -730,7 +730,7 @@ 20% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 250 + $ 13361.11 </td> </tr> </tbody> @@ -4707,7 +4707,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 40% </td> </tr> </tbody> @@ -5029,7 +5029,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 60% </td> </tr> </tbody> @@ -5349,7 +5349,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5375,7 +5375,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 255.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5401,7 +5401,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5427,7 +5427,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5519,7 +5519,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5545,7 +5545,7 @@ 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 255.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5571,7 +5571,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5597,7 +5597,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5715,7 +5715,7 @@ 3 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1000 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5741,7 +5741,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5767,7 +5767,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5793,7 +5793,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5819,7 +5819,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5845,7 +5845,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 55.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 3.5 @@ -5871,7 +5871,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5957,7 +5957,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 80% </td> </tr> </tbody> @@ -6358,7 +6358,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 20% </td> </tr> </tbody> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index a55d80361a..645d7467c3 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders. Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250, 1 Goal conversions
\ No newline at end of file +week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index 4dd544955f..f36a23fa6e 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders
\ No newline at end of file +week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,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> @@ -289,7 +289,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> <introduction /> <condition /> </row> @@ -305,7 +305,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> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,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> @@ -289,7 +289,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> <introduction /> <condition /> </row> @@ -305,7 +305,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> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index f15526855b..6a412c0910 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -66,6 +66,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -92,6 +93,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -185,6 +187,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -211,6 +214,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index f15526855b..6a412c0910 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -66,6 +66,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -92,6 +93,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -185,6 +187,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -211,6 +214,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml index b7c89b2689..d81561ed0d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> - <row> - <label>cloudsite5.com/-1</label> + <label>cloudsite5.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -23,7 +12,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>cloudsite6.com/-1</label> + <label>cloudsite6.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -34,7 +23,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>cloudsite7.com/-1</label> + <label>cloudsite7.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -86,4 +75,15 @@ <url>http://cloudsite7.com/28/download</url> <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml index 4e8c18db0c..f773d20db9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> - <row> - <label>othersite10.com/-1</label> + <label>othersite10.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -23,7 +12,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>othersite11.com/-1</label> + <label>othersite11.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -34,7 +23,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>othersite12.com/-1</label> + <label>othersite12.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -86,4 +75,15 @@ <url>http://othersite12.com/</url> <segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml index 3e92585444..c139c3b992 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml @@ -20,26 +20,29 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/-1</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <label>title_0</label> + <nb_visits>1</nb_visits> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_0</label> + <label>title_1</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> @@ -61,29 +64,26 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/title_0</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> + <label>title_0/ - Others</label> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_1</label> + <label>title_0/title_0</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml index 8deb614c29..77c72b8a88 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml @@ -1,26 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>10</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>10</entry_bounce_count> - <exit_nb_visits>10</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - </row> - <row> - <label>0/-1</label> + <label>0/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -39,7 +20,7 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>1/-1</label> + <label>1/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -58,7 +39,7 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>2/-1</label> + <label>2/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -148,4 +129,23 @@ <url>http://piwik.net/2/</url> <segment>pageUrl==http%3A%2F%2Fpiwik.net%2F2%2F</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>10</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>10</entry_bounce_count> + <exit_nb_visits>10</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml index 0723c8e315..834ce79c36 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_actions>60</nb_actions> - </row> - <row> - <label>name - -1</label> + <label>name - Others</label> <nb_visits>19</nb_visits> <nb_actions>19</nb_actions> </row> @@ -15,7 +11,7 @@ <nb_actions>16</nb_actions> </row> <row> - <label>liked - -1</label> + <label>liked - Others</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> </row> @@ -24,4 +20,8 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> </row> + <row> + <label>Others</label> + <nb_actions>60</nb_actions> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index bf291de047..18ee2e2d93 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown</label> + <label>Others</label> <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>45</nb_visits> <nb_actions>45</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml index d2781e791c..41c9589a79 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>this search term - -1</label> + <label>this search term - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -62,4 +51,15 @@ <url>http://ask.com/web?q=this+search+term</url> <logo>plugins/Referrers/images/searchEngines/ask.com.png</logo> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index 2f781c0adb..f5e9832ea3 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -24,14 +24,14 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Websites</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <label>Search Engines</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -46,7 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Search Engines</label> + <label>Websites</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -58,13 +58,13 @@ </row> <row> <label>Websites</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml index 8d45a58e39..ab41a14413 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml @@ -1,20 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> - </row> - <row> - <label>Google - -1</label> + <label>Google - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -26,7 +13,7 @@ <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> <row> - <label>Yahoo! - -1</label> + <label>Yahoo! - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -63,4 +50,17 @@ <url>http://search.yahoo.com/search?p=search+term+4</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <url>URL unknown!</url> + <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml index 07e82ed210..de1eda0305 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>whatever0.com/-1</label> + <label>whatever0.com/ - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -21,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <url>-1</url> + <url>Others</url> </row> <row> <label>whatever0.com/index</label> @@ -59,4 +48,15 @@ <nb_visits_converted>0</nb_visits_converted> <url>http://whatever1.com/0</url> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php index cd572e4849..cb20726968 100644 --- a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php +++ b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php @@ -148,6 +148,65 @@ class JoinGeneratorTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $tables); } + public function test_sortTablesForJoin_shouldSortTablesWithCustomJoinRequiringEachOther() + { + $tables = array( + 'log_link_visit_action', + 'log_action', + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => "log_link_visit_action_foo.idaction_url = log_action_foo.idaction" + ) + ); + + $generator = $this->makeGenerator($tables); + usort($tables, array($generator, 'sortTablesForJoin')); + + $expected = array( + array ( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => 'log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit', + ), + array ( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => 'log_link_visit_action_foo.idaction_url = log_action_foo.idaction', + ), + 'log_link_visit_action', + 'log_action', + ); + + $this->assertEquals($expected, $tables); + + // should still be the same if inverted + $tables = array( + 'log_link_visit_action', + 'log_action', + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => "log_link_visit_action_foo.idaction_url = log_action_foo.idaction" + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit" + ), + ); + + $generator = $this->makeGenerator($tables); + usort($tables, array($generator, 'sortTablesForJoin')); + + $this->assertEquals($expected, $tables); + } + private function generate($tables) { $generator = $this->makeGenerator($tables); diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php index e3964369ff..43f8a1bc7f 100644 --- a/tests/PHPUnit/Unit/Tracker/RequestTest.php +++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php @@ -49,9 +49,13 @@ class RequestTest extends UnitTestCase $this->assertSame($this->time, $request->getCurrentTimestamp()); } - public function test_cdt_ShouldReturnTheCurrentTimestamp_IfNotAuthenticatedAndTimestampIsNotRecent() + /** + * @expectedException \Exception + * @expectedExceptionMessage Custom timestamp is 86500 seconds old + */ + public function test_cdt_ShouldNotTrackTheRequest_IfNotAuthenticatedAndTimestampIsNotRecent() { - $request = $this->buildRequest(array('cdt' => '' . $this->time - 28800)); + $request = $this->buildRequest(array('cdt' => '' . $this->time - 86500)); $this->assertSame($this->time, $request->getCurrentTimestamp()); } @@ -64,9 +68,9 @@ class RequestTest extends UnitTestCase public function test_cdt_ShouldReturnTheCustomTimestamp_IfAuthenticatedAndValid() { - $request = $this->buildRequest(array('cdt' => '' . ($this->time - 28800))); + $request = $this->buildRequest(array('cdt' => '' . ($this->time - 86500))); $request->setIsAuthenticated(); - $this->assertSame('' . ($this->time - 28800), $request->getCurrentTimestamp()); + $this->assertSame('' . ($this->time - 86500), $request->getCurrentTimestamp()); } public function test_cdt_ShouldReturnTheCustomTimestamp_IfTimestampIsInFuture() diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php index 09aab2c2f3..369cfb3a34 100644 --- a/tests/PHPUnit/Unit/UrlHelperTest.php +++ b/tests/PHPUnit/Unit/UrlHelperTest.php @@ -234,4 +234,64 @@ class UrlHelperTest extends \PHPUnit_Framework_TestCase $this->assertEquals('add=foo', UrlHelper::getQueryFromUrl('/', array('add' => 'foo'))); $this->assertEquals('add[]=foo&add[]=test', UrlHelper::getQueryFromUrl('/', array('add' => array('foo', 'test')))); } + + + /** + * Dataprovider for testGetQueryStringWithExcludedParameters + */ + public function getQueryParameters() + { + return array( + array( + 'p1=v1&p2=v2', //expected + array('p1'=>'v1', 'p2'=>'v2'), //queryParameters + array() //parametersToExclude + ), + array( + 'p2=v2', + array('p1'=>'v1', 'p2'=>'v2'), + array('p1') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG'), + array('sessionId') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG'), + array('/session/') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'sessionId'=>'HHSJHERTG', 'p2'=>'v2', 'token'=>'RYUN36HSAO'), + array('/[session|token]/') + ), + array( + '', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG', 'token'=>'RYUN36HSAO'), + array('/.*/') + ), + array( + 'p2=v2&p4=v4', + array('p1'=>'v1', 'p2'=>'v2', 'p3'=>'v3', 'p4'=>'v4'), + array('/p[1|3]/') + ), + array( + 'p2=v2&p4=v4', + array('p1'=>'v1', 'p2'=>'v2', 'p3'=>'v3', 'p4'=>'v4', 'utm_source'=>'gekko', 'utm_medium'=>'email', 'utm_campaign'=>'daily'), + array('/p[1|3]/', '/utm_/') + ) + ); + } + + /** + * @dataProvider getQueryParameters + * @group Core + */ + public function testGetQueryStringWithExcludedParameters($expected, $queryParameters, $parametersToExclude) + { + $this->assertEquals($expected, UrlHelper::getQueryStringWithExcludedParameters($queryParameters, $parametersToExclude)); + } + } diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 82fe26d151..15e3790562 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:477f2a7d70960505f3143e486162af3e2bcb4c4a70e0f40bc80279546c118508 -size 278843 +oid sha256:1a60b66e0ade5a7500077b999e6ed1d6ce4c9bfcc0d662604bafe9a8e2082931 +size 281165 diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png index c7c1560969..c59b7b16be 100644 --- a/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a8b8e871c99c9798070aaba1e4b2ea24d0891729359b91acb24f7ff1728842 -size 236924 +oid sha256:37fa2337c1ac3407431a002ff62595cc2720fa16fa6b26027677fcc0c10dd918 +size 244955 diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index ad2795e43b..7db5941eeb 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3160dd52b4ab99a66f32a90e2efce3207fb44fda0daa665e6fbffd50770dce7 -size 365021 +oid sha256:f5ab0ecf33f5d80552b1c24f44a3acdcebd2ba1e7eeeb5d07d9191a597d876c7 +size 364851 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 03c885c43c..ffae03fdfb 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91b066a2279d4d4fbfb7a4e1b3feabcf0d7778da8b3ea695e2b94a388803385d -size 533176 +oid sha256:6a14ab72a0b13453d93b83f96e14d22da3127aa89f0e475687743b98762cfeab +size 533019 diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png index 3bf8e42f52..f8b28088b6 100644 --- a/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f5bef3ad69ef3d2326a9832420e43ad0f2a4fc973cc98b67507ed3c96dc3637 -size 244566 +oid sha256:5d698b9577a9020d0f100199a4047b8a8d579ddde6c7f3b29a9e9662e67923b0 +size 249226 diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png index d8292c88da..025ec4f078 100644 --- a/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7abe83847ecf91c2c210116a8f3125276ca2eccf08ac9344fc31737f8c18bf9 -size 190033 +oid sha256:05078353764c65c355af7f3b96a2948be8a89f75d1ffe508209354b50b095b7d +size 188228 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 112f146af6..5e3d2094f1 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce396a5030d192435353eceb9cd114cf69e0c8fa2044fb1734a2a573aa0f64d5 -size 534414 +oid sha256:9c5423b60960636d099187d93ef28eba5311bfd96ac03863dabf00bc86b7ad41 +size 534492 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 32613e4b7a..dc57c27f29 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edc1f109df4b03552ed727fc73a4057402cc2d6584d5d0729e41c057dd8d56fc -size 3470832 +oid sha256:883708f1db7071637588e02b79082939973b49e9e3367b214d89c837bce1a51d +size 3483863 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 1200b302e6..93399c6eb1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d39952dd0c53c54d8a1e53060a1781fd252b70d979d86ae94d635070e50bcead -size 116883 +oid sha256:96388334f03f766390507ab85154978c76ddd126ca155c7621ee2798b11f1a47 +size 116773 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index f50da961c2..a325eb43bd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231f951986687e6a47c094ac6b9fa2635a9a95758a819bd228c9ae97601c0c25 -size 304254 +oid sha256:bb4d3d2f549fe303574fd4c0df7c332f49e74701ec9211d4b39dc307ad9692fd +size 306805 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 4995fec660..83a4b8ac44 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73ce5d8f801ad0c99d52b3a9585ae9f2fdc16c59897e4b3f98e348567212d505 -size 645576 +oid sha256:9955076f8a3a3e6efbfb1c171154a76ed9381052205263063356269fdd6eff59 +size 653419 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index c5c1fcc6a8..265f46c842 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d874fd775d6d8be1c9e0b13187482607f6e51ba1490c267690ffa7567fc20a3 -size 482842 +oid sha256:1c24952040b91790bfacf59a30b5bc990b8de35f15757ab429f258ddb7a45ddc +size 482699 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 1766795855..e9247c2ccc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21157328dec382eb814c31a030acec960bdc1b9536aadba371ae220dc8cf8ef4 -size 488546 +oid sha256:e416ee88a474f7256e8ec6ebe2a0ba00caa6dc9a226db45aa5c468f910474a52 +size 494000 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index 5c4c3ac6f3..aaa10332fe 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8b55fcd472e1bb49a165ebb5ad8bcde34e1f91834f094159ec7b01114c781c2 -size 52024 +oid sha256:eaf089abb49b870371957cfdde4adac66a81265e20e8d1e902572ab865a22f2f +size 83534 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png index 82c81eaf01..6f551128cf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e507297ce45b22c13fc9ac73b7b63f6428bbdadf5286ee22ab12b509540e2d10 -size 138631 +oid sha256:836a5472c95afecc2ce3b62a4f0ab10a3772dcf94e7f9b702799d39b9945fa74 +size 170055 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png index 9b5c5cfdd9..9ee63816f7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b207a93da45b798d1372667b606a72e07d2d2aaba3878fee430f29aa20558622 -size 183960 +oid sha256:6b930db850eb96918d3998bde6df04337907da4ad48e6a898a1d88fa7f51a542 +size 196636 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png index a0a684d315..32232a33d3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ffe3ccbdbea1e6ff4d292238eaa565dcf239c833ce148eb55d300e2091bd6e -size 184636 +oid sha256:f2bc5ac35599e2e20c4a541174afdf3265c01e223973d28a4d4fc61f1f844f1c +size 197242 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index d3838f305c..922242eb6a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67a39d8b3bef27ac5b84318518019899ab69d5de9b120ffad151415b9fa3bae0 -size 490266 +oid sha256:40bf44916e988a4ad572105ca79ab8fc8f426a9f0927676485e9f54c907f2103 +size 490143 diff --git a/tests/resources/OmniFixture-dump.sql b/tests/resources/OmniFixture-dump.sql index 350c46c1d1..209e820824 100644 --- a/tests/resources/OmniFixture-dump.sql +++ b/tests/resources/OmniFixture-dump.sql @@ -814,10 +814,10 @@ DROP TABLE IF EXISTS `user`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user` ( `login` varchar(100) NOT NULL, - `password` char(32) NOT NULL, + `password` varchar(255) NOT NULL, `alias` varchar(45) NOT NULL, `email` varchar(100) NOT NULL, - `token_auth` char(32) NOT NULL, + `token_auth` char(64) NOT NULL, `superuser_access` tinyint(2) unsigned NOT NULL DEFAULT '0', `date_registered` timestamp NULL DEFAULT NULL, PRIMARY KEY (`login`), @@ -831,7 +831,7 @@ CREATE TABLE `user` ( LOCK TABLES `user` WRITE; /*!40000 ALTER TABLE `user` DISABLE KEYS */; -INSERT INTO `user` VALUES ('superUserLogin','1e56c228742c0189d261500852e27a02','superUserLogin','hello@example.org','9ad1de7f8b329ab919d854c556f860c1',1,'2016-03-09 09:10:19'); +INSERT INTO `user` VALUES ('superUserLogin','$2y$10$vh5d/W6S9M7u.1G2gc1TOeetRi.6HN6OG1jq47j5JhixtqTxkdGVi','superUserLogin','hello@example.org','9ad1de7f8b329ab919d854c556f860c1',1,'2016-03-09 09:10:19'); /*!40000 ALTER TABLE `user` ENABLE KEYS */; UNLOCK TABLES; diff --git a/tests/travis b/tests/travis -Subproject e041bdf1a6b63024478852a58a69dd826e8aca4 +Subproject e3ee1bc4a16a93e807b1cfbcee42567cd5b8fcb |
