diff options
author | sgiehl <stefan@piwik.org> | 2014-10-11 15:06:39 +0400 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-10-11 15:06:39 +0400 |
commit | 3b53f3865d7ca947bc71eb44fc72becd7dd0ac90 (patch) | |
tree | f80bc9a41e720b57020b3a77c1493b1dab7e5c0b /plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml | |
parent | 7c2325fed09d51cad6f15c65562b76bf64602eac (diff) | |
parent | 794c67f511ebc6745fe592548f6df01f3e1f1179 (diff) |
Merge branch 'master' into deprecate_usersettings
Conflicts:
core/Version.php
plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml
tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml
tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml
tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml
tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml
Diffstat (limited to 'plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml')
-rw-r--r-- | plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml | 199 |
1 files changed, 199 insertions, 0 deletions
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..857c554b17 --- /dev/null +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file |