Skip to content
Extraits de code Groupes Projets
Valider b14defe2 rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Fixing test failures from merge.

parent dd0212db
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 57 ajouts et 57 suppressions
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+ 25
− 25
Voir le fichier @ b14defe2
......@@ -1832,11 +1832,10 @@
</row>
<row>
<category>Visitor Devices</category>
<name>Visitor Browser</name>
<name>Device brand</name>
<module>DevicesDetection</module>
<action>getBrowsers</action>
<dimension>Browser</dimension>
<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
<action>getBrand</action>
<dimension>Device brand</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
......@@ -1855,16 +1854,17 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowsers</uniqueId>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrand</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
<name>Device brand</name>
<name>Visitor Browser</name>
<module>DevicesDetection</module>
<action>getBrand</action>
<dimension>Device brand</dimension>
<action>getBrowsers</action>
<dimension>Browser</dimension>
<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
......@@ -1883,16 +1883,16 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrand</uniqueId>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowsers</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
<name>Device model</name>
<name>Browser Version</name>
<module>DevicesDetection</module>
<action>getModel</action>
<dimension>Device model</dimension>
<action>getBrowserVersions</action>
<dimension>Browser version</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
......@@ -1911,16 +1911,16 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getModel</uniqueId>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
<name>Browser Version</name>
<name>Device model</name>
<module>DevicesDetection</module>
<action>getBrowserVersions</action>
<dimension>Browser version</dimension>
<action>getModel</action>
<dimension>Device model</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
......@@ -1939,9 +1939,9 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getModel</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
......
tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
+0 o (+0%)
Voir le fichier @ b14defe2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+ 5
− 5
Voir le fichier @ b14defe2
......@@ -474,15 +474,11 @@ Device type
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Desktop,5,16,80%,3.2,00:22:49,20%
Device brand
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,5,16,80%,3.2,00:22:49,20%
Visitor Browser
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Firefox,5,16,80%,3.2,00:22:49,20%
Device model
Device brand
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,5,16,80%,3.2,00:22:49,20%
......@@ -490,6 +486,10 @@ Browser Version
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Firefox 3.6,5,16,80%,3.2,00:22:49,20%
Device model
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,5,16,80%,3.2,00:22:49,20%
Operating System families
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Windows,5,16,80%,3.2,00:22:49,20%
......
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+ 27
− 27
Voir le fichier @ b14defe2
......@@ -338,11 +338,6 @@
<a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(68,68,68);">
Device type
</a>
</li>
<li>
<a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);">
Device brand
</a>
</li>
<li>
<a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
......@@ -350,14 +345,19 @@
</a>
</li>
<li>
<a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
Device model
<a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);">
Device brand
</a>
</li>
<li>
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
Browser Version
</a>
</li>
<li>
<a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
Device model
</a>
</li>
<li>
<a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
......@@ -6257,8 +6257,8 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;">
Device brand
<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
Visitor Browser
</h2>
 
......@@ -6266,7 +6266,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
&nbsp;Device brand&nbsp;&nbsp;
&nbsp;Browser&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Visits&nbsp;&nbsp;
......@@ -6291,9 +6291,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
<img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
<img src='plugins/UserSettings/images/browsers/FF.gif'>
&nbsp;
Unknown </td>
Firefox </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
5
</td>
......@@ -6319,8 +6319,8 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
Visitor Browser
<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;">
Device brand
</h2>
 
......@@ -6328,7 +6328,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
&nbsp;Browser&nbsp;&nbsp;
&nbsp;Device brand&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Visits&nbsp;&nbsp;
......@@ -6353,9 +6353,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
<img src='plugins/UserSettings/images/browsers/FF.gif'>
<img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
&nbsp;
Firefox </td>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
5
</td>
......@@ -6381,8 +6381,8 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
Device model
<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Version
</h2>
 
......@@ -6390,7 +6390,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
&nbsp;Device model&nbsp;&nbsp;
&nbsp;Browser version&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Visits&nbsp;&nbsp;
......@@ -6415,7 +6415,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
Unknown </td>
<img src='plugins/UserSettings/images/browsers/FF.gif'>
&nbsp;
Firefox 3.6 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
5
</td>
......@@ -6441,8 +6443,8 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Version
<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
Device model
</h2>
 
......@@ -6450,7 +6452,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
<th style="padding: 6px 0;">
&nbsp;Browser version&nbsp;&nbsp;
&nbsp;Device model&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Visits&nbsp;&nbsp;
......@@ -6475,9 +6477,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
<img src='plugins/UserSettings/images/browsers/FF.gif'>
&nbsp;
Firefox 3.6 </td>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
5
</td>
......
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