diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-01-12 12:16:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 12:16:50 +0300 |
| commit | a38a4cfc4389a039f3aa4d3a35f01e0123ad836d (patch) | |
| tree | f6028f42c04296f44b556dc0ffe3ffcad127d23b | |
| parent | 57b8ce837f85e9990d85bf391963acec81378a22 (diff) | |
Fix system tests (#12432)
* System tests Matomo
* New API.getMatomoVersion
* Custom Dimensions submodule
* Matomo
* Integration tests
* Rename file Matomo
13 files changed, 113 insertions, 111 deletions
diff --git a/misc/How to install Piwik.html b/misc/How to install Matomo.html index 52a043927d..52a043927d 100644 --- a/misc/How to install Piwik.html +++ b/misc/How to install Matomo.html diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject baa5d8e2e7fa7f600861a9e01e5f10b8c2997ce +Subproject 6b8ed5dfb3187bbd397ce3afb9021f23b389cf4 diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index b271da4a4a..1ca27704f6 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -1,8 +1,8 @@ ------------------------------------------------------- Using this 'archive.php' script is no longer recommended. -Please use '/path/to/php /home/travis/build/matomo-org/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/matomo-org/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help' +Please use '/path/to/php /home/travis/build/matomo-org/matomo/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/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --help' See also: https://matomo.org/docs/setup-auto-archiving/ If you cannot use the console because it requires CLI @@ -10,96 +10,96 @@ try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2018-01-09 22:42:32] --------------------------- -INFO [2018-01-09 22:42:32] INIT -INFO [2018-01-09 22:42:32] Running Matomo 3.3.0-b1 as Super User -INFO [2018-01-09 22:42:32] --------------------------- -INFO [2018-01-09 22:42:32] NOTES -INFO [2018-01-09 22:42:32] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings. -INFO [2018-01-09 22:42:32] See the doc at: https://matomo.org/docs/setup-auto-archiving/ -INFO [2018-01-09 22:42:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings. -INFO [2018-01-09 22:42:32] - Reports for the current week/month/year will be requested at most every 3600 seconds. -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-19 for following websites ids: 1 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2018-01-09 22:42:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3 -INFO [2018-01-09 22:42:33] --------------------------- -INFO [2018-01-09 22:42:33] START -INFO [2018-01-09 22:42:33] Starting Matomo reports archiving... -INFO [2018-01-09 22:42:33] Old report was invalidated for website id 1 -INFO [2018-01-09 22:42:33] Will pre-process for website id = 1, period = day, date = last52 -INFO [2018-01-09 22:42:33] - pre-processing all visits -INFO [2018-01-09 22:42:35] - pre-processing segment 1/3 browserCode==IE -INFO [2018-01-09 22:42:35] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:42:35] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:42:40] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 7.147s -INFO [2018-01-09 22:42:40] Will pre-process for website id = 1, period = week, date = last260 -INFO [2018-01-09 22:42:40] - pre-processing all visits -INFO [2018-01-09 22:42:40] - pre-processing segment 1/3 browserCode==IE -INFO [2018-01-09 22:42:40] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:44:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:45:02] Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 142.765s -INFO [2018-01-09 22:45:02] Will pre-process for website id = 1, period = month, date = last52 -INFO [2018-01-09 22:45:02] - pre-processing all visits -INFO [2018-01-09 22:45:03] - pre-processing segment 1/3 browserCode==IE -INFO [2018-01-09 22:45:03] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:45:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:45:20] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.817s -INFO [2018-01-09 22:45:20] Will pre-process for website id = 1, period = year, date = last7 -INFO [2018-01-09 22:45:20] - pre-processing all visits -INFO [2018-01-09 22:45:20] - pre-processing segment 1/3 browserCode==IE -INFO [2018-01-09 22:45:20] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:45:41] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2018-01-09 22:45:51] Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 30.356s -INFO [2018-01-09 22:45:51] Archived website id = 1, 16 API requests, Time elapsed: 198.094s [1/3 done] -INFO [2018-01-09 22:45:51] Old report was invalidated for website id 2 -INFO [2018-01-09 22:45:51] Will pre-process for website id = 2, period = day, date = last52 -INFO [2018-01-09 22:45:51] - pre-processing all visits -INFO [2018-01-09 22:45:53] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.067s -INFO [2018-01-09 22:45:53] Will pre-process for website id = 2, period = week, date = last260 -INFO [2018-01-09 22:45:53] - pre-processing all visits -INFO [2018-01-09 22:46:28] Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 34.977s -INFO [2018-01-09 22:46:28] Will pre-process for website id = 2, period = month, date = last52 -INFO [2018-01-09 22:46:28] - pre-processing all visits -INFO [2018-01-09 22:46:32] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.380s -INFO [2018-01-09 22:46:32] Will pre-process for website id = 2, period = year, date = last7 -INFO [2018-01-09 22:46:32] - pre-processing all visits -INFO [2018-01-09 22:46:37] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 5.078s -INFO [2018-01-09 22:46:37] Archived website id = 2, 4 API requests, Time elapsed: 46.506s [2/3 done] -INFO [2018-01-09 22:46:37] Old report was invalidated for website id 3 -INFO [2018-01-09 22:46:37] Will pre-process for website id = 3, period = day, date = last52 -INFO [2018-01-09 22:46:37] - pre-processing all visits -INFO [2018-01-09 22:46:39] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.056s -INFO [2018-01-09 22:46:39] Will pre-process for website id = 3, period = week, date = last260 -INFO [2018-01-09 22:46:39] - pre-processing all visits -INFO [2018-01-09 22:47:15] Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.840s -INFO [2018-01-09 22:47:15] Will pre-process for website id = 3, period = month, date = last52 -INFO [2018-01-09 22:47:15] - pre-processing all visits -INFO [2018-01-09 22:47:20] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.767s -INFO [2018-01-09 22:47:20] Will pre-process for website id = 3, period = year, date = last7 -INFO [2018-01-09 22:47:20] - pre-processing all visits -INFO [2018-01-09 22:47:26] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 6.206s -INFO [2018-01-09 22:47:26] Archived website id = 3, 4 API requests, Time elapsed: 48.873s [3/3 done] -INFO [2018-01-09 22:47:26] Done archiving! -INFO [2018-01-09 22:47:26] --------------------------- -INFO [2018-01-09 22:47:26] SUMMARY -INFO [2018-01-09 22:47:26] Total visits for today across archived websites: 0 -INFO [2018-01-09 22:47:26] Archived today's reports for 3 websites -INFO [2018-01-09 22:47:26] Archived week/month/year for 3 websites -INFO [2018-01-09 22:47:26] Skipped 0 websites -INFO [2018-01-09 22:47:26] - 0 skipped because no new visit since the last script execution -INFO [2018-01-09 22:47:26] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2018-01-09 22:47:26] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2018-01-09 22:47:26] Total API requests: 24 -INFO [2018-01-09 22:47:26] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 293679 ms, no error -INFO [2018-01-09 22:47:26] Time elapsed: 293.679s -INFO [2018-01-09 22:47:26] --------------------------- -INFO [2018-01-09 22:47:26] SCHEDULED TASKS -INFO [2018-01-09 22:47:26] Starting Scheduled tasks... -INFO [2018-01-09 22:47:26] done -INFO [2018-01-09 22:47:26] ---------------------------
\ No newline at end of file +INFO [2018-01-11 20:48:41] --------------------------- +INFO [2018-01-11 20:48:41] INIT +INFO [2018-01-11 20:48:41] Running Matomo 3.3.0-b2 as Super User +INFO [2018-01-11 20:48:41] --------------------------- +INFO [2018-01-11 20:48:41] NOTES +INFO [2018-01-11 20:48:41] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings. +INFO [2018-01-11 20:48:41] See the doc at: https://matomo.org/docs/setup-auto-archiving/ +INFO [2018-01-11 20:48:41] - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings. +INFO [2018-01-11 20:48:41] - Reports for the current week/month/year will be requested at most every 3600 seconds. +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-19 for following websites ids: 1 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2018-01-11 20:48:41] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3 +INFO [2018-01-11 20:48:41] --------------------------- +INFO [2018-01-11 20:48:41] START +INFO [2018-01-11 20:48:41] Starting Matomo reports archiving... +INFO [2018-01-11 20:48:41] Old report was invalidated for website id 1 +INFO [2018-01-11 20:48:41] Will pre-process for website id = 1, period = day, date = last52 +INFO [2018-01-11 20:48:41] - pre-processing all visits +INFO [2018-01-11 20:48:43] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-11 20:48:43] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:48:43] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:48:48] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.766s +INFO [2018-01-11 20:48:48] Will pre-process for website id = 1, period = week, date = last260 +INFO [2018-01-11 20:48:48] - pre-processing all visits +INFO [2018-01-11 20:48:48] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-11 20:48:48] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:50:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:51:01] Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 133.508s +INFO [2018-01-11 20:51:01] Will pre-process for website id = 1, period = month, date = last52 +INFO [2018-01-11 20:51:01] - pre-processing all visits +INFO [2018-01-11 20:51:01] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-11 20:51:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:51:12] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:51:18] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 16.400s +INFO [2018-01-11 20:51:18] Will pre-process for website id = 1, period = year, date = last7 +INFO [2018-01-11 20:51:18] - pre-processing all visits +INFO [2018-01-11 20:51:18] - pre-processing segment 1/3 browserCode==IE +INFO [2018-01-11 20:51:18] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:51:36] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2018-01-11 20:51:46] Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 28.268s +INFO [2018-01-11 20:51:46] Archived website id = 1, 16 API requests, Time elapsed: 184.958s [1/3 done] +INFO [2018-01-11 20:51:46] Old report was invalidated for website id 2 +INFO [2018-01-11 20:51:46] Will pre-process for website id = 2, period = day, date = last52 +INFO [2018-01-11 20:51:46] - pre-processing all visits +INFO [2018-01-11 20:51:48] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.040s +INFO [2018-01-11 20:51:48] Will pre-process for website id = 2, period = week, date = last260 +INFO [2018-01-11 20:51:48] - pre-processing all visits +INFO [2018-01-11 20:52:23] Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.094s +INFO [2018-01-11 20:52:23] Will pre-process for website id = 2, period = month, date = last52 +INFO [2018-01-11 20:52:23] - pre-processing all visits +INFO [2018-01-11 20:52:28] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.329s +INFO [2018-01-11 20:52:28] Will pre-process for website id = 2, period = year, date = last7 +INFO [2018-01-11 20:52:28] - pre-processing all visits +INFO [2018-01-11 20:52:33] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 5.163s +INFO [2018-01-11 20:52:33] Archived website id = 2, 4 API requests, Time elapsed: 46.629s [2/3 done] +INFO [2018-01-11 20:52:33] Old report was invalidated for website id 3 +INFO [2018-01-11 20:52:33] Will pre-process for website id = 3, period = day, date = last52 +INFO [2018-01-11 20:52:33] - pre-processing all visits +INFO [2018-01-11 20:52:35] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.912s +INFO [2018-01-11 20:52:35] Will pre-process for website id = 3, period = week, date = last260 +INFO [2018-01-11 20:52:35] - pre-processing all visits +INFO [2018-01-11 20:53:10] Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.493s +INFO [2018-01-11 20:53:10] Will pre-process for website id = 3, period = month, date = last52 +INFO [2018-01-11 20:53:10] - pre-processing all visits +INFO [2018-01-11 20:53:15] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.751s +INFO [2018-01-11 20:53:15] Will pre-process for website id = 3, period = year, date = last7 +INFO [2018-01-11 20:53:15] - pre-processing all visits +INFO [2018-01-11 20:53:21] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 6.293s +INFO [2018-01-11 20:53:21] Archived website id = 3, 4 API requests, Time elapsed: 48.454s [3/3 done] +INFO [2018-01-11 20:53:21] Done archiving! +INFO [2018-01-11 20:53:21] --------------------------- +INFO [2018-01-11 20:53:21] SUMMARY +INFO [2018-01-11 20:53:21] Total visits for today across archived websites: 0 +INFO [2018-01-11 20:53:21] Archived today's reports for 3 websites +INFO [2018-01-11 20:53:21] Archived week/month/year for 3 websites +INFO [2018-01-11 20:53:21] Skipped 0 websites +INFO [2018-01-11 20:53:21] - 0 skipped because no new visit since the last script execution +INFO [2018-01-11 20:53:21] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2018-01-11 20:53:21] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2018-01-11 20:53:21] Total API requests: 24 +INFO [2018-01-11 20:53:21] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 280230 ms, no error +INFO [2018-01-11 20:53:21] Time elapsed: 280.230s +INFO [2018-01-11 20:53:21] --------------------------- +INFO [2018-01-11 20:53:21] SCHEDULED TASKS +INFO [2018-01-11 20:53:21] Starting Scheduled tasks... +INFO [2018-01-11 20:53:21] done +INFO [2018-01-11 20:53:21] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index cdd66f1ffe..dc8074c621 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index fe210e63af..52b9b82c96 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 0d14f85779..ebb3a254a0 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 90df60e9d4..5b238b17af 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -26,7 +26,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Piwik automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -42,7 +42,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>When enabled, Piwik will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.<br />The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp> + <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.<br />The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -83,7 +83,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Piwik. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> + <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> <templateFile /> <introduction /> <condition /> @@ -103,7 +103,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Matomo will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -123,7 +123,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of user agents to exclude from being tracked by Piwik.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Piwik.<br />You can use this to exclude some bots from being tracked.</inlineHelp> + <inlineHelp>Enter the list of user agents to exclude from being tracked by Matomo.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.<br />You can use this to exclude some bots from being tracked.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -142,7 +142,7 @@ <row key="0">Do not track Site Search</row> </availableValues> <description /> - <inlineHelp>You can use Piwik to track and report what visitors are searching in your website's internal search engine.</inlineHelp> + <inlineHelp>You can use Matomo to track and report what visitors are searching in your website's internal search engine.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -213,7 +213,7 @@ <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index f5645a049f..d5745de871 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -42,7 +42,7 @@ </row> <row> <name>Downloads (Actions)</name> - <documentation>In this report, you can see which files your visitors have downloaded. <br /> What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.</documentation> + <documentation>In this report, you can see which files your visitors have downloaded. <br /> What Matomo counts as a download is the click on a download link. Whether the download was completed or not isn't known to Matomo.</documentation> </row> <row> <name>Entry page titles (Actions)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml new file mode 100644 index 0000000000..2fd0121936 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMatomoVersion.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>3.3.0-b2</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 6b3365a3be..7364b089c9 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -3364,7 +3364,7 @@ <isWide>0</isWide> </row> <row> - <name>Premium Features & Services for Piwik</name> + <name>Premium Features & Services for Matomo</name> <category> <id>About Matomo</id> <name>About Matomo</name> @@ -3421,7 +3421,7 @@ <isWide>0</isWide> </row> <row> - <name>Piwik.org Blog</name> + <name>Matomo.org Blog</name> <category> <id>About Matomo</id> <name>About Matomo</name> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index ddb3f14ef6..1cde2444b7 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 2d0c4961a9..ff2737f41a 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index a44a863aa6..2654db7a43 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -15,7 +15,7 @@ <tr> <td> <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px"> - <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" /> + <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Matomo, free/libre analytics platform" /> </a> </td> <td align="right"> |