diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
| commit | 2bae9d90f860f3ccc5598420eb978cafd598451e (patch) | |
| tree | b742afddcfc882de15b9c075522cee4eae680db6 /tests | |
| parent | 41b579a9d94a05f7c0cb2e42bf7c03c2d374ed95 (diff) | |
merge master => 3.0
Diffstat (limited to 'tests')
181 files changed, 1653 insertions, 541 deletions
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php index 5518a7a163..da1038eba2 100644 --- a/tests/PHPUnit/Fixtures/InvalidVisits.php +++ b/tests/PHPUnit/Fixtures/InvalidVisits.php @@ -112,6 +112,12 @@ class InvalidVisits extends Fixture $t->setUrl("http://their.stuff.com/back/to/the/future"); $t->doTrackPageView("ignored, not from my.stuff.com"); + // undo exclude unknown urls change (important when multiple fixtures are setup together, as is done in OmniFixture) + API::getInstance()->updateSite($idSite, $siteName = null, $urls, $ecommerce = null, $siteSearch = null, + $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParams = null, + $timezone = null, $currency = null, $group = null, $startDate = null, $excludedUserAgents = null, + $keepUrlFragments = null, $type = null, $settings = null, $excludeUnknownUrls = 0); + try { @$t->setAttributionInfo(array()); self::fail(); diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index ce454b38d2..8fb67f261a 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -41,6 +41,17 @@ class ManyVisitsWithGeoIP extends Fixture '103.29.196.229', // in Indonesia (Bali), (only Indonesia will show up) ); + public $userAgents = array( + 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Mobile Safari/537.36', + 'Mozilla/5.0 (Linux; U; Android 2.3.7; fr-fr; HTC Desire Build/GRI40; MildWild CM-8.0 JG Stable) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1', + 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.76 Safari/537.36', + 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; GTB6.3; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; OfficeLiveConnector.1.4; OfficeLivePatch.1.3)', + 'Mozilla/5.0 (Windows NT 6.1; Trident/7.0; MDDSJS; rv:11.0) like Gecko', + 'Mozilla/5.0 (Linux; Android 4.1.1; SGPT13 Build/TJDS0170) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36', + 'Mozilla/5.0 (Linux; U; Android 4.3; zh-cn; SM-N9006 Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.0 Mobile Safari/537.36', + 'Mozilla/5.0 (X11; U; Linux i686; ru; rv:1.9.0.14) Gecko/2009090216 Ubuntu/9.04 (jaunty) Firefox/3.0.14' + ); + protected $idGoal; protected $idGoal2; @@ -107,6 +118,8 @@ class ManyVisitsWithGeoIP extends Fixture $t->setVisitorId( substr(md5($i + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); if ($setIp) { $t->setIp(current($this->ips)); + $t->setUserAgent(current($this->userAgents)); + next($this->userAgents); next($this->ips); } else { $t->setIp("1.2.4.$i"); diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php index cd6fc0fb34..e37afea8db 100644 --- a/tests/PHPUnit/Fixtures/OmniFixture.php +++ b/tests/PHPUnit/Fixtures/OmniFixture.php @@ -7,13 +7,12 @@ */ namespace Piwik\Tests\Fixtures; +use Piwik\API\Request; use Piwik\Date; -use Piwik\Access; use Piwik\Option; use ReflectionClass; -use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI; +use Piwik\Plugins\SitesManager\API as SitesManagerAPI; use Piwik\Tests\Framework\Fixture; -use Piwik\Tests\Framework\OverrideLogin; /** * This fixture is the combination of every other fixture defined by Piwik. Should be used @@ -21,15 +20,24 @@ use Piwik\Tests\Framework\OverrideLogin; */ class OmniFixture extends Fixture { + const DEFAULT_SEGMENT = "browserCode==FF"; + public $month = '2012-01'; public $idSite = 'all'; public $dateTime = '2012-02-01'; + + /** + * @var Date + */ public $now = null; - public $segment = "browserCode==FF"; + public $segment = self::DEFAULT_SEGMENT; // Visitor profile screenshot test needs visitor id public $visitorIdDeterministic = null; + /** + * @var Fixture[] + */ public $fixtures = array(); private function requireAllFixtures() @@ -114,18 +122,18 @@ class OmniFixture extends Fixture public function setUp() { + $firstFixture = array_shift($this->fixtures); + $this->setUpFixture($firstFixture); + + $initialSitesProperties = SitesManagerAPI::getInstance()->getAllSites(); + foreach ($this->fixtures as $fixture) { - echo "Setting up " . get_class($fixture) . "...\n"; + $this->restoreSitesProperties($initialSitesProperties); - $fixture->setUp(); + $this->setUpFixture($fixture); } Option::set("Tests.forcedNowTimestamp", $this->now->getTimestamp()); - - // launch archiving so tests don't run out of time - $date = Date::factory($this->dateTime)->toString(); - VisitsSummaryAPI::getInstance()->get($this->idSite, 'year', $date); - VisitsSummaryAPI::getInstance()->get($this->idSite, 'year', $date, urlencode($this->segment)); } public function tearDown() @@ -136,4 +144,34 @@ class OmniFixture extends Fixture $fixture->tearDown(); } } + + private function setUpFixture(Fixture $fixture) + { + echo "Setting up " . get_class($fixture) . "...\n"; + $fixture->setUp(); + } + + private function restoreSitesProperties($initialSitesProperties) + { + foreach ($initialSitesProperties as $idSite => $properties) { + Request::processRequest('SitesManager.updateSite', array( + 'idSite' => $idSite, + 'siteName' => $properties['name'], + 'ecommerce' => $properties['ecommerce'], + 'siteSearch' => $properties['sitesearch'], + 'searchKeywordParameters' => $properties['sitesearch_keyword_parameters'], + 'searchCategoryParameters' => $properties['sitesearch_category_parameters'], + 'excludedIps' => $properties['excluded_ips'], + 'excludedQueryParameters' => $properties['excluded_parameters'], + 'timezone' => $properties['timezone'], + 'currency' => $properties['currency'], + 'group' => $properties['group'], + 'startDate' => $properties['ts_created'], + 'excludedUserAgents' => $properties['excluded_user_agents'], + 'keepURLFragments' => $properties['keep_url_fragment'], + 'type' => $properties['type'], + 'excludeUnknownUrls' => $properties['exclude_unknown_urls'] + )); + } + } }
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php index a32129c93b..03cb78f9da 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php @@ -10,6 +10,7 @@ namespace Piwik\Tests\Fixtures; use Piwik\Date; use Piwik\Plugins\Goals\API; use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestingEnvironmentVariables; use PiwikTracker; /** @@ -36,7 +37,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture private function setPiwikEnvironmentOverrides() { - $env = $this->getTestEnvironment(); + $env = new TestingEnvironmentVariables(); $env->overrideConfig('Tracker', 'create_new_visit_when_website_referrer_changes', 1); $env->save(); } diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php index ed0647f64c..3a91bf6a91 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php @@ -9,6 +9,7 @@ namespace Piwik\Tests\Fixtures; use Piwik\Date; use Piwik\Tests\Framework\Fixture; +use PiwikTracker; /** * Adds one site and tracks a couple visits with many pageviews. The diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php index b360d162b3..f5ebc7b364 100644 --- a/tests/PHPUnit/Fixtures/SqlDump.php +++ b/tests/PHPUnit/Fixtures/SqlDump.php @@ -13,6 +13,7 @@ use Piwik\Config; use Piwik\Db; use Piwik\Tests\Framework\Fixture; use Exception; +use Piwik\Tests\Framework\TestingEnvironmentVariables; /** * Reusable fixture. Loads a SQL dump into the DB. @@ -74,12 +75,13 @@ class SqlDump extends Fixture // reload access Access::getInstance()->reloadAccess(); - $this->getTestEnvironment()->configOverride = array( + $testVars = new TestingEnvironmentVariables(); + $testVars->configOverride = array( 'database' => array( 'tables_prefix' => $this->tablesPrefix ) ); - $this->getTestEnvironment()->save(); + $testVars->save(); } /** diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index 623e7e388d..0792a4e448 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -69,13 +69,14 @@ class UITestFixture extends SqlDump // create non super user UsersManagerAPI::getInstance()->addUser('oliverqueen', 'smartypants', 'oli@queenindustries.com'); UsersManagerAPI::getInstance()->setUserAccess('oliverqueen', 'view', array(1)); - - // launch archiving so UI test requests don't launch it - VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09'); } public function performSetUp($setupEnvironmentOnly = false) { + $this->extraTestEnvVars = array( + 'loadRealTranslations' => 1, + ); + parent::performSetUp($setupEnvironmentOnly); $this->createSegments(); @@ -96,6 +97,12 @@ class UITestFixture extends SqlDump $this->testEnvironment->forcedNowTimestamp = $forcedNowTimestamp; $this->testEnvironment->save(); + + // launch archiving so tests don't run out of time + print("Archiving in fixture set up..."); + VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09'); + VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09', urlencode(OmniFixture::DEFAULT_SEGMENT)); + print("Done."); } private function addOverlayVisits() @@ -245,6 +252,7 @@ class UITestFixture extends SqlDump || $widget['uniqueId'] == 'widgetReferrersgetKeywordsForPage' || $widget['uniqueId'] == 'widgetLivegetVisitorProfilePopup' || $widget['uniqueId'] == 'widgetActionsgetPageTitles' + || $widget['uniqueId'] == 'widgetPiwikProrssPiwikPro' || strpos($widget['uniqueId'], 'widgetExample') === 0 ) { continue; diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index f421ba5658..9ef26bbb67 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -199,6 +199,7 @@ class Fixture extends \PHPUnit_Framework_Assert } $testEnv = $this->getTestEnvironment(); + $testEnv->delete(); $testEnv->testCaseClass = $this->testCaseClass; $testEnv->fixtureClass = get_class($this); $testEnv->dbName = $this->dbName; @@ -303,11 +304,16 @@ class Fixture extends \PHPUnit_Framework_Assert } } + /** + * NOTE: This method should not be used to get a TestingEnvironmentVariables instance. + * Instead just create a new instance. + * + * @return null|\Piwik\Tests\Framework\TestingEnvironmentVariables + */ public function getTestEnvironment() { if ($this->testEnvironment === null) { $this->testEnvironment = new TestingEnvironmentVariables(); - $this->testEnvironment->delete(); if (getenv('PIWIK_USE_XHPROF') == 1) { $this->testEnvironment->useXhprof = true; @@ -606,6 +612,7 @@ class Fixture extends \PHPUnit_Framework_Assert self::assertEquals($expectedResponse, $response, "Expected GIF beacon, got: <br/>\n" . var_export($response, true) . "\n If you are stuck, you can enable [Tracker] debug=1; in config.ini.php to get more debug info." + . "\n\n Also, please try to restart your webserver, and run the test again, this may help!" . base64_encode($response) . $url ); diff --git a/tests/PHPUnit/Framework/Mock/FakeConfig.php b/tests/PHPUnit/Framework/Mock/FakeConfig.php new file mode 100644 index 0000000000..cab4955a13 --- /dev/null +++ b/tests/PHPUnit/Framework/Mock/FakeConfig.php @@ -0,0 +1,28 @@ +<?php + +namespace Piwik\Tests\Framework\Mock; + +use Piwik\Config; + +class FakeConfig extends Config +{ + private $configValues = array(); + + public function __construct($configValues = array()) + { + $this->configValues = $configValues; + } + + public function &__get($name) + { + if (isset($this->configValues[$name])) { + return $this->configValues[$name]; + } + } + + public function __set($name, $value) + { + $this->configValues[$name] = $value; + } + +} diff --git a/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php b/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php new file mode 100644 index 0000000000..b1de8c4899 --- /dev/null +++ b/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php @@ -0,0 +1,20 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +namespace Piwik\Tests\Framework\Mock\PiwikPro; + +class Advertising extends \Piwik\PiwikPro\Advertising +{ + public function __construct() + { + } + + public function arePiwikProAdsEnabled() + { + return true; + } +}
\ No newline at end of file diff --git a/tests/PHPUnit/Framework/Mock/Plugin/Manager.php b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php new file mode 100644 index 0000000000..3cfbd5320a --- /dev/null +++ b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php @@ -0,0 +1,23 @@ +<?php + +namespace Piwik\Tests\Framework\Mock\Plugin; + +class Manager extends \Piwik\Plugin\Manager +{ + private $pluginsToActivate = array(); + + public function __construct() + { + } + + public function setActivatedPlugins($pluginsList) + { + $this->pluginsToActivate = $pluginsList; + } + + public function isPluginActivated($pluginName) + { + return in_array($pluginName, $this->pluginsToActivate); + } + +} diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php index 42e95d4b43..358528270f 100644 --- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php @@ -17,6 +17,7 @@ use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Date; use Piwik\Db; use Piwik\Db\BatchInsert; +use Piwik\DbHelper; use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\SitesManager\API; @@ -306,11 +307,12 @@ class ArchiveProcessingTest extends IntegrationTestCase $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idsite', 'url'), $data, - $throwException = true); + $throwException = true, 'utf8'); } catch (Exception $e) { $didWeUseBulk = $e->getMessage(); } + $this->_checkLoadDataInFileWasUsed($didWeUseBulk); if ($didWeUseBulk === true) { @@ -377,7 +379,7 @@ class ArchiveProcessingTest extends IntegrationTestCase $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data, - $throwException = true); + $throwException = true, $charset = 'latin1'); } catch (Exception $e) { $didWeUseBulk = $e->getMessage(); } @@ -388,7 +390,7 @@ class ArchiveProcessingTest extends IntegrationTestCase $this->_checkTableIsExpectedBlob($table, $data); } // INSERT again the bulk. Because we use keyword LOCAL the data will be REPLACED automatically (see mysql doc) - $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data); + $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data, $throw = false, $charset = 'latin1'); if ($didWeUseBulk === true) { $this->_checkTableIsExpectedBlob($table, $data); } @@ -421,9 +423,10 @@ class ArchiveProcessingTest extends IntegrationTestCase protected function _checkTableIsExpected($table, $data) { $fetched = Db::fetchAll('SELECT * FROM ' . $table); + foreach ($data as $id => $row) { - $this->assertEquals($fetched[$id]['idsite'], $data[$id][0], "record $id is not {$data[$id][0]}"); - $this->assertEquals($fetched[$id]['url'], $data[$id][1], "Record $id bug, not {$data[$id][1]} BUT {$fetched[$id]['url']}"); + $this->assertEquals($data[$id][0], $fetched[$id]['idsite'], "record $id is not {$data[$id][0]}"); + $this->assertEquals($data[$id][1], $fetched[$id]['url'], "Record $id bug, not {$data[$id][1]} BUT {$fetched[$id]['url']}"); } } @@ -484,6 +487,7 @@ class ArchiveProcessingTest extends IntegrationTestCase for ($i = 0; $i < 256; $i++) { $str .= chr($i); } + $array[] = array(1, 'bytes 0-255', 1, '2011-03-31', '2011-03-31', Piwik::$idPeriods['day'], $ts, $str); $array[] = array(2, 'compressed string', 1, '2011-03-31', '2011-03-31', Piwik::$idPeriods['day'], $ts, gzcompress(" \n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942")); diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index c64f0c3e62..c8f97754fc 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration; -use Piwik\Archiver\Request; use Piwik\CliMulti; use Piwik\Container\StaticContainer; use Piwik\CronArchive; diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php index c0b9baf438..2743305832 100644 --- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php @@ -284,8 +284,7 @@ class ArchiveInvalidatorTest extends IntegrationTestCase /** * @dataProvider getTestDataForMarkArchivesAsInvalidated */ - public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown, - $expectedIdArchives) + public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives) { $dates = array_map(array('Piwik\Date', 'factory'), $dates); @@ -302,11 +301,17 @@ class ArchiveInvalidatorTest extends IntegrationTestCase $this->assertEquals($dates, $result->processedDates); $idArchives = $this->getInvalidatedArchives(); + + // Remove empty values (some new empty entries may be added each month) + $idArchives = array_filter($idArchives); + $expectedIdArchives = array_filter($expectedIdArchives); + $this->assertEquals($expectedIdArchives, $idArchives); } public function getTestDataForMarkArchivesAsInvalidated() { + // $idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives return array( // day period, multiple sites, multiple dates across tables, cascade = true array( @@ -316,8 +321,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, true, array( - '2014_01' => array(), - '2015_03' => array(), '2015_04' => array( '1.2015-04-30.2015-04-30.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry', '2.2015-04-30.2015-04-30.1.done5447835b0a861475918e79e932abdfd8', @@ -326,7 +329,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase '1.2015-04-01.2015-04-30.3.done3736b708e4d20cfc10610e816a1b2341.UserCountry', '2.2015-04-01.2015-04-30.3.done5447835b0a861475918e79e932abdfd8', ), - '2014_12' => array(), '2015_01' => array( '1.2015-01-01.2015-01-01.1.done3736b708e4d20cfc10610e816a1b2341', '2.2015-01-01.2015-01-01.1.done.VisitsSummary', @@ -344,9 +346,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase '1.2015-02-01.2015-02-28.3.done.VisitsSummary', '2.2015-02-01.2015-02-28.3.done3736b708e4d20cfc10610e816a1b2341.UserCountry', ), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -358,18 +357,10 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, false, array( - '2014_01' => array(), - '2014_12' => array(), '2015_01' => array( '1.2015-01-01.2015-01-31.3.done3736b708e4d20cfc10610e816a1b2341', '1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8', ), - '2015_02' => array(), - '2015_03' => array(), - '2015_04' => array(), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -381,7 +372,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, true, array( - '2014_01' => array(), '2014_12' => array( '1.2014-12-29.2015-01-04.2.done3736b708e4d20cfc10610e816a1b2341', @@ -429,12 +419,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase '1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8', '1.2015-01-01.2015-01-10.5.done.VisitsSummary', ), - '2015_02' => array(), - '2015_03' => array(), - '2015_04' => array(), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -446,7 +430,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, true, array( - '2014_01' => array(), '2014_12' => array( '1.2014-12-29.2014-12-29.1.done', '1.2014-12-30.2014-12-30.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry', @@ -475,11 +458,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase '1.2015-02-01.2015-02-01.1.done3736b708e4d20cfc10610e816a1b2341', '1.2015-02-01.2015-02-28.3.done.VisitsSummary', ), - '2015_03' => array(), - '2015_04' => array(), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -491,20 +469,13 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, true, array( - '2014_01' => array(), - '2014_12' => array(), '2015_01' => array( '1.2015-01-01.2015-01-10.5.done.VisitsSummary', ), - '2015_02' => array(), '2015_03' => array( '1.2015-03-04.2015-03-05.5.done.VisitsSummary', '1.2015-03-05.2015-03-10.5.done3736b708e4d20cfc10610e816a1b2341.UserCountry', ), - '2015_04' => array(), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -516,7 +487,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase self::TEST_SEGMENT_1, true, array( - '2014_01' => array(), '2014_12' => array( '1.2014-12-29.2015-01-04.2.done3736b708e4d20cfc10610e816a1b2341', ), @@ -537,12 +507,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase '1.2015-01-26.2015-02-01.2.done3736b708e4d20cfc10610e816a1b2341.UserCountry', '1.2015-01-01.2015-01-31.3.done3736b708e4d20cfc10610e816a1b2341', ), - '2015_02' => array(), - '2015_03' => array(), - '2015_04' => array(), - '2015_05' => array(), - '2015_06' => array(), - '2015_07' => array(), ), ), @@ -554,21 +518,14 @@ class ArchiveInvalidatorTest extends IntegrationTestCase null, false, array( - '2014_01' => array(), - '2014_12' => array(), '2015_01' => array( '1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8', ), - '2015_02' => array(), - '2015_03' => array(), - '2015_04' => array(), '2015_05' => array( '1.2015-05-05.2015-05-05.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry', '1.2015-05-04.2015-05-10.2.done5447835b0a861475918e79e932abdfd8', '1.2015-05-01.2015-05-31.3.done3736b708e4d20cfc10610e816a1b2341', ), - '2015_06' => array(), - '2015_07' => array(), ), ), ); diff --git a/tests/PHPUnit/Integration/Http/Post.php b/tests/PHPUnit/Integration/Http/Post.php new file mode 100644 index 0000000000..8745bcebfe --- /dev/null +++ b/tests/PHPUnit/Integration/Http/Post.php @@ -0,0 +1,29 @@ +<?php + +// used in integration tests to see if POST method works. +// for security reasons we allow max 3 post vars, each key and value is only allowed to have max 6 hex characters + +function accept($key) +{ + if (ctype_xdigit($key) && strlen($key) <= 6) { + return $key; + } +} + +if (count($_POST) > 4) { + exit; +} + +$values = array(); +foreach ($_POST as $key => $value) { + if (accept($key) && accept($value)) { + $values[$key] = $value; + } +} + +if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) === 'post') { + $values['method'] = 'post'; +} + +echo json_encode($values); +exit; diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index 1f2ff373bb..417a98599d 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -170,6 +170,58 @@ class HttpTest extends \PHPUnit_Framework_TestCase /** * @dataProvider getMethodsToTest */ + public function testHttpPost_ViaString($method) + { + $result = Http::sendHttpRequestBy( + $method, + Fixture::getRootUrl() . 'tests/PHPUnit/Integration/Http/Post.php', + 30, + $userAgent = null, + $destinationPath = null, + $file = null, + $followDepth = 0, + $acceptLanguage = false, + $acceptInvalidSslCertificate = false, + $byteRange = false, + $getExtendedInfo = false, + $httpMethod = 'POST', + $httpUsername = '', + $httpPassword = '', + 'abc12=43&abfec=abcdef' + ); + + $this->assertEquals('{"abc12":"43","abfec":"abcdef","method":"post"}', $result); + } + + /** + * @dataProvider getMethodsToTest + */ + public function testHttpPost_ViaArray($method) + { + $result = Http::sendHttpRequestBy( + $method, + Fixture::getRootUrl() . 'tests/PHPUnit/Integration/Http/Post.php', + 30, + $userAgent = null, + $destinationPath = null, + $file = null, + $followDepth = 0, + $acceptLanguage = false, + $acceptInvalidSslCertificate = false, + $byteRange = false, + $getExtendedInfo = false, + $httpMethod = 'POST', + $httpUsername = '', + $httpPassword = '', + array('adf2' => '44', 'afc23' => 'ab12') + ); + + $this->assertEquals('{"adf2":"44","afc23":"ab12","method":"post"}', $result); + } + + /** + * @dataProvider getMethodsToTest + */ public function testHttpsWorksWithValidCertificate($method) { $result = Http::sendHttpRequestBy($method, 'https://builds.piwik.org/LATEST', 10); diff --git a/tests/PHPUnit/Integration/MailTest.php b/tests/PHPUnit/Integration/MailTest.php new file mode 100644 index 0000000000..876804c52f --- /dev/null +++ b/tests/PHPUnit/Integration/MailTest.php @@ -0,0 +1,32 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Tests\Integration; + +use Piwik\Mail; + +class MailTest extends \PHPUnit_Framework_TestCase +{ + + public function getEmailFilenames() + { + return array( + array('January 3 – 9, 2010', 'January 3 - 9, 2010'), + array('Report <The><< ’s Coves - week January 18 – 24, 2016', 'Report <The><< \'s Coves - week January 18 - 24, 2016'), + ); + } + + /** + * @dataProvider getEmailFilenames + */ + public function test_EmailFilenamesAreSanitised($raw, $expected) + { + $mail = new Mail; + $this->assertEquals($expected, $mail->sanitiseString($raw)); + } +} diff --git a/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php new file mode 100644 index 0000000000..5d3c9c27d0 --- /dev/null +++ b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php @@ -0,0 +1,149 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Tests\Integration\PiwikPro; + +use Piwik\Config; +use Piwik\PiwikPro\Advertising; +use Piwik\Plugin; +use Piwik\Tests\Framework\Mock\FakeConfig; +use Piwik\Tests\Framework\Mock\Plugin\Manager; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; + +/** + * @group PiwikPro + * @group Advertising + * @group Integration + */ +class AdvertisingTest extends IntegrationTestCase +{ + /** + * @var Advertising + */ + private $advertising; + + /** + * @var Config + */ + private $config; + + /** + * @var Manager + */ + private $pluginManager; + + private $exampleUrl = 'https://piwik.pro/test'; + + public function setUp() + { + $this->config = new FakeConfig(array('General' => array('piwik_pro_ads_enabled' => '1'))); + $this->pluginManager = new Manager(); + + $this->advertising = $this->buildAdvertising($this->config); + } + + public function test_arePiwikProAdsEnabled_ActuallyEnabled() + { + $enabled = $this->advertising->arePiwikProAdsEnabled(); + + $this->assertTrue($enabled); + } + + public function test_arePiwikProAdsEnabled_Disabled() + { + $this->config->General = array('piwik_pro_ads_enabled' => '0'); + + $enabled = $this->advertising->arePiwikProAdsEnabled(); + + $this->assertFalse($enabled); + } + + public function test_arePiwikProAdsEnabled_shouldBeDisabledWhenCloudPluginIsInstalled() + { + $enabled = $this->advertising->arePiwikProAdsEnabled(); + $this->assertTrue($enabled); + + $this->pluginManager->setActivatedPlugins(array('CloudAdmin')); + + $enabled = $this->advertising->arePiwikProAdsEnabled(); + $this->assertFalse($enabled); + } + + public function test_arePiwikProAdsEnabled_shouldBeDisabledWhenEnterprisePluginIsInstalled() + { + $enabled = $this->advertising->arePiwikProAdsEnabled(); + $this->assertTrue($enabled); + + $this->pluginManager->setActivatedPlugins(array('EnterpriseAdmin')); + + $enabled = $this->advertising->arePiwikProAdsEnabled(); + $this->assertFalse($enabled); + } + + public function test_shouldBeEnabledByDefault() + { + $enabled = $this->buildAdvertising(Config::getInstance()); + + $this->assertTrue($enabled->arePiwikProAdsEnabled()); + } + + public function test_getPromoUrlForOnPremises_WithoutContent() + { + $link = $this->advertising->getPromoUrlForOnPremises('Installation_End'); + + $this->assertSame('https://piwik.pro/c/upgrade/?pk_campaign=Upgrade_to_Pro&pk_medium=Installation_End&pk_source=Piwik_App', $link); + } + + public function test_getPromoUrlForOnPremises_WithContent() + { + $link = $this->advertising->getPromoUrlForOnPremises('Installation_End', 'TestContent'); + + $this->assertSame('https://piwik.pro/c/upgrade/?pk_campaign=Upgrade_to_Pro&pk_medium=Installation_End&pk_source=Piwik_App&pk_content=TestContent', $link); + } + + public function test_getPromoUrlForCloud_WithoutContent() + { + $link = $this->advertising->getPromoUrlForCloud('Installation_End'); + + $this->assertSame('https://piwik.pro/cloud/?pk_campaign=Upgrade_to_Cloud&pk_medium=Installation_End&pk_source=Piwik_App', $link); + } + + public function test_getPromoUrlForCloud_WithContent() + { + $link = $this->advertising->getPromoUrlForCloud('Installation_End', 'TestContent'); + + $this->assertSame('https://piwik.pro/cloud/?pk_campaign=Upgrade_to_Cloud&pk_medium=Installation_End&pk_source=Piwik_App&pk_content=TestContent', $link); + } + + public function test_addPromoCampaignParametersToUrl_withoutContentWithoutQuery() + { + $link = $this->advertising->addPromoCampaignParametersToUrl($this->exampleUrl, 'MyName', 'Installation_Start'); + + $this->assertSame($this->exampleUrl . '?pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App', $link); + } + + public function test_addPromoCampaignParametersToUrl_withContentWithoutQuery() + { + $link = $this->advertising->addPromoCampaignParametersToUrl($this->exampleUrl, 'MyName', 'Installation_Start', 'MyContent'); + + $this->assertSame($this->exampleUrl . '?pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App&pk_content=MyContent', $link); + } + + public function test_addPromoCampaignParametersToUrl_withQuery() + { + $url = $this->exampleUrl . '?foo=bar'; + $link = $this->advertising->addPromoCampaignParametersToUrl($url, 'MyName', 'Installation_Start'); + + $this->assertSame($url . '&pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App', $link); + } + + private function buildAdvertising($config) + { + return new Advertising($this->pluginManager, $config); + } +} diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 58970199f0..fcda0177be 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -184,6 +184,30 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase } } + public function test_jsfilesDoNotContainFakeSpaces() + { + $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.js'); + $this->checkFilesDoNotHaveWeirdSpaces($js); + } + + public function test_phpfilesDoNotContainFakeSpaces() + { + $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.php'); + $this->checkFilesDoNotHaveWeirdSpaces($js); + } + + public function test_twigfilesDoNotContainFakeSpaces() + { + $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.twig'); + $this->checkFilesDoNotHaveWeirdSpaces($js); + } + + public function test_htmlfilesDoNotContainFakeSpaces() + { + $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.html'); + $this->checkFilesDoNotHaveWeirdSpaces($js); + } + public function test_directoriesShouldBeChmod755() { $pluginsPath = realpath(PIWIK_INCLUDE_PATH . '/plugins/'); @@ -422,7 +446,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase } // in build-package.sh we have: `find ./ -iname 'tests' -type d -prune -exec rm -rf {} \;` - if(stripos($file, "/tests/") !== false) { + if($this->isFileBelongToTests($file)) { return false; } if(strpos($file, PIWIK_INCLUDE_PATH . "/tmp/") !== false) { @@ -586,4 +610,52 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase } return $filesizes; } + + /** + * @param $files + * @throws Exception + */ + protected function checkFilesDoNotHaveWeirdSpaces($files) + { + $weirdSpace = ' '; + $this->assertEquals('c2a0', bin2hex($weirdSpace), "Checking that this test file was not tampered with"); + $this->assertEquals('20', bin2hex(' '), "Checking that this test file was not tampered with"); + + $errors = array(); + $countFileChecked = 0; + foreach ($files as $file) { + + if($this->isFileBelongToTests($file)) { + continue; + } + + if(strpos($file, 'vendor/php-di/php-di/website/') !== false) { + continue; + } + + $content = file_get_contents($file); + $posWeirdSpace = strpos($content, $weirdSpace); + if ($posWeirdSpace !== false) { + $around = substr($content, $posWeirdSpace - 20, 40); + $around = trim($around); + $errors[] = "File $file contains an unusual space character, please remove it from here: ...$around..."; + } + + $countFileChecked++; + } + $this->assertTrue($countFileChecked > 100, "expected to test at least 100 files, but tested only " . $countFileChecked); + + if (!empty($errors)) { + throw new Exception(implode(",\n\n ", $errors)); + } + } + + /** + * @param $file + * @return bool + */ + private function isFileBelongToTests($file) + { + return stripos($file, "/tests/") !== false; + } } diff --git a/tests/PHPUnit/Integration/Settings/SystemSettingTest.php b/tests/PHPUnit/Integration/Settings/SystemSettingTest.php index ecc694cc88..f3655ed919 100644 --- a/tests/PHPUnit/Integration/Settings/SystemSettingTest.php +++ b/tests/PHPUnit/Integration/Settings/SystemSettingTest.php @@ -8,7 +8,9 @@ namespace Piwik\Tests\Integration\Settings; +use Piwik\Config; use Piwik\Db; +use Piwik\Plugin\Settings; use Piwik\Settings\SystemSetting; /** @@ -19,6 +21,12 @@ use Piwik\Settings\SystemSetting; class SystemSettingTest extends IntegrationTestCase { + public function tearDown() + { + Config::getInstance()->MyPluginName = array(); + parent::tearDown(); + } + public function test_constructor_shouldNotEstablishADatabaseConnection() { $this->assertNotDbConnectionCreated(); @@ -113,6 +121,74 @@ class SystemSettingTest extends IntegrationTestCase $this->assertEquals('', $setting->getValue()); } + public function test_getSettingValue_fromConfig_IfOneIsConfiguredInsteadOfTheValueFromDatabase() + { + $this->setSuperUser(); + $setting = $this->addSystemSetting('myusersetting', 'mytitle'); + $setting->setPluginName('MyPluginName'); + $setting->setValue('test'); + $this->assertEquals('test', $setting->getValue()); + + Config::getInstance()->MyPluginName = array('myusersetting' => 'mynewvalue'); + $value = $setting->getValue(); + $this->assertEquals('mynewvalue', $value); + } + + public function test_getSettingValue_fromConfig_ShouldConvertToTheSpecifiedType() + { + $this->setSuperUser(); + $setting = $this->addSystemSetting('myusersetting', 'mytitle'); + $setting->setPluginName('MyPluginName'); + + Config::getInstance()->MyPluginName = array('myusersetting' => '1'); + + $this->assertSame('1', $setting->getValue()); + + $setting->type = Settings::TYPE_BOOL; + $this->assertTrue($setting->getValue()); + } + + public function test_getSettingValue_fromConfig_isCaseSensitive() + { + $this->setSuperUser(); + $setting = $this->addSystemSetting('myUsersetting', 'mytitle'); + $setting->setPluginName('MyPluginName'); + + Config::getInstance()->MyPluginName = array('myusersetting' => '1'); + + $this->assertNull($setting->getValue()); + + Config::getInstance()->MyPluginName = array('myUsersetting' => '1'); + + $this->assertSame('1', $setting->getValue()); + } + + public function test_getSettingsValue_fromConfig_ShouldSetObjectToNotWritableAsSoonAsAValueIsConfigured() + { + $this->setSuperUser(); + $setting = $this->addSystemSetting('myusersetting', 'mytitle'); + $setting->setPluginName('MyPluginName'); + + $this->assertTrue($setting->isWritableByCurrentUser()); + + Config::getInstance()->MyPluginName = array('myusersetting' => '0'); + $this->assertFalse($setting->isWritableByCurrentUser()); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage CoreAdminHome_PluginSettingChangeNotAllowed + */ + public function test_setSettingsValue_shouldNotBePossible_AsSoonAsAConfigValueIsConfigured() + { + $this->setSuperUser(); + $setting = $this->addSystemSetting('myusersetting', 'mytitle'); + $setting->setPluginName('MyPluginName'); + + Config::getInstance()->MyPluginName = array('myusersetting' => '0'); + $setting->setValue('test'); + } + /** * @expectedException \Exception * @expectedExceptionMessage CoreAdminHome_PluginSettingChangeNotAllowed diff --git a/tests/PHPUnit/Integration/Tracker/PingRequestTest.php b/tests/PHPUnit/Integration/Tracker/PingRequestTest.php index 75e8c10c1a..586283d9bf 100644 --- a/tests/PHPUnit/Integration/Tracker/PingRequestTest.php +++ b/tests/PHPUnit/Integration/Tracker/PingRequestTest.php @@ -47,7 +47,7 @@ class PingRequestTest extends IntegrationTestCase $pingTime = '2012-01-05 00:20:00'; $this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = false); - $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = false); + $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = false, 1201); } public function test_PingWithinThirtyMinutes_AndChangedDimensionValues_ExtendsExistingVisit_AndChangesAppropriateDimensions() @@ -63,7 +63,7 @@ class PingRequestTest extends IntegrationTestCase $pingTime = '2012-01-05 00:20:00'; $this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = true); - $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = true); + $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = true, 1201); } public function test_PingWithinThirtyMinutes_DoesNotTriggerGoalConversion() @@ -82,7 +82,7 @@ class PingRequestTest extends IntegrationTestCase $tracker->setDebugStringAppend('&idgoal=1'); $this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = true); - $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = true); + $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = true, 1201); $this->assertGoalConversionCount(1); } @@ -163,11 +163,17 @@ class PingRequestTest extends IntegrationTestCase return Db::fetchOne("SELECT MAX(server_time) FROM " . Common::prefixTable('log_link_visit_action') . " WHERE idvisit = ?", array($idVisit)); } + private function getVisitTotalTime($idVisit) + { + return Db::fetchOne("SELECT MAX(visit_total_time) FROM " . Common::prefixTable('log_visit') . " WHERE idvisit = ?", array($idVisit)); + } + private function assertInitialVisitIsCorrect() { $this->assertVisitCount(1); $this->assertActionCount(1); $this->assertGoalConversionCount(1); + $this->assertEquals(0, $this->getVisitTotalTime($idVisit= 1)); $this->assertVisitPropertiesAreUnchanged($idVisit = 1); } @@ -192,17 +198,20 @@ class PingRequestTest extends IntegrationTestCase return $response; } - private function assertInitialVisitIsExtended($newEndTime, $lastActionTime, $checkPropertiesModified) + private function assertInitialVisitIsNotExtended($firstActionTime, $checkPropertiesModified, $expectedTotalTime) { $this->assertVisitCount(1); $this->assertActionCount(1); $this->assertGoalConversionCount(1); $visitEndTime = $this->getVisitLastActionTime($idVisit = 1); - $this->assertEquals($newEndTime, $visitEndTime); + $this->assertEquals($firstActionTime, $visitEndTime); $actionTime = $this->getLatestActionTime($idVisit = 1); - $this->assertEquals($lastActionTime, $actionTime); + $this->assertEquals($firstActionTime, $actionTime); + + $visitTotalTime = $this->getVisitTotalTime($idVisit = 1); + $this->assertEquals($expectedTotalTime, $visitTotalTime); if ($checkPropertiesModified) { $this->assertVisitPropertiesAreChanged($idVisit = 1, $checkUnchangeable = false); diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index 4ca355ffe5..8af1095b98 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -44,15 +44,14 @@ class WidgetsListTest extends IntegrationTestCase 'Dashboard_Dashboard' => 1, 'General_Actions' => 15, 'General_Visitors' => 34, - 'Example Widgets' => 5, 'SEO' => 2, 'Goals_Goals' => 3, 'Live!' => 2, 'Insights_WidgetCategory' => 2, 'ExampleUI_UiFramework' => 8, 'Referrers_Referrers' => 9, + 'About Piwik' => 7, ); - // number of main categories $this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory)); diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php index 482b0d12d8..f2b8e2e632 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php @@ -73,6 +73,11 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase if ($segment == 'deviceType') { $matchNone = $segment . '==car%20browser'; } + + if ($segment == 'deviceBrand') { + $matchNone = $segment . '==Yarvik'; + } + $segmentExpression[] = $matchNone; } diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml index 51252ac498..e36e5d53df 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>28</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>28</nb_visits> <nb_actions>31</nb_actions> <nb_visits_converted>26</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml index 22528b0939..f1ce3d1ac1 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>26</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>26</nb_visits> <nb_actions>29</nb_actions> <nb_visits_converted>24</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml index 744ab64e8e..d7fbf8c040 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>27</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> <nb_visits_converted>25</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml index 22528b0939..f1ce3d1ac1 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>26</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>26</nb_visits> <nb_actions>29</nb_actions> <nb_visits_converted>24</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml index 744ab64e8e..d7fbf8c040 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>27</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> <nb_visits_converted>25</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml index 22528b0939..f1ce3d1ac1 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml @@ -2,7 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>26</nb_uniq_visitors> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <nb_visits>26</nb_visits> <nb_actions>29</nb_actions> <nb_visits_converted>24</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml index 5ffae0691e..2479501ff3 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,10 @@ <result> <row>FF</row> <row>UNK</row> + <row>CM</row> + <row>QQ</row> + <row>AN</row> + <row>CH</row> + <row>IE</row> <row>SF</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml index 602805c283..e7e79a4222 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> - <nb_actions>73</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <nb_visits>20</nb_visits> + <nb_actions>55</nb_actions> + <nb_visits_converted>20</nb_visits_converted> + <bounce_count>10</bounce_count> + <sum_visit_length>16210</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>780</avg_time_on_site> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>2.8</nb_actions_per_visit> + <avg_time_on_site>811</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml index dfa3a20623..c0631c362b 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>0</sum_visit_length> - <max_actions>1</max_actions> - <bounce_rate>100%</bounce_rate> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>0</avg_time_on_site> + <nb_visits>5</nb_visits> + <nb_actions>12</nb_actions> + <nb_visits_converted>5</nb_visits_converted> + <bounce_count>3</bounce_count> + <sum_visit_length>3242</sum_visit_length> + <max_actions>5</max_actions> + <bounce_rate>60%</bounce_rate> + <nb_actions_per_visit>2.4</nb_actions_per_visit> + <avg_time_on_site>648</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml index abcc43c819..c3c7ec0152 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>3.6</row> + <row>33</row> + <row>5</row> + <row>3</row> + <row>32</row> + <row>34</row> + <row>11</row> + <row>8</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml index 602805c283..780ddda63a 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> - <nb_actions>73</nb_actions> - <nb_visits_converted>27</nb_visits_converted> - <bounce_count>14</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <nb_visits>18</nb_visits> + <nb_actions>50</nb_actions> + <nb_visits_converted>18</nb_visits_converted> + <bounce_count>9</bounce_count> + <sum_visit_length>14589</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>52%</bounce_rate> - <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>780</avg_time_on_site> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>2.8</nb_actions_per_visit> + <avg_time_on_site>811</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..e421ad0903 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>Unknown</row> + <row>HTC</row> + <row>Samsung</row> + <row>Google</row> + <row>Dell</row> + <row>Sony</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..828ec1e21b --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>27</nb_visits> + <nb_actions>76</nb_actions> + <nb_visits_converted>27</nb_visits_converted> + <bounce_count>13</bounce_count> + <sum_visit_length>22694</sum_visit_length> + <max_actions>5</max_actions> + <bounce_rate>48%</bounce_rate> + <nb_actions_per_visit>2.8</nb_actions_per_visit> + <avg_time_on_site>841</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml index 4f5796903a..7b9c37df18 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>Desktop</row> + <row>Smartphone</row> + <row>Phablet</row> + <row>Tablet</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml index f32d4c4dc1..90e7df368b 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>WIN</row> + <row>AND</row> <row>UNK</row> + <row>UBT</row> + <row>MLD</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml index 3ce6d98183..fc9d2e2c5a 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>28</nb_visits> - <nb_actions>74</nb_actions> - <nb_visits_converted>28</nb_visits_converted> - <bounce_count>15</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <nb_visits>22</nb_visits> + <nb_actions>54</nb_actions> + <nb_visits_converted>22</nb_visits_converted> + <bounce_count>13</bounce_count> + <sum_visit_length>14589</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>54%</bounce_rate> - <nb_actions_per_visit>2.6</nb_actions_per_visit> - <avg_time_on_site>753</avg_time_on_site> + <bounce_rate>59%</bounce_rate> + <nb_actions_per_visit>2.5</nb_actions_per_visit> + <avg_time_on_site>663</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml index 0abf9e4246..efcc22ca70 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml @@ -2,4 +2,12 @@ <result> <row>XP</row> <row>UNK</row> + <row>4.4</row> + <row>4.3</row> + <row>9.04</row> + <row>8</row> + <row>8.1</row> + <row>4.1</row> + <row>7</row> + <row>Vista</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml index 3ce6d98183..abb563f023 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>28</nb_visits> - <nb_actions>74</nb_actions> - <nb_visits_converted>28</nb_visits_converted> - <bounce_count>15</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <nb_visits>19</nb_visits> + <nb_actions>51</nb_actions> + <nb_visits_converted>19</nb_visits_converted> + <bounce_count>10</bounce_count> + <sum_visit_length>14589</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>54%</bounce_rate> - <nb_actions_per_visit>2.6</nb_actions_per_visit> - <avg_time_on_site>753</avg_time_on_site> + <bounce_rate>53%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>768</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 2bb1a15667..798759bcea 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -762,6 +762,48 @@ <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index d1c53283d0..ed79501504 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -13,7 +13,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>8</entry_bounce_count> <exit_nb_visits>8</exit_nb_visits> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>13</avg_time_on_page> <bounce_rate>89%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> @@ -31,7 +31,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>5</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>24</avg_time_on_page> + <avg_time_on_page>17</avg_time_on_page> <bounce_rate>83%</bounce_rate> <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> @@ -49,7 +49,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -70,7 +70,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -91,7 +91,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -112,7 +112,7 @@ <sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -542,7 +542,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>10</avg_time_on_page> + <avg_time_on_page>7</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -563,7 +563,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>10</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -1123,6 +1123,48 @@ <segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>changelog</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 05350333b8..edf1ae59e6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -756,6 +756,48 @@ <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index e5240da081..7973b3e001 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -13,7 +13,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>8</entry_bounce_count> <exit_nb_visits>8</exit_nb_visits> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>13</avg_time_on_page> <bounce_rate>89%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> @@ -31,7 +31,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>5</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>24</avg_time_on_page> + <avg_time_on_page>17</avg_time_on_page> <bounce_rate>83%</bounce_rate> <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> @@ -49,7 +49,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -70,7 +70,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -91,7 +91,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -112,7 +112,7 @@ <sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -542,7 +542,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>10</avg_time_on_page> + <avg_time_on_page>7</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -563,7 +563,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>10</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -1117,6 +1117,48 @@ <segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>contact</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index a56dd22637..4265021a1b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>27</nb_visits> - <nb_hits>28</nb_hits> + <nb_visits>28</nb_visits> + <nb_hits>29</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <nb_hits_with_time_generation>7</nb_hits_with_time_generation> <min_time_generation>0.001</min_time_generation> <max_time_generation>0.359</max_time_generation> - <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.156</avg_time_generation> + <avg_time_generation>0.135</avg_time_generation> </row> <row> <label>301</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 9ac6ea68c2..24291fc91a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,17 +2,17 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>28</nb_visits> - <nb_hits>38</nb_hits> + <nb_visits>29</nb_visits> + <nb_hits>39</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>16</nb_hits_with_time_generation> + <nb_hits_with_time_generation>17</nb_hits_with_time_generation> <min_time_generation>0.001</min_time_generation> <max_time_generation>1.324</max_time_generation> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> + <avg_time_generation>0.283</avg_time_generation> </row> <row> <label> Liberate Web Analytics - Analytics - Piwik</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml index ce5ec3dc77..27aff1019b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml @@ -12,7 +12,7 @@ <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>83</avg_time_on_page> + <avg_time_on_page>33</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.443</avg_time_generation> @@ -29,7 +29,7 @@ <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>83</avg_time_on_page> + <avg_time_on_page>33</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.443</avg_time_generation> @@ -42,7 +42,7 @@ <nb_hits_with_time_generation>2</nb_hits_with_time_generation> <min_time_generation>0.624</min_time_generation> <max_time_generation>1.324</max_time_generation> - <avg_time_on_page>15</avg_time_on_page> + <avg_time_on_page>8</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -56,7 +56,7 @@ <nb_hits_with_time_generation>2</nb_hits_with_time_generation> <min_time_generation>0.624</min_time_generation> <max_time_generation>1.324</max_time_generation> - <avg_time_on_page>15</avg_time_on_page> + <avg_time_on_page>8</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -76,7 +76,7 @@ <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>151</avg_time_on_page> + <avg_time_on_page>50</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -95,7 +95,7 @@ <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>151</avg_time_on_page> + <avg_time_on_page>50</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -161,7 +161,7 @@ <min_time_generation>0.234</min_time_generation> <max_time_generation>0.294</max_time_generation> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>52</avg_time_on_page> + <avg_time_on_page>17</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -177,7 +177,7 @@ <max_time_generation>0.294</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>52</avg_time_on_page> + <avg_time_on_page>17</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index cf6cb6491a..5a2fb28be8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -793,6 +793,48 @@ <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 6cad9e0d80..6ed96aef32 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -13,7 +13,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>8</entry_bounce_count> <exit_nb_visits>8</exit_nb_visits> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>13</avg_time_on_page> <bounce_rate>89%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> @@ -31,7 +31,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>5</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>24</avg_time_on_page> + <avg_time_on_page>17</avg_time_on_page> <bounce_rate>83%</bounce_rate> <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> @@ -49,7 +49,7 @@ <entry_sum_visit_length>54</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -70,7 +70,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>30</avg_time_on_page> + <avg_time_on_page>22</avg_time_on_page> <bounce_rate>80%</bounce_rate> <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> @@ -91,7 +91,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -112,7 +112,7 @@ <sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page> + <avg_time_on_page>5</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.974</avg_time_generation> @@ -542,7 +542,7 @@ <entry_sum_visit_length>0</entry_sum_visit_length> <entry_bounce_count>4</entry_bounce_count> <exit_nb_visits>5</exit_nb_visits> - <avg_time_on_page>10</avg_time_on_page> + <avg_time_on_page>7</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -563,7 +563,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>17</avg_time_on_page> + <avg_time_on_page>10</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.255</avg_time_generation> @@ -1173,6 +1173,48 @@ <segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment> </row> <row> + <label>api</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <subtable> + <row> + <label>/fútbol-user-agent</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.009</min_time_generation> + <max_time_generation>0.009</max_time_generation> + <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>1</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_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.009</avg_time_generation> + <url>http://piwik.net/api/fútbol-user-agent</url> + </row> + </subtable> + </row> + <row> <label>changelog</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index a9f37fee84..23f5051f83 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>39</nb_pageviews> - <nb_uniq_pageviews>38</nb_uniq_pageviews> + <nb_pageviews>40</nb_pageviews> + <nb_uniq_pageviews>39</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>0.206</avg_time_generation> + <avg_time_generation>0.184</avg_time_generation> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index f06074a2b3..bf02fbd84b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>63</nb_pageviews> - <nb_uniq_pageviews>56</nb_uniq_pageviews> + <nb_pageviews>64</nb_pageviews> + <nb_uniq_pageviews>57</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> <nb_uniq_outlinks>1</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>0.273</avg_time_generation> + <avg_time_generation>0.264</avg_time_generation> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 3746937e85..5996574d1f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>44</nb_actions> + <nb_actions>45</nb_actions> <slots> <row> <scope>page</scope> @@ -17,9 +17,9 @@ <subtable> <row> <label>200</label> - <nb_visits>33</nb_visits> - <nb_actions>35</nb_actions> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <nb_visits>34</nb_visits> + <nb_actions>36</nb_actions> + <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml index 55ef69079d..190fff01c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml @@ -72,7 +72,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>70</nb_actions> + <nb_actions>71</nb_actions> </row> <row> <name>Generation Time</name> @@ -99,7 +99,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>70</nb_actions> + <nb_actions>71</nb_actions> </row> </usages> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 08840cc821..0adfc71aee 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -9,8 +9,9 @@ <bounce_count>31</bounce_count> <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <segment>deviceBrand==Unknown</segment> </row> <row> <label>HTC</label> @@ -23,6 +24,20 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> + <segment>deviceBrand==HTC</segment> + </row> + <row> + <label>Apple</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo> + <segment>deviceBrand==Apple</segment> </row> <row> <label>Samsung</label> @@ -35,5 +50,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> + <segment>deviceBrand==Samsung</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index 4c4cb49892..26b425d530 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -9,7 +9,7 @@ <bounce_count>16</bounce_count> <nb_visits_converted>17</nb_visits_converted> <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserEngine==WebKit</segment> </row> <row> @@ -38,13 +38,13 @@ </row> <row> <label>Unknown</label> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <bounce_count>5</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserEngine==</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index d1231b5bb1..9ec764ffe6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -9,7 +9,7 @@ <bounce_count>9</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> @@ -50,13 +50,13 @@ </row> <row> <label>Unknown</label> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <bounce_count>5</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 8d82c019fc..fb459cbb95 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -100,7 +100,7 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==20.0</segment> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> @@ -208,4 +208,17 @@ <segment>browserCode==IE;browserVersion==8.0</segment> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> + <row> + <label>Unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>browserCode==UNK;browserVersion==1.0</segment> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 34e9fb7630..cce03cafcc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -9,7 +9,7 @@ <bounce_count>9</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> <segment>browserCode==CH</segment> </row> @@ -54,13 +54,13 @@ </row> <row> <label>Unknown</label> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <bounce_count>5</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> <segment>browserCode==UNK</segment> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index f330ccb30f..6a19338c7d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -9,7 +9,7 @@ <bounce_count>31</bounce_count> <nb_visits_converted>31</nb_visits_converted> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>HTC - Vision</label> @@ -23,6 +23,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Apple - iPhone</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Samsung - GALAXY S5</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index c7234f8606..9eee07e117 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -21,7 +21,7 @@ <bounce_count>10</bounce_count> <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> <row> @@ -72,4 +72,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> + <row> + <label>iOS</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 8ff1d6faee..f20b32cd47 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -22,7 +22,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> </row> @@ -118,6 +118,19 @@ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> + <label>iOS 7.1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment> + <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + </row> + <row> <label>Mac</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 875400f578..9215886300 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -9,11 +9,24 @@ <bounce_count>27</bounce_count> <nb_visits_converted>30</nb_visits_converted> <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <sum_daily_nb_users>2</sum_daily_nb_users> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> + <label>Smartphone</label> + <nb_visits>4</nb_visits> + <nb_actions>6</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>deviceType==smartphone</segment> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> @@ -26,19 +39,6 @@ <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> - <label>Smartphone</label> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>2</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>3</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> - <segment>deviceType==smartphone</segment> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> - </row> - <row> <label>Camera</label> <nb_visits>0</nb_visits> <segment>deviceType==camera</segment> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index d6f76b939e..b4efda3138 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0 days</label> - <nb_conversions>33</nb_conversions> + <nb_conversions>34</nb_conversions> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml index d97c3eb0d0..603f674615 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>34</nb_conversions> - <nb_visits_converted>34</nb_visits_converted> - <revenue>170</revenue> - <conversion_rate>89.47%</conversion_rate> + <nb_conversions>35</nb_conversions> + <nb_visits_converted>35</nb_visits_converted> + <revenue>175</revenue> + <conversion_rate>89.74%</conversion_rate> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index fcd1e7c56b..c25b8275f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_conversions>34</nb_conversions> + <nb_conversions>35</nb_conversions> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml index 73154bb53f..9c8f8990b0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>34</nb_conversions> - <nb_visits_converted>34</nb_visits_converted> - <revenue>170</revenue> - <conversion_rate>89.47%</conversion_rate> - <nb_conversions_new_visit>31</nb_conversions_new_visit> - <nb_visits_converted_new_visit>31</nb_visits_converted_new_visit> - <revenue_new_visit>155</revenue_new_visit> - <conversion_rate_new_visit>88.57%</conversion_rate_new_visit> + <nb_conversions>35</nb_conversions> + <nb_visits_converted>35</nb_visits_converted> + <revenue>175</revenue> + <conversion_rate>89.74%</conversion_rate> + <nb_conversions_new_visit>32</nb_conversions_new_visit> + <nb_visits_converted_new_visit>32</nb_visits_converted_new_visit> + <revenue_new_visit>160</revenue_new_visit> + <conversion_rate_new_visit>88.89%</conversion_rate_new_visit> <nb_conversions_returning_visit>3</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit> <revenue_returning_visit>15</revenue_returning_visit> 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 84ba4e506d..2087b56cee 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -2114,7 +2114,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>67</idVisit> + <idVisit>68</idVisit> <visitIp>173.5.0.0</visitIp> <actionDetails> @@ -2123,7 +2123,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>93</goalPageId> + <goalPageId>94</goalPageId> <url>http://hello.example.com/hello/from/another/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2135,7 +2135,7 @@ <pageTitle /> <pageIdAction>61</pageIdAction> - <pageId>93</pageId> + <pageId>94</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2293,7 +2293,7 @@ <pageTitle /> <pageIdAction>56</pageIdAction> - <pageId>90</pageId> + <pageId>91</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2512,7 +2512,7 @@ <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> <pageIdAction>60</pageIdAction> - <pageId>92</pageId> + <pageId>93</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2638,7 +2638,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>66</idVisit> + <idVisit>67</idVisit> <visitIp>70.95.32.0</visitIp> <actionDetails> @@ -2647,7 +2647,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>91</goalPageId> + <goalPageId>92</goalPageId> <url>http://example.hello.com/Topic/hw43061</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2659,7 +2659,7 @@ <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> <pageIdAction>58</pageIdAction> - <pageId>91</pageId> + <pageId>92</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -3133,6 +3133,115 @@ </row> <row> <idSite>1</idSite> + <idVisit>66</idVisit> + <visitIp>73.77.55.45</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>90</goalPageId> + + <url>http://piwik.net/api/fútbol-user-agent</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> + <type>action</type> + <url>http://piwik.net/api/fútbol-user-agent</url> + <pageTitle /> + <pageIdAction>71</pageIdAction> + + <pageId>90</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <generationTime>0.009s</generationTime> + <icon /> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>iPhone</deviceModel> + <operatingSystem>iOS 7.1</operatingSystem> + <operatingSystemName>iOS</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon> + <operatingSystemCode>IOS</operatingSystemCode> + <operatingSystemVersion>7.1</operatingSystemVersion> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion>1.0</browserVersion> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>New Jersey</region> + <regionCode>NJ</regionCode> + <city>Mount Laurel</city> + <location>Mount Laurel, New Jersey, United States</location> + <latitude>39.957001</latitude> + <longitude>-74.916000</longitude> + <visitLocalTime>12:20:31</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>64</idVisit> <visitIp>192.0.2.222</visitIp> @@ -4409,7 +4518,7 @@ - <userId /> + <userId>commonuser</userId> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index 8485ac465c..fd2d4e58ad 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ <result> <row> <label>Piwik test</label> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> - <nb_pageviews>39</nb_pageviews> - <revenue>170</revenue> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> + <nb_pageviews>40</nb_pageviews> + <revenue>175</revenue> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index 9b9cc1efd7..5adcb351b8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>39</nb_pageviews> - <revenue>170</revenue> + <nb_pageviews>40</nb_pageviews> + <revenue>175</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index a1e8fd0e9d..8131944987 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,23 +2,24 @@ <result> <row> <label>Direct Entry</label> - <nb_visits>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> - <bounce_count>30</bounce_count> + <bounce_count>31</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>30</nb_conversions> - <nb_visits_converted>30</nb_visits_converted> - <revenue>150</revenue> + <nb_conversions>31</nb_conversions> + <nb_visits_converted>31</nb_visits_converted> + <revenue>155</revenue> </row> </goals> - <nb_conversions>30</nb_conversions> - <revenue>150</revenue> - <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <nb_conversions>31</nb_conversions> + <revenue>155</revenue> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==direct</segment> </row> <row> <label>Websites</label> @@ -38,6 +39,7 @@ <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>referrerType==website</segment> <subtable> <row> <label>example.com</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml index 55471df8f7..06ad7df1f9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -64,7 +64,7 @@ <bounce_count>3</bounce_count> <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Android / Android Browser / unknown</label> @@ -111,6 +111,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>iOS / Unknown / unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>GNU/Linux / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index 2dd3a3f0ff..d8f74a118c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>unknown</label> - <nb_visits>36</nb_visits> - <nb_actions>43</nb_actions> + <nb_visits>37</nb_visits> + <nb_actions>44</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>31</bounce_count> - <nb_visits_converted>32</nb_visits_converted> - <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <bounce_count>32</bounce_count> + <nb_visits_converted>33</nb_visits_converted> + <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <segment>resolution==unknown</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index fa5433509b..4c6a424157 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -17,7 +17,7 @@ <nb_conversions>27</nb_conversions> <revenue>135</revenue> <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <city_name>Unknown</city_name> <city>xx</city> @@ -84,6 +84,34 @@ <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> <row> + <label>Mount Laurel, New Jersey, United States</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</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>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <lat>39.957</lat> + <long>-74.916</long> + <segment>city==Mount+Laurel;regionCode==NJ;countryCode==us</segment> + <city_name>Mount Laurel</city_name> + <region>NJ</region> + <country>us</country> + <country_name>United States</country_name> + <region_name>New Jersey</region_name> + <logo>plugins/UserCountry/images/flags/us.png</logo> + </row> + <row> <label>Seoul, Seoul-t&#039;ukpyolsi, South Korea</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 054cf2e1d3..4d15ccdb89 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -22,21 +22,21 @@ </row> <row> <label>North America</label> - <nb_visits>11</nb_visits> - <nb_actions>14</nb_actions> + <nb_visits>12</nb_visits> + <nb_actions>15</nb_actions> <max_actions>3</max_actions> <sum_visit_length>4</sum_visit_length> - <bounce_count>9</bounce_count> + <bounce_count>10</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>11</nb_conversions> - <nb_visits_converted>11</nb_visits_converted> - <revenue>55</revenue> + <nb_conversions>12</nb_conversions> + <nb_visits_converted>12</nb_visits_converted> + <revenue>60</revenue> </row> </goals> - <nb_conversions>11</nb_conversions> - <revenue>55</revenue> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <nb_conversions>12</nb_conversions> + <revenue>60</revenue> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> @@ -57,7 +57,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <code>Unknown</code> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 98deda9945..70da83f4e9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -25,6 +25,30 @@ <logoHeight>11</logoHeight> </row> <row> + <label>United States</label> + <nb_visits>11</nb_visits> + <nb_actions>14</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>4</sum_visit_length> + <bounce_count>9</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>11</nb_conversions> + <nb_visits_converted>11</nb_visits_converted> + <revenue>55</revenue> + </row> + </goals> + <nb_conversions>11</nb_conversions> + <revenue>55</revenue> + <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> + <code>us</code> + <logo>plugins/UserCountry/images/flags/us.png</logo> + <segment>countryCode==us</segment> + <logoWidth>16</logoWidth> + <logoHeight>11</logoHeight> + </row> + <row> <label>Unknown</label> <nb_visits>11</nb_visits> <nb_actions>12</nb_actions> @@ -41,7 +65,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> @@ -50,30 +74,6 @@ <logoHeight>11</logoHeight> </row> <row> - <label>United States</label> - <nb_visits>10</nb_visits> - <nb_actions>13</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>8</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>10</nb_conversions> - <nb_visits_converted>10</nb_visits_converted> - <revenue>50</revenue> - </row> - </goals> - <nb_conversions>10</nb_conversions> - <revenue>50</revenue> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> - <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> - <segment>countryCode==us</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> - </row> - <row> <label>Brazil</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index bdcfaeca3c..b9f8ff9295 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -17,7 +17,7 @@ <nb_conversions>27</nb_conversions> <revenue>135</revenue> <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <sum_daily_nb_users>3</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <region>xx</region> <country>xx</country> @@ -51,6 +51,31 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> </row> <row> + <label>New Jersey, United States</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</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>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>regionCode==NJ;countryCode==us</segment> + <region>NJ</region> + <country>us</country> + <country_name>United States</country_name> + <region_name>New Jersey</region_name> + <logo>plugins/UserCountry/images/flags/us.png</logo> + </row> + <row> <label>Nunavut, Canada</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml index da22c13a83..029f2ea4a7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>Unknown (xx)</label> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>33</bounce_count> - <nb_visits_converted>34</nb_visits_converted> - <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <bounce_count>34</bounce_count> + <nb_visits_converted>35</nb_visits_converted> + <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <segment>languageCode==xx</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml index d2c34aab1a..5a86d88387 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>Unknown</label> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>33</bounce_count> - <nb_visits_converted>34</nb_visits_converted> - <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <bounce_count>34</bounce_count> + <nb_visits_converted>35</nb_visits_converted> + <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <segment>languageCode==xx</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index b381de56d6..cc47ebdc6e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Monday</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_actions>1</nb_actions> + <nb_visits>2</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_actions>2</nb_actions> <nb_users>0</nb_users> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> <day_of_week>1</day_of_week> </row> <row> @@ -54,7 +54,7 @@ <nb_visits>11</nb_visits> <nb_uniq_visitors>11</nb_uniq_visitors> <nb_actions>14</nb_actions> - <nb_users>0</nb_users> + <nb_users>1</nb_users> <sum_visit_length>305</sum_visit_length> <bounce_count>9</bounce_count> <nb_visits_converted>9</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index e4f045cd9f..46f45bc7b3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -146,13 +146,13 @@ </row> <row> <label>12h</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>visitLocalHour==12</segment> </row> @@ -189,7 +189,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <segment>visitLocalHour==15</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index fcc08ecee4..09be75ee74 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -191,23 +191,23 @@ </row> <row> <label>12h</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <goals> <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> </row> </goals> - <nb_conversions>1</nb_conversions> - <revenue>5</revenue> + <nb_conversions>2</nb_conversions> + <revenue>10</revenue> <segment>visitServerHour==12</segment> </row> <row> @@ -252,7 +252,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 43027f77b0..c39484f83d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>35</nb_visits> + <nb_visits>36</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index a879d261b3..adb58e2a56 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>39</nb_visits> + <nb_visits>40</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index 221a29c2b5..4eb8fddf65 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index 11fd85a144..f02d54dcf5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,8 +2,8 @@ <result> <row> <label>1 visit</label> - <nb_visits>44</nb_visits> - <nb_visits_percentage>86%</nb_visits_percentage> + <nb_visits>45</nb_visits> + <nb_visits_percentage>87%</nb_visits_percentage> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 0ca3284b5b..174a8d90d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>33</nb_visits> + <nb_visits>34</nb_visits> </row> <row> <label>2 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml index 51ed7da2eb..d771a07bc9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>42</nb_visits> + <nb_visits>43</nb_visits> </row> <row> <label>2 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index f3e2effb18..5809c92de9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>35</nb_visits> + <nb_visits>36</nb_visits> </row> <row> <label>11-30s</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index b62b79979b..6f5a23aa2a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>45</nb_visits> + <nb_visits>46</nb_visits> </row> <row> <label>11-30s</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 05473b60f6..0e7e4e3d09 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>45</result>
\ No newline at end of file +<result>46</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index 95aa700980..5c61a82137 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>33</result>
\ No newline at end of file +<result>34</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 8af80c337f..51a0bb8472 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>36</result>
\ No newline at end of file +<result>37</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml index 13002b2017..15ef03fb49 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>2</result>
\ No newline at end of file +<result>3</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 5c61a82137..8e4b837a62 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>34</result>
\ No newline at end of file +<result>35</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 962fbe983a..f24432d1a4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>38</result>
\ No newline at end of file +<result>39</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index a71746a977..94dde51493 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>36</nb_uniq_visitors> - <nb_users>2</nb_users> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>34</nb_visits_converted> - <bounce_count>33</bounce_count> + <nb_uniq_visitors>37</nb_uniq_visitors> + <nb_users>3</nb_users> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> + <nb_visits_converted>35</nb_visits_converted> + <bounce_count>34</bounce_count> <sum_visit_length>551</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>87%</bounce_rate> <nb_actions_per_visit>1.2</nb_actions_per_visit> - <avg_time_on_site>15</avg_time_on_site> + <avg_time_on_site>14</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 4e4c5a220b..94b54bf27a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,11 +3,11 @@ <result date="2012-08"> <row> <label>Piwik test</label> - <nb_visits>38</nb_visits> - <nb_actions>45</nb_actions> - <nb_pageviews>39</nb_pageviews> - <revenue>170</revenue> - <nb_conversions>34</nb_conversions> + <nb_visits>39</nb_visits> + <nb_actions>46</nb_actions> + <nb_pageviews>40</nb_pageviews> + <revenue>175</revenue> + <nb_conversions>35</nb_conversions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -59,8 +59,8 @@ <revenue>5</revenue> <nb_conversions>1</nb_conversions> <visits_evolution>-97.4%</visits_evolution> - <actions_evolution>-77.8%</actions_evolution> - <pageviews_evolution>-74.4%</pageviews_evolution> + <actions_evolution>-78.3%</actions_evolution> + <pageviews_evolution>-75%</pageviews_evolution> <revenue_evolution>-97.1%</revenue_evolution> <nb_conversions_evolution>-97.1%</nb_conversions_evolution> <idsite>1</idsite> diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml index 411d2a2eb9..086e95965f 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>1441</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerName==Google;referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment> <url>http://google.com/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml index afffc60a48..79f1fd371f 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml @@ -14,7 +14,7 @@ <entry_nb_actions>9</entry_nb_actions> <entry_sum_visit_length>1441</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>1116</avg_time_on_page> + <avg_time_on_page>279</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.626</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml index 008d9e87fb..8b29b241d3 100644 --- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml @@ -9,7 +9,7 @@ <nb_hits_following_search>2</nb_hits_following_search> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index 8b154c9334..4cf37854e3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -10,5 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <segment>deviceBrand==Unknown</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index deb88da799..fd2de07373 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -17,6 +17,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segment>referrerType==search</segment> <subtable> <row> <label>purchase</label> @@ -55,6 +56,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segment>referrerType==website</segment> <subtable> <row> <label>referrer.com</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index 8ff05bc8ff..a6ccba6e74 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -11,5 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <segment>deviceBrand==Unknown</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index 2225e62fa0..e4b6ce2e00 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -18,6 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> + <segment>referrerType==search</segment> <subtable> <row> <label>purchase</label> @@ -58,6 +59,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> + <segment>referrerType==website</segment> <subtable> <row> <label>referrer.com</label> 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 e00992d683..8d118edb9a 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 @@ -113,8 +113,8 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> - <timeSpent>1080</timeSpent> - <timeSpentPretty>18 min 0s</timeSpentPretty> + <timeSpent>1084</timeSpent> + <timeSpentPretty>18 min 4s</timeSpentPretty> <icon /> </row> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index 3b8bde9065..34447b169a 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -249,7 +249,7 @@ <change>-100%</change> </nb_visits_1> <nb_visits_2> - <name>Google - justice )(&^#%$ not &#039;" corruption! (Visits)</name> + <name>Google - justice )(&^#%$ not &#039;" corruption! (Visits)</name> <min>0</min> <max>1</max> </nb_visits_2> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index d97e75695c..a0555e1b4a 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -14,7 +14,7 @@ <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> <row> - <label>Google - justice )(&^#%$ not &#039;" corruption!</label> + <label>Google - justice )(&^#%$ not &#039;" corruption!</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> <max_actions>1</max_actions> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml index 5730859763..10f622edda 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml @@ -33,7 +33,7 @@ <change>-100%</change> </nb_visits_0> <nb_visits_1> - <name>justice )(&^#%$ not &#039;" corruption! (Visits)</name> + <name>justice )(&^#%$ not &#039;" corruption! (Visits)</name> <min>0</min> <max>8</max> <change>-100%</change> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index 4d574d9da9..3808a4f5b5 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -75,7 +75,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:03:36</avg_time_on_page> + <avg_time_on_page>00:01:48</avg_time_on_page> <exit_rate>0%</exit_rate> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml index 2c17c63452..f88c7b0657 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml @@ -75,7 +75,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:03:36</avg_time_on_page> + <avg_time_on_page>00:01:48</avg_time_on_page> <exit_rate>0%</exit_rate> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index e500a0aeef..9987853e36 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -63,7 +63,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:03:36</avg_time_on_page> + <avg_time_on_page>00:01:48</avg_time_on_page> <exit_rate>0%</exit_rate> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml index 0db09dbb26..062f55e0fd 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml @@ -63,7 +63,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:03:36</avg_time_on_page> + <avg_time_on_page>00:01:48</avg_time_on_page> <exit_rate>0%</exit_rate> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml index 7ea5167dfd..fe61ab5004 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml @@ -20,7 +20,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml index 86ae401b60..e49e07c8a2 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml @@ -20,7 +20,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml index 9dc49472a7..5bc8b63f86 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml @@ -32,7 +32,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml index d9462f0f36..c4d37d733e 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml @@ -32,7 +32,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml index 74ece58337..8cdba28f3b 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml @@ -21,7 +21,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml index 1c66040802..2dda15648d 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml @@ -21,7 +21,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml index b001f1be29..2939c4da2b 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml @@ -36,7 +36,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml index ddae944352..5c9107743f 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml @@ -36,7 +36,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml index 4798b08e6e..4567e228f7 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml @@ -8,7 +8,7 @@ <nb_hits>6</nb_hits> <sum_time_spent>468</sum_time_spent> <nb_pages_per_search>3</nb_pages_per_search> - <avg_time_on_page>234</avg_time_on_page> + <avg_time_on_page>78</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> @@ -52,7 +52,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>54</sum_time_spent> <nb_pages_per_search>2</nb_pages_per_search> - <avg_time_on_page>54</avg_time_on_page> + <avg_time_on_page>27</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml index 5b6e7c4828..26e6e57fdf 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml @@ -18,7 +18,7 @@ <nb_hits>6</nb_hits> <sum_time_spent>468</sum_time_spent> <nb_pages_per_search>3</nb_pages_per_search> - <avg_time_on_page>234</avg_time_on_page> + <avg_time_on_page>78</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> @@ -50,7 +50,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>54</sum_time_spent> <nb_pages_per_search>2</nb_pages_per_search> - <avg_time_on_page>54</avg_time_on_page> + <avg_time_on_page>27</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml index 66f8e8a41d..b28a8b9c15 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml @@ -18,7 +18,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml index 450ab9b87a..6bcdb7bac8 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml @@ -18,7 +18,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml index 200b1c3565..68d4794fb7 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml @@ -30,7 +30,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml index 3adcd2fca8..5b7c76e160 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml @@ -30,7 +30,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml index 3fbf138c64..be73f3d714 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml @@ -19,7 +19,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml index 77a97cfa0b..336ef8382f 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml @@ -19,7 +19,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml index 5617717b0d..0c49416b27 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml @@ -34,7 +34,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml index 12b4aea3ad..cd21527e10 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml @@ -34,7 +34,7 @@ <sum_time_spent>216</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_time_on_page>216</avg_time_on_page> + <avg_time_on_page>108</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml index 588feafeea..7059d2638a 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml @@ -6,7 +6,7 @@ <nb_hits>6</nb_hits> <sum_time_spent>468</sum_time_spent> <nb_pages_per_search>3</nb_pages_per_search> - <avg_time_on_page>234</avg_time_on_page> + <avg_time_on_page>78</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml index 3e1015bd31..6cd43051cb 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml @@ -16,7 +16,7 @@ <nb_hits>6</nb_hits> <sum_time_spent>468</sum_time_spent> <nb_pages_per_search>3</nb_pages_per_search> - <avg_time_on_page>234</avg_time_on_page> + <avg_time_on_page>78</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> @@ -48,7 +48,7 @@ <nb_hits>2</nb_hits> <sum_time_spent>54</sum_time_spent> <nb_pages_per_search>2</nb_pages_per_search> - <avg_time_on_page>54</avg_time_on_page> + <avg_time_on_page>27</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index a5ea296b53..207e2159fc 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -89,7 +89,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> + <avg_time_on_page>00:03:00</avg_time_on_page> <exit_rate>100%</exit_rate> <avg_time_generation>0.31s</avg_time_generation> </row> @@ -118,7 +118,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> + <avg_time_on_page>00:03:00</avg_time_on_page> <exit_rate>100%</exit_rate> <avg_time_generation>0.31s</avg_time_generation> </row> @@ -147,7 +147,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> + <avg_time_on_page>00:03:00</avg_time_on_page> <exit_rate>100%</exit_rate> <avg_time_generation>0.31s</avg_time_generation> </row> @@ -176,7 +176,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> + <avg_time_on_page>00:03:00</avg_time_on_page> <exit_rate>100%</exit_rate> <avg_time_generation>0.31s</avg_time_generation> </row> @@ -205,7 +205,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> + <avg_time_on_page>00:03:00</avg_time_on_page> <exit_rate>100%</exit_rate> <avg_time_generation>0.31s</avg_time_generation> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml index c67d91399b..57f0b1452f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml @@ -99,7 +99,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -155,7 +155,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -211,7 +211,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -267,7 +267,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -323,7 +323,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml index 08d1c90f9a..de92713eae 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml @@ -51,7 +51,7 @@ <exit_nb_visits>8</exit_nb_visits> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml index fc85313690..e7008c40ff 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml @@ -97,7 +97,7 @@ <exit_nb_visits>6</exit_nb_visits> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -138,7 +138,7 @@ <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml index 0d0f6aaca8..9cb3a82c02 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml @@ -51,7 +51,7 @@ <exit_nb_visits>8</exit_nb_visits> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml index 4087b624e2..f7e7161700 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml @@ -98,7 +98,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -154,7 +154,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -210,7 +210,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -266,7 +266,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -322,7 +322,7 @@ <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml index 6e13a1e872..e68d67ec34 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml @@ -50,7 +50,7 @@ <exit_nb_visits>8</exit_nb_visits> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml index 8366107a19..6f28680dc3 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml @@ -96,7 +96,7 @@ <exit_nb_visits>6</exit_nb_visits> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> @@ -137,7 +137,7 @@ <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml index fb02cf8629..266832e590 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml @@ -50,7 +50,7 @@ <exit_nb_visits>8</exit_nb_visits> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0.313</avg_time_generation> 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 f0e58ae957..94a3e0f6fb 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 @@ -236,7 +236,7 @@ Page URLs label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation /index.htm,9,9,11%,00:05:20,11%,0.3s Page URL not defined,9,17,0%,00:00:00,0%,0.22s -/thankyou,8,16,0%,00:06:00,100%,0.31s +/thankyou,8,16,0%,00:03:00,100%,0.31s /products,1,1,100%,00:00:00,100%,0.15s Entry pages 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 fe254e0793..95c67bf1c7 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 @@ -4099,7 +4099,7 @@ 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:06:00 + 00:03:00 </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_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml index 667ec31507..275f1a4987 100644 --- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml @@ -10,7 +10,7 @@ <entry_sum_visit_length>2161</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>630</avg_time_on_page> + <avg_time_on_page>420</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>25%</exit_rate> <subtable> @@ -25,7 +25,7 @@ <entry_nb_actions>8</entry_nb_actions> <entry_sum_visit_length>2161</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>1080</avg_time_on_page> + <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/foo/bar.html</url> @@ -36,7 +36,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>2</nb_hits> <sum_time_spent>720</sum_time_spent> - <avg_time_on_page>720</avg_time_on_page> + <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>https://www.example.org/foo/bar2.html</url> diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml index 2d5f40e9cb..1dd8c3190c 100644 --- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml @@ -5,7 +5,7 @@ <nb_visits>1</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <subtable> @@ -15,7 +15,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> - <avg_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>https://www.example.org/foo/bar2.html</url> diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml index 0549176cb6..504018b6cd 100644 --- a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml @@ -89,7 +89,7 @@ <sum_time_spent>720</sum_time_spent> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>720</avg_time_on_page> + <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml index 667ec31507..275f1a4987 100644 --- a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml @@ -10,7 +10,7 @@ <entry_sum_visit_length>2161</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>630</avg_time_on_page> + <avg_time_on_page>420</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>25%</exit_rate> <subtable> @@ -25,7 +25,7 @@ <entry_nb_actions>8</entry_nb_actions> <entry_sum_visit_length>2161</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>1080</avg_time_on_page> + <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>http://example.org/foo/bar.html</url> @@ -36,7 +36,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>2</nb_hits> <sum_time_spent>720</sum_time_spent> - <avg_time_on_page>720</avg_time_on_page> + <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <url>https://www.example.org/foo/bar2.html</url> 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 b83a3d071d..ed2500e125 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 @@ -154,8 +154,8 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>9</pageId> - <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpent>721</timeSpent> + <timeSpentPretty>12 min 1s</timeSpentPretty> <icon /> <timestamp>1267892913</timestamp> </row> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml index cd12df23f8..4201ab7dd3 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml @@ -11,7 +11,7 @@ <entry_sum_visit_length>361</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>120</avg_time_on_page> + <avg_time_on_page>72</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> <subtable> @@ -50,7 +50,7 @@ <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_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/category/Pageyy</url> diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml index cd12df23f8..4201ab7dd3 100644 --- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml @@ -11,7 +11,7 @@ <entry_sum_visit_length>361</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>120</avg_time_on_page> + <avg_time_on_page>72</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> <subtable> @@ -50,7 +50,7 @@ <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_time_on_page>360</avg_time_on_page> + <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <url>http://example.org/category/Pageyy</url> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 1a9ff120e6..9ba6330564 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -67,13 +67,6 @@ <permission>1</permission> </row> <row> - <type>metric</type> - <category>Actions</category> - <name>Action Type</name> - <segment>actionType</segment> - <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues> - </row> - <row> <type>dimension</type> <category>Visit Location</category> <name>City</name> @@ -147,6 +140,13 @@ <row> <type>dimension</type> <category>Visit</category> + <name>Device brand</name> + <segment>deviceBrand</segment> + <acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Allview, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes & Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, Bush, CUBOT, Carrefour, Captiva, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Datang, Denver, Desay, Dbtel, DoCoMo, Dicam, Dell, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, EBEST, Ericsson, ECS, Ezio, Elephone, Easypix, Energy Sistem, Ericy, Eton, eTouch, Evertek, Ezze, Fly, Foxconn, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hisense, Hi-Level, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, iOcean, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kingsun, Konka, Komu, Koobee, K-Touch, KT-Tech, KOPO, Koridy, Kumai, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Lingwin, Loewe, Logicom, Lexibook, Majestic, Manta Multimedia, Mobistel, Mecer, Medion, MEEG, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Mofut, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Noain, Nokia, Nomi, Nikon, Newgen, Nexian, NextBook, Onda, OnePlus, OPPO, Orange, O2, Ouki, OUYA, Opsson, Panasonic, PEAQ, Philips, Polaroid, Palm, phoneOne, Pantech, Point of View, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, QMobile, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Star, Storex, Stonex, SunVan, Sumvision, Tesla, TCL, Telit, ThL, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, Uniscope, UTStarcom, Vastking, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voto, Voxtel, Vodafone, Vizio, Videoweb, Walton, Web TV, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Unknown, Yarvik, Yuandao, Yusun, Ytone, Zeemi, Zonda, Zopo, ZTE</acceptedValues> + </row> + <row> + <type>dimension</type> + <category>Visit</category> <name>Device type</name> <segment>deviceType</segment> <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player, phablet</acceptedValues> @@ -222,7 +222,7 @@ <category>Visit</category> <name>Visit ID</name> <segment>visitId</segment> - <acceptedValues>Any integer. </acceptedValues> + <acceptedValues>Any integer.</acceptedValues> <permission>1</permission> </row> <row> @@ -483,6 +483,13 @@ <row> <type>dimension</type> <category>Actions</category> + <name>Action Type</name> + <segment>actionType</segment> + <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues> + </row> + <row> + <type>dimension</type> + <category>Actions</category> <name>Action URL</name> <segment>actionUrl</segment> <unionOfSegments> 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 f6d30fd9ba..5b19eea90f 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 @@ -226,8 +226,8 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> - <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> </row> 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 730c0fc1a4..d391947a56 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -87,8 +87,8 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> - <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> </row> @@ -430,8 +430,8 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> - <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> </row> 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 50eeb9cc0e..c13ba3af27 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 @@ -224,7 +224,7 @@ Sunday,0,0%,0,00:00:00,0%,0 Page URLs label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate -/index.htm,4,16,0%,00:13:30,100% +/index.htm,4,16,0%,00:03:23,100% Entry pages label,entry_nb_visits,entry_bounce_count,bounce_rate @@ -236,7 +236,7 @@ label,nb_visits,exit_nb_visits,exit_rate Page titles label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate - View product left in cart,3,9,0%,00:06:00,100% + View product left in cart,3,9,0%,00:02:00,100% Another Product page,1,1,0%,00:06:00,0% Another Product page with multiple categories,1,1,0%,00:00:00,100% Another Product page with no category,1,1,0%,00:00:00,0% 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 b2825b88ee..7f70fb99c1 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 @@ -3894,7 +3894,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:13:30 + 00:03:23 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4036,7 +4036,7 @@ 3 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:06:00 + 00:02:00 </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_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml index 2b521b00a4..1ed4db4a84 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml @@ -10,6 +10,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment> <url>http://facebook.com/whatever</url> </row> <row> @@ -22,6 +23,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> @@ -34,6 +36,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment> <url>http://www.facebook.com/another/path</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml index 4649b78a18..d85c6fa7fa 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml @@ -11,6 +11,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment> <url>http://facebook.com/whatever</url> </row> <row> @@ -23,6 +24,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> @@ -35,6 +37,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fmixi.jp</segment> <url>http://mixi.jp</url> </row> <row> @@ -47,6 +50,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fskyrock.com</segment> <url>http://skyrock.com</url> </row> <row> @@ -59,6 +63,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment> <url>http://t.co/id/?y=dsfs</url> </row> <row> @@ -71,6 +76,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment> <url>http://twitter.com/whatever2</url> </row> <row> @@ -83,6 +89,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment> <url>http://www.facebook.com/another/path</url> </row> <row> @@ -95,6 +102,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fwww.flickr.com</segment> <url>http://www.flickr.com</url> </row> <row> @@ -107,6 +115,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fwww.twitter.com%2Findex%3Fa%3D2334</segment> <url>http://www.twitter.com/index?a=2334</url> </row> <row> @@ -119,6 +128,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fxanga.com</segment> <url>http://xanga.com</url> </row> </result> @@ -133,6 +143,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment> <url>http://t.co/id/?y=dsfs</url> </row> <row> @@ -145,6 +156,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment> <url>http://twitter.com/whatever2</url> </row> <row> @@ -157,6 +169,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment> <url>http://www.facebook.com/another/path</url> </row> </result> 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 ad8e93fed4..f15526855b 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 @@ -3,7 +3,11 @@ <totalVisits>2</totalVisits> <totalVisitDuration>361</totalVisitDuration> <totalActions>2</totalActions> + <totalEvents>0</totalEvents> + <totalOutlinks>1</totalOutlinks> + <totalDownloads>0</totalDownloads> <totalSearches>0</totalSearches> + <totalPageViews>1</totalPageViews> <totalPageViewsWithTiming>0</totalPageViewsWithTiming> <totalGoalConversions>1</totalGoalConversions> <totalConversionsByGoal> @@ -34,14 +38,14 @@ <firstVisit> - <daysAgo>0</daysAgo> + <referrerType>campaign</referrerType> <referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary> </firstVisit> <lastVisit> - <daysAgo>0</daysAgo> + <referrerType>campaign</referrerType> <referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary> </lastVisit> 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 ad8e93fed4..f15526855b 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 @@ -3,7 +3,11 @@ <totalVisits>2</totalVisits> <totalVisitDuration>361</totalVisitDuration> <totalActions>2</totalActions> + <totalEvents>0</totalEvents> + <totalOutlinks>1</totalOutlinks> + <totalDownloads>0</totalDownloads> <totalSearches>0</totalSearches> + <totalPageViews>1</totalPageViews> <totalPageViewsWithTiming>0</totalPageViewsWithTiming> <totalGoalConversions>1</totalGoalConversions> <totalConversionsByGoal> @@ -34,14 +38,14 @@ <firstVisit> - <daysAgo>0</daysAgo> + <referrerType>campaign</referrerType> <referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary> </firstVisit> <lastVisit> - <daysAgo>0</daysAgo> + <referrerType>campaign</referrerType> <referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary> </lastVisit> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml index 1cecf66395..61f5ff50c5 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==direct</segment> </row> <row> <label>Search Engines</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==search</segment> <subtable> <row> <label>search term 2</label> @@ -67,6 +69,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==website</segment> <subtable> <row> <label>whatever0.com</label> 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 4f21289bfd..d8646a11f5 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 @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==direct</segment> </row> <row> <label>Search Engines - Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml index 1cecf66395..61f5ff50c5 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml @@ -10,6 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==direct</segment> </row> <row> <label>Search Engines</label> @@ -21,6 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==search</segment> <subtable> <row> <label>search term 2</label> @@ -67,6 +69,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>referrerType==website</segment> <subtable> <row> <label>whatever0.com</label> diff --git a/tests/PHPUnit/Unit/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php index acc4992b1d..806dc53658 100644 --- a/tests/PHPUnit/Unit/Period/DayTest.php +++ b/tests/PHPUnit/Unit/Period/DayTest.php @@ -217,6 +217,7 @@ class DayTest extends BasePeriodTest return array( array('en', 'Wed, Oct 9'), array('lt', '10-09, Tr'), + array('ru', 'Ср, 9 Окт.'), array('zh-cn', '10月9日周三'), ); } diff --git a/tests/PHPUnit/Unit/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php index 3153e43acc..6f9c50d614 100644 --- a/tests/PHPUnit/Unit/UrlTest.php +++ b/tests/PHPUnit/Unit/UrlTest.php @@ -13,12 +13,10 @@ use Piwik\Url; /** * @backupGlobals enabled + * @group Core */ class UrlTest extends \PHPUnit_Framework_TestCase { - /** - * @group Core - */ public function testAllMethods() { $this->assertEquals(Url::getCurrentQueryStringWithParametersModified(array()), Url::getCurrentQueryString()); @@ -63,7 +61,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase /** * @dataProvider getCurrentHosts - * @group Core */ public function testGetCurrentHost($description, $test) { @@ -132,8 +129,30 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** + * @dataProvider getIsLocalHost + */ + public function test_isLocalHost($expectedIsLocal, $host) + { + $this->assertSame($expectedIsLocal, Url::isLocalHost($host)); + } + + public function getIsLocalHost() + { + return array( + array($isLocal = false, '127.0.0.2'), + array($isLocal = false, '192.168.1.1'), + array($isLocal = false, '10.1.1.1'), + array($isLocal = false, '172.30.1.1'), + + array($isLocal = true, 'localhost'), + array($isLocal = true, '127.0.0.1'), + array($isLocal = true, '::1'), + array($isLocal = true, '[::1]'), + ); + } + + /** * @dataProvider getLocalUrls - * @group Core */ public function testIsLocalUrl($httphost, $scripturi, $requesturi, $testurl, $result) { @@ -161,7 +180,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase /** * @dataProvider getCurrentUrlWithoutFilename - * @group Core */ public function testGetCurrentUrlWithoutFilename($expected, $https, $host, $path) { @@ -182,9 +200,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $url); } - /** - * @group Core - */ public function test_getCurrentScriptName() { $this->resetGlobalVariables(); @@ -238,7 +253,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase /** * @dataProvider getValidHostData - * @group Core */ public function testIsValidHost($expected, $host, $trustedHosts, $description) { @@ -247,9 +261,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, Url::isValidHost($host), $description); } - /** - * @group Core - */ public function testGetReferrer() { $_SERVER['HTTP_REFERER'] = 'http://www.piwik.org'; @@ -257,8 +268,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** - * @group Core - * * @dataProvider getQueryParameters */ public function testGetQueryStringFromParameters($params, $queryString) @@ -281,8 +290,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** - * @group Core - * * @dataProvider getHostsFromUrl */ public function testGetHostsFromUrl($url, $expectedHost) @@ -304,8 +311,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** - * @group Core - * * @dataProvider getIsHostInUrls */ public function testIsHostInUrlsl($isHost, $host, $urls) @@ -348,7 +353,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** - * @group Core * @dataProvider urlProvider */ public function testGetCurrentUrl($url, $pathInfo = null) @@ -372,7 +376,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase } /** - * @group Core * @dataProvider urlWithoutQueryStringProvider */ public function testGetCurrentUrlWithoutQueryString($url, $expected, $pathInfo = null) @@ -387,7 +390,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase * Tests a use case that was reported by some users: Nginx is not properly configured and passes * incorrect PATH_INFO values in $_SERVER. * @link https://github.com/piwik/piwik/issues/6491 - * @group Core */ public function testMisconfiguredNginxPathInfo() { diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php deleted file mode 100644 index 0261a631e2..0000000000 --- a/tests/PHPUnit/config.ini.travis.php +++ /dev/null @@ -1,33 +0,0 @@ -; <?php exit; ?> DO NOT REMOVE THIS LINE -; This configuration is used for automatic integration -; tests on Travis-CI. Do not use this in production. - -[database] -host = 127.0.0.1 -username = root -password = -dbname = piwik_tests -adapter = PDO\MYSQL -; no table prefix for tests on travis -tables_prefix = -;charset = utf8 - -[tests] -request_uri = "/" -port = 3000 - -[database_tests] -host = 127.0.0.1 -username = root -password = -dbname = piwik_tests -adapter = PDO\MYSQL -; no table prefix for tests on travis -tables_prefix = - -[log] -log_writers[] = file -log_level = info - -; leave this empty here -[General] diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots -Subproject 8423a15f21cffe1e0023c364de02ebe10e91a6d +Subproject f52be03f1613724942f6fdc3430abd1743cd6c4 diff --git a/tests/UI/specs/ActionsDataTable_spec.js b/tests/UI/specs/ActionsDataTable_spec.js index 2456e59397..4c149ce0c3 100644 --- a/tests/UI/specs/ActionsDataTable_spec.js +++ b/tests/UI/specs/ActionsDataTable_spec.js @@ -28,6 +28,9 @@ describe("ActionsDataTable", function () { expect.screenshot('subtables_loaded').to.be.capture(function (page) { page.click('tr.subDataTable:first'); page.click('tr.subDataTable:eq(2)'); + page.evaluate(function () { + $('.foldDataTableFooterDrawer').click(); // open the footer icons controls + }); }, done); }); @@ -38,8 +41,7 @@ describe("ActionsDataTable", function () { }, done); }); - // Test is skipped as it randomly fails http://builds-artifacts.piwik.org/ui-tests.master/2433.1/screenshot-diffs/diffviewer.html - it.skip("should exclude low population rows when exclude low population link clicked", function (done) { + it("should exclude low population rows when exclude low population link clicked", function (done) { expect.screenshot('exclude_low_population').to.be.capture(function (page) { page.mouseMove('.tableConfiguration'); page.click('.dataTableExcludeLowPopulation'); @@ -48,10 +50,6 @@ describe("ActionsDataTable", function () { it("should load normal view when switch to view hierarchical view link is clicked", function (done) { expect.screenshot('unflattened').to.be.capture(function (page) { - // exclude low population (copied from exclude_low_population test above as it was 'skipped') - page.mouseMove('.tableConfiguration'); - page.click('.dataTableExcludeLowPopulation'); - page.mouseMove('.tableConfiguration'); page.click('.dataTableFlatten'); }, done); @@ -59,13 +57,13 @@ describe("ActionsDataTable", function () { it("should display pageview percentages when hovering over pageviews column", function (done) { expect.screenshot('pageview_percentages').to.be.capture(function (page) { - page.mouseMove('tr:eq(2) td.column:eq(1)'); + page.mouseMove('tr:contains("thankyou") td.column:eq(1)'); }, done); }); it("should generate a proper title for the visitor log segmented by the current row", function (done) { expect.screenshot('segmented_visitor_log_hover').to.be.capture(function (page) { - var row = 'tr:eq(2) '; + var row = 'tr:contains("thankyou") '; page.mouseMove(row + 'td.column:first'); page.mouseMove(row + 'td.label .actionSegmentVisitorLog'); }, done); @@ -73,7 +71,7 @@ describe("ActionsDataTable", function () { it("should open the visitor log segmented by the current row", function (done) { expect.screenshot('segmented_visitor_log').to.be.capture(function (page) { - page.click('tr:eq(2) td.label .actionSegmentVisitorLog'); + page.click('tr:contains("thankyou") td.label .actionSegmentVisitorLog'); }, done); }); @@ -81,7 +79,7 @@ describe("ActionsDataTable", function () { expect.screenshot('unique_pageview_percentages').to.be.capture(function (page) { page.click('.ui-widget .ui-dialog-titlebar-close'); - page.mouseMove('tr:eq(2) td.column:eq(2)'); + page.mouseMove('tr:contains("thankyou") td.column:eq(2)'); }, done); }); diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js index 9607b126ac..94b85fcc17 100644 --- a/tests/UI/specs/Dashboard_spec.js +++ b/tests/UI/specs/Dashboard_spec.js @@ -200,7 +200,7 @@ describe("Dashboard", function () { }, done); }); - it("should not fail when default widget selection changed", function (done) { + it.skip("should not fail when default widget selection changed", function (done) { expect.screenshot("default_widget_selection_changed").to.be.capture(function (page) { page.load(url); page.click('.dashboard-manager .title'); @@ -209,7 +209,7 @@ describe("Dashboard", function () { }, done); }); - it("should create new dashboard with new default widget selection when create dashboard process completed", function (done) { + it.skip("should create new dashboard with new default widget selection when create dashboard process completed", function (done) { expect.screenshot("create_new").to.be.capture(function (page) { page.click('.dashboard-manager .title'); page.click('li[data-action=createDashboard]'); diff --git a/tests/UI/specs/Installation_spec.js b/tests/UI/specs/Installation_spec.js index 6aca4b0b78..2ee77adfec 100644 --- a/tests/UI/specs/Installation_spec.js +++ b/tests/UI/specs/Installation_spec.js @@ -86,8 +86,19 @@ describe("Installation", function () { }, done); }); + var pageUrl, pageUrlDe; + + it("should show Piwik PRO GmbH when language is German", function (done) { + expect.screenshot("superuser_de").to.be.capture(function (page) { + pageUrl = page.getCurrentUrl(); + pageUrlDe = pageUrl + '&language=de' + page.load(pageUrlDe); + }, done); + }); + it("should fail when incorrect information is entered in the superuser configuration page", function (done) { expect.screenshot("superuser_fail").to.be.capture(function (page) { + page.load(pageUrl); page.click('.btn'); }, done); }); @@ -144,4 +155,4 @@ describe("Installation", function () { page.click('.btn'); }, done); }); -});
\ No newline at end of file +}); diff --git a/tests/UI/specs/PivotByDimension_spec.js b/tests/UI/specs/PivotByDimension_spec.js index 938d298ef5..86a5815d53 100644 --- a/tests/UI/specs/PivotByDimension_spec.js +++ b/tests/UI/specs/PivotByDimension_spec.js @@ -22,6 +22,7 @@ describe("PivotByDimension", function () { page.click('.expandDataTableFooterDrawer'); page.mouseMove('.tableConfiguration'); page.click('.dataTablePivotBySubtable'); + page.mouseMove({x: -15, y: -15}); // make sure nothing is highlighted }, done); }); @@ -35,6 +36,7 @@ describe("PivotByDimension", function () { page.click('.expandDataTableFooterDrawer'); page.mouseMove('.tableConfiguration'); page.click('.dataTablePivotBySubtable'); + page.mouseMove({x: -15, y: -15}); // make sure nothing is highlighted }, done); }); });
\ No newline at end of file diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 0849e5c8a2..c1c43d1366 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -158,6 +158,9 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageUrls"); page.mouseMove('h2[piwik-enriched-headline]'); page.click(".helpIcon"); + page.evaluate(function () { + $('.helpDate:visible').hide(); + }); }, done); }); @@ -489,6 +492,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }, done); }); + it('should load the config file page correctly', function (done) { + expect.screenshot('admin_diagnostics_configfile').to.be.captureSelector('.pageWrap', function (page) { + page.load("?" + generalParams + "&module=Diagnostics&action=configfile"); + }, done); + }); + it('should load the Settings > Visitor Generator admin page correctly', function (done) { expect.screenshot('admin_visitor_generator').to.be.captureSelector('.pageWrap', function (page) { page.load("?" + generalParams + "&module=VisitorGenerator&action=index"); diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js index 279fe010f6..4dc412cad7 100644 --- a/tests/UI/specs/ViewDataTable_spec.js +++ b/tests/UI/specs/ViewDataTable_spec.js @@ -53,7 +53,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should load bar graph when bar graph footer icon clicked", function (done) { expect.screenshot('6_bar_graph').to.be.capture(function (page) { - page.mouseMove('.tableIconsGroup:nth-child(2)'); + page.mouseMove('.tableIconsGroup:nth-child(3)'); page.click('.tableIcon[data-footer-icon-id=graphVerticalBar]'); }, done); }); @@ -67,7 +67,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should load a tag cloud when tag cloud footer icon clicked", function (done) { expect.screenshot('8_tag_cloud').to.be.capture(function (page) { - page.mouseMove('.tableIconsGroup:nth-child(2)'); + page.mouseMove('.tableIconsGroup:nth-child(3)'); page.click('.tableIcon[data-footer-icon-id=cloud]'); }, done); }); @@ -75,6 +75,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f it("should load normal table when normal table footer icon clicked", function (done) { expect.screenshot('9_normal_table').to.be.capture(function (page) { page.click('.tableIcon[data-footer-icon-id=table]'); + page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted }, done); }); diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js index 51ca56ad55..4617112baf 100644 --- a/tests/lib/screenshot-testing/support/app.js +++ b/tests/lib/screenshot-testing/support/app.js @@ -142,7 +142,7 @@ Application.prototype.loadTestModules = function () { // we apply this option only if not a specific plugin or test suite was requested. Only there for travis to // split tests into multiple jobs. var numTestsFirstHalf = Math.round(mocha.suite.suites.length / 2); - numTestsFirstHalf += 5; // run a few more test suits in first half as UiIntegrationTests contain many tests + numTestsFirstHalf += 7; mocha.suite.suites = mocha.suite.suites.filter(function (suite, index) { if (options['run-first-half-only'] && index < numTestsFirstHalf) { return true; diff --git a/tests/resources/Config/global.ini.php b/tests/resources/Config/global.ini.php index 20271ed43d..87e1437453 100644 --- a/tests/resources/Config/global.ini.php +++ b/tests/resources/Config/global.ini.php @@ -3,10 +3,14 @@ key1 = value1 key2 = value2 [CategoryOnlyInGlobalFile] +; test comment key3 = "value3" +; test comment 4 key4 = value4 [TestArray] +; test comment 2 +; with multiple lines installed[] = plugin1 installed[] = plugin4 diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz Binary files differindex 5466a04b88..80f9e7678e 100644 --- a/tests/resources/OmniFixture-dump.sql.gz +++ b/tests/resources/OmniFixture-dump.sql.gz diff --git a/tests/resources/access-logs/fake_logs.log b/tests/resources/access-logs/fake_logs.log index d901280f88..1fe459bda1 100644 --- a/tests/resources/access-logs/fake_logs.log +++ b/tests/resources/access-logs/fake_logs.log @@ -20,9 +20,9 @@ 177.71.128.21 - - [10/Aug/2012:22:21:28 +0200] "GET /intranet-analytics/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86_64; fr-FR) AppleWebKit/534.7 (KHTML, like Gecko) Epiphany/2.30.6 Safari/534.7" 177.71.128.21 - - [10/Aug/2012:22:22:08 +0200] "GET /blog/2012/08/survey-your-opinion-matters/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" 50.112.00.28 - - [11/Aug/2012:15:49:46 +0200] "GET /faq/how-to-install/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86_64; ca-ad) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ Epiphany/2.30.6" -50.112.00.11 - - [11/Aug/2012:17:31:05 +0200] "GET /hosting/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" -50.112.00.11 - - [11/Aug/2012:17:31:56 +0200] "GET /thing.js HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" -50.112.00.11 - - [11/Aug/2012:17:33:01 +0200] "GET /thing.css HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" +50.112.00.11 - commonuser [11/Aug/2012:17:31:05 +0200] "GET /hosting/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" +50.112.00.11 - commonuser [11/Aug/2012:17:31:56 +0200] "GET /thing.js HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" +50.112.00.11 - commonuser [11/Aug/2012:17:33:01 +0200] "GET /thing.css HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6" 175.41.192.41 - - [11/Aug/2012:17:41:30 +0200] "GET /this/is/not/the/page/i/am/looking/for/ HTTP/1.1" 404 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1" 72.44.32.11 - - [11/Aug/2012:17:42:07 +0200] "GET /to-an-error HTTP/1.1" 500 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0" 175.41.192.43 - - [11/Aug/2012:17:43:40 +0200] "GET /moved-permanently HTTP/1.1" 301 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" diff --git a/tests/resources/access-logs/fake_logs_nginx_json.log b/tests/resources/access-logs/fake_logs_nginx_json.log index 4cf39dfbb0..29d183086d 100644 --- a/tests/resources/access-logs/fake_logs_nginx_json.log +++ b/tests/resources/access-logs/fake_logs_nginx_json.log @@ -1 +1,2 @@ -{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file +{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"} +{"ip": "73.77.55.45","host": "piwik.net","path": "/api/f\xFAtbol-user-agent","status": "200","referrer": "-","user_agent": "F\xFAtbol/1.0 (iPhone; iOS 7.1; Scale/2.00)","length": 267,"generation_time_milli": 0.009,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css index f74ae3545f..1e746d1d5d 100644 --- a/tests/resources/screenshot-override/override.css +++ b/tests/resources/screenshot-override/override.css @@ -6,7 +6,7 @@ display:none; } -.visitor-profile-important-visits>div>div>p:first-child>span { +.visitor-profile-important-visits>div>div>p:first-child { display:none; } diff --git a/tests/resources/screenshot-override/override.js b/tests/resources/screenshot-override/override.js index 7113d0d134..054ff13de3 100644 --- a/tests/resources/screenshot-override/override.js +++ b/tests/resources/screenshot-override/override.js @@ -1,3 +1,5 @@ $(document).ready(function () { $('.ui-inline-help:contains(UTC time is)').hide(); + + $('[notification-id=ControllerAdmin_HttpIsUsed]').hide(); });
\ No newline at end of file diff --git a/tests/travis b/tests/travis -Subproject 73a4b16ebb9a5db23bca53115195e8317ce6917 +Subproject 3e80077f810f8ab963be85fb5be032138328201 |