Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/plugins/Live/tests
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-04-24 04:26:39 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2018-04-24 04:26:39 +0300
commit34c4a857126cd936ff1e9b1a4fb590306be1c879 (patch)
tree65dece270b9cbc891953f6cdc89824d825c1ca54 /plugins/Live/tests
parent718eb0e315e4d47c6a72185be6e8d097b1df4765 (diff)
GDPR + Add a couple of new platform features especially around validating settings (#12558)
* add a couple of new platform features especially around validating settings * more validators and other tweaks * few tweaks * allow plugins to add header script in JS tests * some work on gdpr * remove email feature * menu update * add date tooltip * make sure privacy has its own icon * added some text * add opt out info * better titles * add some information about webserver logs * add log import notice * give angular some time to render * show border around iframe * make sure to place a notification in modal dialog if needed * when opening a modal, make sure the top part is visible * disable newsletter sign up by default * command line tool to anonymize and remove previously tracked raw data * implement some basic consent features into piwik.js * minor tweak * schedule entries to anonymize data in past * let users anonymize historical data * better overview * better naming * explain consent tracking * add legitimate interest * new menu structure for privacy * use a proper db table for scheduled anonymizations * add some tracker tests * some tests and fixes * couple of fixes and tests * starting to add some UI tests * more tweaks * add missing file * fix jslint * have the field full width * more tweaks * create directory if needed * various fixes * fix some tests * make sure keys will be always returned in same order * more fixes * fix some tests * apply feedback from review * fix some tests * this might fix mysqli tests * fix some tests * trying to fix mysqli tests * fix system test * fix comment * remove some duplicated code * update method name * trigger event when logs need to be deleted * add possibility to anonymize userId and orderId * trigger event in tracking code page * expire consent in hours * post another event * update wording for privacy GDPR * fix various ui tests * fix some tests * trying to fix ui tests * trigger another test run * fix system test * fix some ui tests * show a table of contents on tracking code page, fix title, add mobile apps and API * fix ui test * 3.5.0-b2 update * Re-generate piwik.js * fix job status and selector style * make sure to include only sites with admin access * some tweaks * fix some ui tests * fix some ui tests * fix test
Diffstat (limited to 'plugins/Live/tests')
-rw-r--r--plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php19
-rw-r--r--plugins/Live/tests/System/ApiTest.php20
-rw-r--r--plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml74
-rw-r--r--plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml235
-rw-r--r--plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml144
-rw-r--r--plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml235
6 files changed, 632 insertions, 95 deletions
diff --git a/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php b/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
index 0c8428cf67..b08eee5297 100644
--- a/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
+++ b/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
@@ -17,10 +17,15 @@ class ManyVisitsOfSameVisitor extends Fixture
{
public $dateTime = '2010-02-01 11:22:33';
public $idSite = 1;
+ public $idSite2 = 2;
public function setUp()
{
- if (!self::siteCreated($idSite = 1)) {
+ if (!self::siteCreated($this->idSite)) {
+ self::createWebsite($this->dateTime);
+ }
+
+ if (!self::siteCreated($this->idSite2)) {
self::createWebsite($this->dateTime);
}
@@ -34,6 +39,18 @@ class ManyVisitsOfSameVisitor extends Fixture
private function trackVisits()
{
+ $t = self::getTracker($this->idSite2, $this->dateTime, $defaultInit = true);
+ $t->setTokenAuth(self::getTokenAuth());
+ $t->setForceNewVisit();
+ $t->setUserId(101);
+ $t->setUrl('http://example.org/foo/dir/page');
+
+ $visitDateTime = Date::factory($this->dateTime)->getDatetime();
+ $t->setForceVisitDateTime($visitDateTime);
+
+ self::checkResponse($t->doTrackPageView('incredible title'));
+
+
$t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true);
$t->setTokenAuth(self::getTokenAuth());
$t->enableBulkTracking();
diff --git a/plugins/Live/tests/System/ApiTest.php b/plugins/Live/tests/System/ApiTest.php
index 52185f119f..18780fc033 100644
--- a/plugins/Live/tests/System/ApiTest.php
+++ b/plugins/Live/tests/System/ApiTest.php
@@ -57,6 +57,26 @@ class ApiTest extends SystemTestCase
)
);
+ $apiToTest[] = array(array('Live.getLastVisitsDetails'),
+ array(
+ 'idSite' => 'all',
+ 'date' => self::$fixture->dateTime,
+ 'periods' => array('day'),
+ 'otherRequestParameters' => array('limitVisits' => 20),
+ 'testSuffix' => 'allSites'
+ )
+ );
+
+ $apiToTest[] = array(array('Live.getLastVisitsDetails'),
+ array(
+ 'idSite' => '1,2',
+ 'date' => self::$fixture->dateTime,
+ 'periods' => array('day'),
+ 'otherRequestParameters' => array('limitVisits' => 40),
+ 'testSuffix' => 'multiSites'
+ )
+ );
+
return $apiToTest;
}
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index b65956d80a..db1d555f50 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -21,7 +21,7 @@
<lastVisits>
<row>
<idSite>1</idSite>
- <idVisit>31</idVisit>
+ <idVisit>32</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -29,10 +29,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>31</pageId>
+ <pageId>32</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -47,6 +47,7 @@
+ <siteName>Piwik test</siteName>
@@ -136,7 +137,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>30</idVisit>
+ <idVisit>31</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -144,10 +145,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>30</pageId>
+ <pageId>31</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -162,6 +163,7 @@
+ <siteName>Piwik test</siteName>
@@ -251,7 +253,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>29</idVisit>
+ <idVisit>30</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -259,10 +261,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>29</pageId>
+ <pageId>30</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -277,6 +279,7 @@
+ <siteName>Piwik test</siteName>
@@ -366,7 +369,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>28</idVisit>
+ <idVisit>29</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -374,10 +377,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>28</pageId>
+ <pageId>29</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -392,6 +395,7 @@
+ <siteName>Piwik test</siteName>
@@ -481,7 +485,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>27</idVisit>
+ <idVisit>28</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -489,10 +493,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>27</pageId>
+ <pageId>28</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -507,6 +511,7 @@
+ <siteName>Piwik test</siteName>
@@ -596,7 +601,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>26</idVisit>
+ <idVisit>27</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -604,10 +609,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>26</pageId>
+ <pageId>27</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -622,6 +627,7 @@
+ <siteName>Piwik test</siteName>
@@ -711,7 +717,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>25</idVisit>
+ <idVisit>26</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -719,10 +725,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>26</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -737,6 +743,7 @@
+ <siteName>Piwik test</siteName>
@@ -826,7 +833,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>24</idVisit>
+ <idVisit>25</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -834,10 +841,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>24</pageId>
+ <pageId>25</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -852,6 +859,7 @@
+ <siteName>Piwik test</siteName>
@@ -941,7 +949,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>23</idVisit>
+ <idVisit>24</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -949,10 +957,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>23</pageId>
+ <pageId>24</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -967,6 +975,7 @@
+ <siteName>Piwik test</siteName>
@@ -1056,7 +1065,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>22</idVisit>
+ <idVisit>23</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1064,10 +1073,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>22</pageId>
+ <pageId>23</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1082,6 +1091,7 @@
+ <siteName>Piwik test</siteName>
@@ -1193,7 +1203,7 @@
<visitsAggregated>10</visitsAggregated>
<visitedPages>
<row>
- <url>http://example.org/my/dir/page0</url>
+ <url>http://example.org/my/dir/page2</url>
<count>8</count>
</row>
<row>
@@ -1201,7 +1211,7 @@
<count>8</count>
</row>
<row>
- <url>http://example.org/my/dir/page2</url>
+ <url>http://example.org/my/dir/page0</url>
<count>8</count>
</row>
<row>
diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..5be7c380ab
--- /dev/null
+++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>2</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://example.org/foo/dir/page</url>
+ <pageTitle>incredible title</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+
+ <pageId>1</pageId>
+ <bandwidth />
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <bandwidth_pretty>0 M</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <siteName>Piwik test</siteName>
+
+
+
+
+
+
+ <userId>101</userId>
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <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>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode>fr</languageCode>
+ <language>French</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>1024x768</resolution>
+ <plugins>cookie, flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://example.org/my/dir/page0</url>
+ <pageTitle>incredible title 0</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+
+ <pageId>2</pageId>
+ <bandwidth />
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <bandwidth_pretty>0 M</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <siteName>Piwik test</siteName>
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <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>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode>fr</languageCode>
+ <language>French</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>1024x768</resolution>
+ <plugins>cookie, flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ </row>
+</result> \ No newline at end of file
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index 09df3a8344..6f96bd0c03 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -21,7 +21,7 @@
<lastVisits>
<row>
<idSite>1</idSite>
- <idVisit>31</idVisit>
+ <idVisit>32</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -29,10 +29,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>31</pageId>
+ <pageId>32</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -47,6 +47,7 @@
+ <siteName>Piwik test</siteName>
@@ -136,7 +137,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>30</idVisit>
+ <idVisit>31</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -144,10 +145,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>30</pageId>
+ <pageId>31</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -162,6 +163,7 @@
+ <siteName>Piwik test</siteName>
@@ -251,7 +253,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>29</idVisit>
+ <idVisit>30</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -259,10 +261,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>29</pageId>
+ <pageId>30</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -277,6 +279,7 @@
+ <siteName>Piwik test</siteName>
@@ -366,7 +369,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>28</idVisit>
+ <idVisit>29</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -374,10 +377,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>28</pageId>
+ <pageId>29</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -392,6 +395,7 @@
+ <siteName>Piwik test</siteName>
@@ -481,7 +485,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>27</idVisit>
+ <idVisit>28</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -489,10 +493,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>27</pageId>
+ <pageId>28</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -507,6 +511,7 @@
+ <siteName>Piwik test</siteName>
@@ -596,7 +601,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>26</idVisit>
+ <idVisit>27</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -604,10 +609,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>26</pageId>
+ <pageId>27</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -622,6 +627,7 @@
+ <siteName>Piwik test</siteName>
@@ -711,7 +717,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>25</idVisit>
+ <idVisit>26</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -719,10 +725,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>26</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -737,6 +743,7 @@
+ <siteName>Piwik test</siteName>
@@ -826,7 +833,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>24</idVisit>
+ <idVisit>25</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -834,10 +841,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>24</pageId>
+ <pageId>25</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -852,6 +859,7 @@
+ <siteName>Piwik test</siteName>
@@ -941,7 +949,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>23</idVisit>
+ <idVisit>24</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -949,10 +957,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>23</pageId>
+ <pageId>24</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -967,6 +975,7 @@
+ <siteName>Piwik test</siteName>
@@ -1056,7 +1065,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>22</idVisit>
+ <idVisit>23</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1064,10 +1073,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>22</pageId>
+ <pageId>23</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1082,6 +1091,7 @@
+ <siteName>Piwik test</siteName>
@@ -1171,7 +1181,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>21</idVisit>
+ <idVisit>22</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1179,10 +1189,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>21</pageId>
+ <pageId>22</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1197,6 +1207,7 @@
+ <siteName>Piwik test</siteName>
@@ -1286,7 +1297,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>20</idVisit>
+ <idVisit>21</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1294,10 +1305,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>20</pageId>
+ <pageId>21</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1312,6 +1323,7 @@
+ <siteName>Piwik test</siteName>
@@ -1401,7 +1413,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>19</idVisit>
+ <idVisit>20</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1409,10 +1421,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>19</pageId>
+ <pageId>20</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1427,6 +1439,7 @@
+ <siteName>Piwik test</siteName>
@@ -1516,7 +1529,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>18</idVisit>
+ <idVisit>19</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1524,10 +1537,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>18</pageId>
+ <pageId>19</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1542,6 +1555,7 @@
+ <siteName>Piwik test</siteName>
@@ -1631,7 +1645,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>17</idVisit>
+ <idVisit>18</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1639,10 +1653,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>17</pageId>
+ <pageId>18</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1657,6 +1671,7 @@
+ <siteName>Piwik test</siteName>
@@ -1746,7 +1761,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>16</idVisit>
+ <idVisit>17</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1754,10 +1769,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>16</pageId>
+ <pageId>17</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1772,6 +1787,7 @@
+ <siteName>Piwik test</siteName>
@@ -1861,7 +1877,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>15</idVisit>
+ <idVisit>16</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1869,10 +1885,10 @@
<type>action</type>
<url>http://example.org/my/dir/page2</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>15</pageId>
+ <pageId>16</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -1887,6 +1903,7 @@
+ <siteName>Piwik test</siteName>
@@ -1976,7 +1993,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>14</idVisit>
+ <idVisit>15</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -1984,10 +2001,10 @@
<type>action</type>
<url>http://example.org/my/dir/page1</url>
<pageTitle>incredible title 1</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <pageIdAction>6</pageIdAction>
- <pageId>14</pageId>
+ <pageId>15</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -2002,6 +2019,7 @@
+ <siteName>Piwik test</siteName>
@@ -2091,7 +2109,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>13</idVisit>
+ <idVisit>14</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -2099,10 +2117,10 @@
<type>action</type>
<url>http://example.org/my/dir/page0</url>
<pageTitle>incredible title 0</pageTitle>
- <pageIdAction>2</pageIdAction>
+ <pageIdAction>4</pageIdAction>
- <pageId>13</pageId>
+ <pageId>14</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -2117,6 +2135,7 @@
+ <siteName>Piwik test</siteName>
@@ -2206,7 +2225,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>12</idVisit>
+ <idVisit>13</idVisit>
<visitIp>156.5.3.2</visitIp>
<actionDetails>
@@ -2214,10 +2233,10 @@
<type>action</type>
<url>http://example.org/my/dir/page3</url>
<pageTitle>incredible title 2</pageTitle>
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>12</pageId>
+ <pageId>13</pageId>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon />
@@ -2232,6 +2251,7 @@
+ <siteName>Piwik test</siteName>
@@ -2343,7 +2363,7 @@
<visitsAggregated>20</visitsAggregated>
<visitedPages>
<row>
- <url>http://example.org/my/dir/page0</url>
+ <url>http://example.org/my/dir/page2</url>
<count>8</count>
</row>
<row>
@@ -2351,7 +2371,7 @@
<count>8</count>
</row>
<row>
- <url>http://example.org/my/dir/page2</url>
+ <url>http://example.org/my/dir/page0</url>
<count>8</count>
</row>
<row>
diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..5be7c380ab
--- /dev/null
+++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>2</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://example.org/foo/dir/page</url>
+ <pageTitle>incredible title</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+
+ <pageId>1</pageId>
+ <bandwidth />
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <bandwidth_pretty>0 M</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <siteName>Piwik test</siteName>
+
+
+
+
+
+
+ <userId>101</userId>
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <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>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode>fr</languageCode>
+ <language>French</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>1024x768</resolution>
+ <plugins>cookie, flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://example.org/my/dir/page0</url>
+ <pageTitle>incredible title 0</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+
+ <pageId>2</pageId>
+ <bandwidth />
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <bandwidth_pretty>0 M</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <siteName>Piwik test</siteName>
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <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>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode>fr</languageCode>
+ <language>French</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>1024x768</resolution>
+ <plugins>cookie, flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+ </row>
+</result> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 17:25:02 +0300