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

Fixing most system tests.

parent 5fa73701
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 16 ajouts et 67 suppressions
core/Plugin/Report.php
+ 3
− 2
Voir le fichier @ f8f9562c
......@@ -368,7 +368,8 @@ class Report
*
* This method should be used in **Plugin.get** API methods.
*
* @param string[]|null $allMetrics The list of all available metrics. Defaults to this report's metrics.
* @param string[]|null $allMetrics The list of all available unprocessed metrics. Defaults to this report's
* metrics.
* @param string[]|null $restrictToColumns The requested columns.
* @return string[]
*/
......@@ -379,7 +380,7 @@ class Report
}
if (empty($restrictToColumns)) {
$restrictToColumns = $this->getAllMetrics();
$restrictToColumns = array_merge($allMetrics, array_keys($this->getProcessedMetrics()));
}
$processedMetricsById = $this->getProcessedMetricsById();
......
plugins/API/API.php
+ 4
− 0
Voir le fichier @ f8f9562c
......@@ -403,6 +403,10 @@ class API extends \Piwik\Plugin\API
$params['columns'] = implode(',', $columns);
$dataTable = Proxy::getInstance()->call($className, 'get', $params);
$dataTable->filter(function (DataTable $table) {
$table->clearQueuedFilters();
});
// merge reports
if ($mergedDataTable === false) {
$mergedDataTable = $dataTable;
......
plugins/VisitFrequency/Reports/Get.php
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -31,10 +31,7 @@ class Get extends \Piwik\Plugin\Report
'nb_visits_returning',
'nb_actions_returning',
'nb_uniq_visitors_returning',
'sum_visit_length_returning',
'nb_users_returning',
'nb_visits_converted_returning',
'sum_visit_length_returning',
'max_actions_returning'
);
$this->order = 40;
......
tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+ 7
− 1
Voir le fichier @ f8f9562c
......@@ -62,7 +62,13 @@ class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
$singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
$periods = array('day', 'week', 'month', 'year');
return array(
array('Goals.get', array('idSite' => 'all',
'date' => $dateTime,
'periods' => array('day'),
'setDateLastN' => false,
'testSuffix' => '_NotLastNPeriods'))
);
$result = array(
// Request data for the last 6 periods and idSite=all
array($apiToCall, array('idSite' => 'all',
......
tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt supprimé 100644 → 0
+ 0
− 11
Voir le fichier @ 5fa73701
-------------------------------------------------------
Using this 'archive.php' script is no longer recommended.
Please use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead.
To get help use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help'
See also: http://piwik.org/docs/setup-auto-archiving/
If you cannot use the console because it requires CLI
try 'php archive.php -- url=http://your.piwik/path'
-------------------------------------------------------
tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>9</nb_visits>
<nb_actions>9</nb_actions>
<nb_visits_converted>9</nb_visits_converted>
<bounce_count>9</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>
......
tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+ 0
− 6
Voir le fichier @ f8f9562c
......@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
<nb_visits_converted>25</nb_visits_converted>
<bounce_count>25</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
......@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<nb_visits_converted>0</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>
......
tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
+ 1
− 4
Voir le fichier @ f8f9562c
......@@ -2,12 +2,9 @@
<results>
<result date="2010-03">
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_users>0</nb_users>
<nb_actions>12</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>2</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
+ 1
− 4
Voir le fichier @ f8f9562c
......@@ -2,12 +2,9 @@
<results>
<result date="2010-01">
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_users>0</nb_users>
<nb_actions>18</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>2</sum_visit_length>
<max_actions>12</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>9</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
<nb_visits_converted>18</nb_visits_converted>
<bounce_count>18</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>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>27</nb_visits>
<nb_actions>47</nb_actions>
<nb_visits_converted>27</nb_visits_converted>
<bounce_count>14</bounce_count>
<sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<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>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>27</nb_visits>
<nb_actions>47</nb_actions>
<nb_visits_converted>27</nb_visits_converted>
<bounce_count>14</bounce_count>
<sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>10</nb_visits>
<nb_actions>18</nb_actions>
<nb_visits_converted>10</nb_visits_converted>
<bounce_count>5</bounce_count>
<sum_visit_length>6305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>20</nb_visits>
<nb_actions>36</nb_actions>
<nb_visits_converted>20</nb_visits_converted>
<bounce_count>10</bounce_count>
<sum_visit_length>12610</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>10</nb_visits>
<nb_actions>18</nb_actions>
<nb_visits_converted>10</nb_visits_converted>
<bounce_count>5</bounce_count>
<sum_visit_length>6305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
......
tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
+ 0
− 3
Voir le fichier @ f8f9562c
......@@ -2,9 +2,6 @@
<result>
<nb_visits>30</nb_visits>
<nb_actions>50</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>17</bounce_count>
<sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>57%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
......
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