Skip to content
Extraits de code Groupes Projets
Valider 65f63fa1 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

fix some tests

parent cd92455a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 88 ajouts et 15 suppressions
plugins/API/API.php
+ 4
− 2
Voir le fichier @ 65f63fa1
...@@ -553,8 +553,10 @@ class API extends \Piwik\Plugin\API ...@@ -553,8 +553,10 @@ class API extends \Piwik\Plugin\API
{ {
// If you update this, also update flattenVisitorDetailsArray // If you update this, also update flattenVisitorDetailsArray
$segmentsNeedActionsInfo = array('visitConvertedGoalId', $segmentsNeedActionsInfo = array('visitConvertedGoalId',
'pageUrl', 'pageTitle', 'siteSearchKeyword', 'pageUrl', 'pageTitle', 'siteSearchKeyword',
'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl'); 'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl',
'outlinkUrl', 'downloadUrl'
);
$isCustomVariablePage = stripos($segmentName, 'customVariablePage') !== false; $isCustomVariablePage = stripos($segmentName, 'customVariablePage') !== false;
$isEventSegment = stripos($segmentName, 'event') !== false; $isEventSegment = stripos($segmentName, 'event') !== false;
$isContentSegment = stripos($segmentName, 'content') !== false; $isContentSegment = stripos($segmentName, 'content') !== false;
......
plugins/API/SegmentMetadata.php
+ 4
− 0
Voir le fichier @ 65f63fa1
...@@ -19,6 +19,10 @@ class SegmentMetadata ...@@ -19,6 +19,10 @@ class SegmentMetadata
foreach (Dimension::getAllDimensions() as $dimension) { foreach (Dimension::getAllDimensions() as $dimension) {
foreach ($dimension->getSegments() as $segment) { foreach ($dimension->getSegments() as $segment) {
if ($segment->isRequiresAtLeastViewAccess()) {
$segment->setPermission($isAuthenticatedWithViewAccess);
}
$segments[] = $segment->toArray(); $segments[] = $segment->toArray();
} }
} }
......
plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
+ 2
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Settings</category> <category>Visitors</category>
<subcategory>Software</subcategory>
<name>Browser Plugins</name> <name>Browser Plugins</name>
<module>DevicePlugins</module> <module>DevicePlugins</module>
<action>getPlugin</action> <action>getPlugin</action>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserType___API.getMetadata_day.xml
+ 2
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<subcategory>Software</subcategory>
<name>Browser engines</name> <name>Browser engines</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getBrowserEngines</action> <action>getBrowserEngines</action>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowserVersion___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<subcategory>Software</subcategory>
<name>Browser version</name> <name>Browser version</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getBrowserVersions</action> <action>getBrowserVersions</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Browsers</name>
<module>DevicesDetection</module>
<action>getBrowsers</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowserVersions</uniqueId> <uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getBrowser___API.getMetadata_day.xml
+ 10
− 2
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<name>Visitor Browser</name> <subcategory>Software</subcategory>
<name>Browsers</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getBrowsers</action> <action>getBrowsers</action>
<dimension>Browser</dimension> <dimension>Browser</dimension>
...@@ -29,6 +30,13 @@ ...@@ -29,6 +30,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Browser version</name>
<module>DevicesDetection</module>
<action>getBrowserVersions</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowsers</uniqueId> <uniqueId>DevicesDetection_getBrowsers</uniqueId>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml
+ 2
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<subcategory>Devices</subcategory>
<name>Device type</name> <name>Device type</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getType</action> <action>getType</action>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOSFamily___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<subcategory>Software</subcategory>
<name>Operating System families</name> <name>Operating System families</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getOsFamilies</action> <action>getOsFamilies</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Operating System versions</name>
<module>DevicesDetection</module>
<action>getOsVersions</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getOsFamilies</uniqueId> <uniqueId>DevicesDetection_getOsFamilies</uniqueId>
......
plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getOS___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Devices</category> <category>Visitors</category>
<subcategory>Software</subcategory>
<name>Operating System versions</name> <name>Operating System versions</name>
<module>DevicesDetection</module> <module>DevicesDetection</module>
<action>getOsVersions</action> <action>getOsVersions</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Operating System families</name>
<module>DevicesDetection</module>
<action>getOsFamilies</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getOsVersions</uniqueId> <uniqueId>DevicesDetection_getOsVersions</uniqueId>
......
plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
+ 10
− 2
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Settings</category> <category>Visitors</category>
<name>Visitor Configuration</name> <subcategory>Software</subcategory>
<name>Configurations</name>
<module>Resolution</module> <module>Resolution</module>
<action>getConfiguration</action> <action>getConfiguration</action>
<dimension>Configuration</dimension> <dimension>Configuration</dimension>
...@@ -29,6 +30,13 @@ ...@@ -29,6 +30,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Screen Resolution</name>
<module>Resolution</module>
<action>getResolution</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>Resolution_getConfiguration</uniqueId> <uniqueId>Resolution_getConfiguration</uniqueId>
......
plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Settings</category> <category>Visitors</category>
<subcategory>Devices</subcategory>
<name>Screen Resolution</name> <name>Screen Resolution</name>
<module>Resolution</module> <module>Resolution</module>
<action>getResolution</action> <action>getResolution</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Configurations</name>
<module>Resolution</module>
<action>getConfiguration</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>Resolution_getResolution</uniqueId> <uniqueId>Resolution_getResolution</uniqueId>
......
plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Settings</category> <category>Visitors</category>
<subcategory>Locations</subcategory>
<name>Language code</name> <name>Language code</name>
<module>UserLanguage</module> <module>UserLanguage</module>
<action>getLanguageCode</action> <action>getLanguageCode</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Browser language</name>
<module>UserLanguage</module>
<action>getLanguage</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>UserLanguage_getLanguageCode</uniqueId> <uniqueId>UserLanguage_getLanguageCode</uniqueId>
......
plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
+ 9
− 1
Voir le fichier @ 65f63fa1
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<row> <row>
<category>Visitor Settings</category> <category>Visitors</category>
<subcategory>Locations</subcategory>
<name>Browser language</name> <name>Browser language</name>
<module>UserLanguage</module> <module>UserLanguage</module>
<action>getLanguage</action> <action>getLanguage</action>
...@@ -28,6 +29,13 @@ ...@@ -28,6 +29,13 @@
<bounce_rate>Bounce Rate</bounce_rate> <bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate> <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics> </processedMetrics>
<relatedReports>
<row>
<name>Language code</name>
<module>UserLanguage</module>
<action>getLanguageCode</action>
</row>
</relatedReports>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2010-03-06</imageGraphUrl> <imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2010-03-06</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2010-02-05,2010-03-06</imageGraphEvolutionUrl>
<uniqueId>UserLanguage_getLanguage</uniqueId> <uniqueId>UserLanguage_getLanguage</uniqueId>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter