diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
commit | c89189697b9cd17a5c2df0f3794b12f5cb681655 (patch) | |
tree | 083f6375b6a2005531effb42e053693d08c04f2f /tests/PHPUnit | |
parent | afb1cb7b7ec20bf3c0213e2fcd8680a85686c6ff (diff) | |
parent | cf2f71f36ffa139aec60a219aeb3748af66f477e (diff) |
Merge branch 'master' into 5940_testRenamingAndCorrectFolders
Conflicts:
tests/PHPUnit/phpunit.xml.dist
Diffstat (limited to 'tests/PHPUnit')
42 files changed, 292 insertions, 227 deletions
diff --git a/tests/PHPUnit/Impl/TestRequestResponse.php b/tests/PHPUnit/Impl/TestRequestResponse.php index f71a430aa6..026f2c43b4 100644 --- a/tests/PHPUnit/Impl/TestRequestResponse.php +++ b/tests/PHPUnit/Impl/TestRequestResponse.php @@ -71,10 +71,17 @@ class TestRequestResponse if ($expected->requestUrl['format'] == 'xml') { Asserts::assertXmlStringEqualsXmlString($expectedText, $actualText, $message); - } else { + return; + } + + // check content size to get quick feedback and avoid lengthy diff + $checkSizeFirst = array('pdf', 'csv'); + if(!empty($expected->requestUrl['reportFormat']) + && in_array($expected->requestUrl['reportFormat'], $checkSizeFirst)) { Asserts::assertEquals(strlen($expectedText), strlen($actualText), $message); - Asserts::assertEquals($expectedText, $actualText, $message); } + + Asserts::assertEquals($expectedText, $actualText, $message); } private function normalizeApiResponse($apiResponse) diff --git a/tests/PHPUnit/Integration/PiwikTest.php b/tests/PHPUnit/Integration/PiwikTest.php index 99262e56ba..c73f8bb0b4 100644 --- a/tests/PHPUnit/Integration/PiwikTest.php +++ b/tests/PHPUnit/Integration/PiwikTest.php @@ -68,6 +68,99 @@ class Core_PiwikTest extends IntegrationTestCase } /** + * Tests the generated JS code with protocol overwrite + * @group Core + */ + public function testJavascriptTrackingCode_withAllOptionsAndProtocolOverwrite() + { + Piwik::addAction('Piwik.getJavascriptCode', function (&$codeImpl) { + $codeImpl['protocol'] = 'https://'; + }); + + $jsTag = Piwik::getJavascriptCode($idSite = 1, $piwikUrl = 'http://localhost/piwik', + $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true, + $visitorCustomVariables = array( array("name", "value"), array("name 2", "value 2") ), + $pageCustomVariables = array( array("page cvar", "page cvar value") ), + $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", + $doNotTrack = true); + + $expected = "<!-- Piwik --> +<script type="text/javascript"> + var _paq = _paq || []; + _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); + // you can set up to 5 custom variables for each visitor + _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); + _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]); + // you can set up to 5 custom variables for each action (page view, download, click, site search) + _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]); + _paq.push([\"setCampaignNameKey\", \"campaignKey\"]); + _paq.push([\"setCampaignKeywordKey\", \"keywordKey\"]); + _paq.push([\"setDoNotTrack\", true]); + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="https://localhost/piwik/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', 1]); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); +</script> +<noscript><p><img src="https://localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<!-- End Piwik Code --> +"; + + $this->assertEquals($expected, $jsTag); + } + + /** + * Tests the generated JS code with options before tracker url + * @group Core + */ + public function testJavascriptTrackingCode_withAllOptionsAndOptionsBeforeTrackerUrl() + { + Piwik::addAction('Piwik.getJavascriptCode', function (&$codeImpl) { + $codeImpl['optionsBeforeTrackerUrl'] .= "_paq.push(['setAPIUrl', 'http://localhost/statistics']);\n "; + }); + + $jsTag = Piwik::getJavascriptCode($idSite = 1, $piwikUrl = 'http://localhost/piwik', + $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true, + $visitorCustomVariables = array( array("name", "value"), array("name 2", "value 2") ), + $pageCustomVariables = array( array("page cvar", "page cvar value") ), + $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", + $doNotTrack = true); + + $expected = "<!-- Piwik --> +<script type="text/javascript"> + var _paq = _paq || []; + _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); + // you can set up to 5 custom variables for each visitor + _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); + _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]); + // you can set up to 5 custom variables for each action (page view, download, click, site search) + _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]); + _paq.push([\"setCampaignNameKey\", \"campaignKey\"]); + _paq.push([\"setCampaignKeywordKey\", \"keywordKey\"]); + _paq.push([\"setDoNotTrack\", true]); + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//localhost/piwik/"; + _paq.push(['setAPIUrl', 'http://localhost/statistics']); + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', 1]); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); +</script> +<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<!-- End Piwik Code --> +"; + + $this->assertEquals($expected, $jsTag); + } + + /** * Dataprovider for testIsNumericValid */ public function getValidNumeric() diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__WhiteLabel.getSampleReport_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__WhiteLabel.getSampleReport_month.xml new file mode 100644 index 0000000000..a2de386f66 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__WhiteLabel.getSampleReport_month.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="The plugin WhiteLabel is not enabled. You can activate the plugin on Settings > Plugins page in Piwik. + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_day.xml new file mode 100644 index 0000000000..a2de386f66 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_day.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="The plugin WhiteLabel is not enabled. You can activate the plugin on Settings > Plugins page in Piwik. + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_week.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_week.xml new file mode 100644 index 0000000000..a2de386f66 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__WhiteLabel.getSampleReport_week.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="The plugin WhiteLabel is not enabled. You can activate the plugin on Settings > Plugins page in Piwik. + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__WhiteLabel.getSampleReport_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__WhiteLabel.getSampleReport_day.xml new file mode 100644 index 0000000000..a2de386f66 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit__WhiteLabel.getSampleReport_day.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="The plugin WhiteLabel is not enabled. You can activate the plugin on Settings > Plugins page in Piwik. + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file 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 afc6e909b1..16bfe19f8c 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,73 +1,11 @@ ------------------------------------------------------- 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' +Please use '/path/to/php /home/matt/dev/piwik-master/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/piwik-master/tests/PHPUnit/proxy/index.php' instead. +To get help use '/path/to/php /home/matt/dev/piwik-master/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' ------------------------------------------------------- - -INFO CoreConsole[2014-09-09 01:46:27] --------------------------- -INFO CoreConsole[2014-09-09 01:46:27] INIT -INFO CoreConsole[2014-09-09 01:46:27] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php -INFO CoreConsole[2014-09-09 01:46:27] Running Piwik 2.7.0-b2 as Super User -DEBUG CoreConsole[2014-09-09 01:46:27] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.getDefaultMetricTranslations&format=original&serialize=1&trigger=archivephp&testmode=1&pid=2e1e341f728109bd9f2aa50667ff5ebd1334473b8e8026e85ab7850d28c9a2de11be5a02bbded91d38aab2870492ef77ebdd0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/2e1e341f728109bd9f2aa50667ff5ebd1334473b8e8026e85ab7850d28c9a2de11be5a02bbded91d38aab2870492ef77ebdd0.output 2>&1 & -INFO CoreConsole[2014-09-09 01:46:28] --------------------------- -INFO CoreConsole[2014-09-09 01:46:28] NOTES -INFO CoreConsole[2014-09-09 01:46:28] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO CoreConsole[2014-09-09 01:46:28] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO CoreConsole[2014-09-09 01:46:28] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO CoreConsole[2014-09-09 01:46:28] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO CoreConsole[2014-09-09 01:46:28] - Will process 0 websites with new visits since 7 days 0 hours -INFO CoreConsole[2014-09-09 01:46:28] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2 -INFO CoreConsole[2014-09-09 01:46:28] --------------------------- -INFO CoreConsole[2014-09-09 01:46:28] START -INFO CoreConsole[2014-09-09 01:46:28] Starting Piwik reports archiving... -DEBUG CoreConsole[2014-09-09 01:46:28] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=85cfb29c2e26e4c8440e7e33d55e413d39509345117eb194d4ba3b2459213c11737c71fb534b13d060ee3a51686d040bcd780' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/85cfb29c2e26e4c8440e7e33d55e413d39509345117eb194d4ba3b2459213c11737c71fb534b13d060ee3a51686d040bcd780.output 2>&1 & -INFO CoreConsole[2014-09-09 01:46:29] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-09 01:46:29] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=e517450ff87813ef3b86a502f8e864d00e86570c4a62df480ab1e2c7d3e6233ca2de3e34d74a5f4601857ba97241fa7469ad0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/e517450ff87813ef3b86a502f8e864d00e86570c4a62df480ab1e2c7d3e6233ca2de3e34d74a5f4601857ba97241fa7469ad0.output 2>&1 & -INFO CoreConsole[2014-09-09 01:46:31] Archived website id = 1, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 3.438s -INFO CoreConsole[2014-09-09 01:46:31] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-09 01:46:31] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=064eca2df6d0757ed6c729255a072f39dddcfb7132eede4fb060f3c000aaf06abc5b8d1e6a1d7f5a75191665e2ee17322fff0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/064eca2df6d0757ed6c729255a072f39dddcfb7132eede4fb060f3c000aaf06abc5b8d1e6a1d7f5a75191665e2ee17322fff0.output 2>&1 & -DEBUG CoreConsole[2014-09-09 01:46:31] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=05b992fcb7f031578d525e2a1f4f50c50ac40c0ca149c7c17243a57a96530a80c0d774430ed783c3bcb4ef9f1fc78b6054ce1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/05b992fcb7f031578d525e2a1f4f50c50ac40c0ca149c7c17243a57a96530a80c0d774430ed783c3bcb4ef9f1fc78b6054ce1.output 2>&1 & -INFO CoreConsole[2014-09-09 01:46:50] Archived website id = 1, period = week, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 19.207s -INFO CoreConsole[2014-09-09 01:46:50] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-09 01:46:50] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=b97b6610e36a1879beef58fa96cbbdb3fd16e27953fea563b080df5ec743f899de9cd189e99a522132b1affa42b39c368c830' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/b97b6610e36a1879beef58fa96cbbdb3fd16e27953fea563b080df5ec743f899de9cd189e99a522132b1affa42b39c368c830.output 2>&1 & -DEBUG CoreConsole[2014-09-09 01:46:50] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=9943bef019811f952ac8a2913efa0bf4c49862a24c78cbcda994890313db0cb693ce980e0ec5002f9d0501eb6df6218b370c1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/9943bef019811f952ac8a2913efa0bf4c49862a24c78cbcda994890313db0cb693ce980e0ec5002f9d0501eb6df6218b370c1.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:01] Archived website id = 1, period = month, 40 visits in last last52 months, 0 visits this month, Time elapsed: 10.722s -INFO CoreConsole[2014-09-09 01:47:01] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-09 01:47:01] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=773203159cb45b3702e6807c378c811f789b41f466570dec02f1558cb23d6eb7cb2163a52046dd2827ef68bed432b61818340' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/773203159cb45b3702e6807c378c811f789b41f466570dec02f1558cb23d6eb7cb2163a52046dd2827ef68bed432b61818340.output 2>&1 & -DEBUG CoreConsole[2014-09-09 01:47:01] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=63ed9ebfc2372a39e2c3111dd73fbfb529d5db843e728c09afdf8cf78f32983dabe42cbba513af309f04ae5e2ef664eada8a1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/63ed9ebfc2372a39e2c3111dd73fbfb529d5db843e728c09afdf8cf78f32983dabe42cbba513af309f04ae5e2ef664eada8a1.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:03] Archived website id = 1, period = year, 40 visits in last last7 years, 12 visits this year, Time elapsed: 2.326s -INFO CoreConsole[2014-09-09 01:47:03] Archived website id = 1, 8 API requests, Time elapsed: 35.697s [1/2 done] -DEBUG CoreConsole[2014-09-09 01:47:03] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=db38d41d3398b809310cc0d63ba1d3ee0d4726acaaea720b3412a9e5fa6311d88c6752611e6104270c047e0ecebed37db2fc0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/db38d41d3398b809310cc0d63ba1d3ee0d4726acaaea720b3412a9e5fa6311d88c6752611e6104270c047e0ecebed37db2fc0.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:05] Archived website id = 2, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 1.618s -DEBUG CoreConsole[2014-09-09 01:47:05] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=e1d0a7846bb142eded2edc12020f04b70b85023db70ea1b590d8e0f955277003fa45b8bff24756e6db5154e9bc3cbd2777700' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/e1d0a7846bb142eded2edc12020f04b70b85023db70ea1b590d8e0f955277003fa45b8bff24756e6db5154e9bc3cbd2777700.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:18] Archived website id = 2, period = week, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 13.418s -DEBUG CoreConsole[2014-09-09 01:47:18] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=81840a421ef9c17763c65ef8c899601470ae84add7097344023dc8876451749d42fbf4ea653a5498f8bd8358032bdc7a28f10' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/81840a421ef9c17763c65ef8c899601470ae84add7097344023dc8876451749d42fbf4ea653a5498f8bd8358032bdc7a28f10.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:25] Archived website id = 2, period = month, 1 visits in last last52 months, 0 visits this month, Time elapsed: 6.115s -DEBUG CoreConsole[2014-09-09 01:47:25] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=087c4f9970b4fedb2cd40f0fe1b5da80c76b8a64e63cd7e7a93885147dc86e67b0b0f79ab52cd1769e2d6634b59ce1ffa56f0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/087c4f9970b4fedb2cd40f0fe1b5da80c76b8a64e63cd7e7a93885147dc86e67b0b0f79ab52cd1769e2d6634b59ce1ffa56f0.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:26] Archived website id = 2, period = year, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.373s -INFO CoreConsole[2014-09-09 01:47:26] Archived website id = 2, 4 API requests, Time elapsed: 22.528s [2/2 done] -INFO CoreConsole[2014-09-09 01:47:26] Done archiving! -INFO CoreConsole[2014-09-09 01:47:26] --------------------------- -INFO CoreConsole[2014-09-09 01:47:26] SUMMARY -INFO CoreConsole[2014-09-09 01:47:26] Total visits for today across archived websites: 0 -INFO CoreConsole[2014-09-09 01:47:26] Archived today's reports for 2 websites -INFO CoreConsole[2014-09-09 01:47:26] Archived week/month/year for 2 websites -INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites: no new visit since the last script execution -INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old -INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old -INFO CoreConsole[2014-09-09 01:47:26] Total API requests: 12 -INFO CoreConsole[2014-09-09 01:47:26] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 12 req, 58327 ms, no error -INFO CoreConsole[2014-09-09 01:47:26] Time elapsed: 58.328s -INFO CoreConsole[2014-09-09 01:47:26] --------------------------- -INFO CoreConsole[2014-09-09 01:47:26] SCHEDULED TASKS -INFO CoreConsole[2014-09-09 01:47:26] Starting Scheduled tasks... -DEBUG CoreConsole[2014-09-09 01:47:26] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=CoreAdminHome.runScheduledTasks&format=csv&convertToUnicode=0&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=334d2f79cda2d2f08e0357c080f38cf6fe90f1248ebb91af3cea79e4593d1c4feff96328b77d32ce1fe9cfcd6e434b11dca50' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/334d2f79cda2d2f08e0357c080f38cf6fe90f1248ebb91af3cea79e4593d1c4feff96328b77d32ce1fe9cfcd6e434b11dca50.output 2>&1 & -INFO CoreConsole[2014-09-09 01:47:26] No task to run -INFO CoreConsole[2014-09-09 01:47:26] done -INFO CoreConsole[2014-09-09 01:47:26] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml index d7dfbaef5a..89cd627339 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml index e949f7b041..dc70f24c00 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>6</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml index 4e3f9c3a15..09a9dec19a 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>5</nb_visits_converted> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 88e4c569eb..06d553899c 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -98,7 +98,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -246,7 +246,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -371,7 +371,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -510,7 +510,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -635,7 +635,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -791,7 +791,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -916,7 +916,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1055,7 +1055,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1180,7 +1180,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1600,7 +1600,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1739,7 +1739,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -1856,7 +1856,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1981,7 +1981,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -2293,7 +2293,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -2535,7 +2535,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -2674,7 +2674,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -2813,7 +2813,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -2952,7 +2952,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -3083,7 +3083,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3208,7 +3208,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3333,7 +3333,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3458,7 +3458,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3583,7 +3583,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3739,7 +3739,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -3895,7 +3895,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -4051,7 +4051,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -4199,7 +4199,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -4324,7 +4324,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -4449,7 +4449,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -4574,7 +4574,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -4699,7 +4699,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 61b4626535..20a321c37a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -49,7 +49,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -151,7 +151,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -321,7 +321,7 @@ <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -423,7 +423,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -760,7 +760,7 @@ <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -862,7 +862,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -960,7 +960,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1126,7 +1126,7 @@ <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1224,7 +1224,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1557,7 +1557,7 @@ <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 61b4626535..20a321c37a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -49,7 +49,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -151,7 +151,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -321,7 +321,7 @@ <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -423,7 +423,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -760,7 +760,7 @@ <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -862,7 +862,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -960,7 +960,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1126,7 +1126,7 @@ <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1224,7 +1224,7 @@ <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1557,7 +1557,7 @@ <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 06291c5c5f..0d3bdc865c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -65,7 +65,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>blog.comperiosearch.com</referrerName> @@ -203,7 +203,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -316,7 +316,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -462,7 +462,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -577,7 +577,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -703,7 +703,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -836,7 +836,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -958,7 +958,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>berndjung.com</referrerName> @@ -1072,7 +1072,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>forum.golem.de</referrerName> @@ -1241,7 +1241,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -1359,7 +1359,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1485,7 +1485,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -1769,7 +1769,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1885,7 +1885,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -2002,7 +2002,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>sn110w.snt110.mail.live.com</referrerName> @@ -2135,7 +2135,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2260,7 +2260,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2392,7 +2392,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2500,7 +2500,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2608,7 +2608,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2706,7 +2706,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2814,7 +2814,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2922,7 +2922,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3026,7 +3026,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3130,7 +3130,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3234,7 +3234,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3338,7 +3338,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3442,7 +3442,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3546,7 +3546,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3650,7 +3650,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3754,7 +3754,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3858,7 +3858,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3962,7 +3962,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4066,7 +4066,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4170,7 +4170,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4274,7 +4274,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4378,7 +4378,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4482,7 +4482,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4586,7 +4586,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4690,7 +4690,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml index e248df22a8..8cc6494492 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -10,6 +10,6 @@ <nb_visits_converted>25</nb_visits_converted> <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <url>http://piwik.org/faq/general/#faq_52</url> + <url /> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 02678e9aee..4bef268a9f 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -106,7 +106,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -260,7 +260,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -383,7 +383,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -537,7 +537,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -660,7 +660,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -814,7 +814,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -929,7 +929,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 47c2f38c4e..375e6853cd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -98,7 +98,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -246,7 +246,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -371,7 +371,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -510,7 +510,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -635,7 +635,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -791,7 +791,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -916,7 +916,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 8c0eba69bb..b17d355a83 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -139,7 +139,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -264,7 +264,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -420,7 +420,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -559,7 +559,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -684,7 +684,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -809,7 +809,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -924,7 +924,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 47c2f38c4e..375e6853cd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -98,7 +98,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -246,7 +246,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -371,7 +371,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -510,7 +510,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -635,7 +635,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -791,7 +791,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -916,7 +916,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index ce1748a73a..83f8c16d70 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -98,7 +98,7 @@ <daysSinceLastVisit>0</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> </customVariables> @@ -246,7 +246,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -371,7 +371,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -510,7 +510,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -635,7 +635,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -791,7 +791,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -916,7 +916,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1055,7 +1055,7 @@ <daysSinceLastVisit>10</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> @@ -1180,7 +1180,7 @@ <daysSinceLastVisit>11</daysSinceLastVisit> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <customVariables> <row> <customVariableName1>Cvar 1 name</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml index 7b9b086c44..6ca6cdbd81 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <url>http://piwik.org/faq/general/#faq_52</url> + <url /> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 2ceb5d70bf..1a94308fac 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -55,7 +55,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Yahoo!</referrerName> @@ -243,7 +243,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>referrer.com</referrerName> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml index 7254c4a970..039448a1aa 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <url>http://piwik.org/faq/general/#faq_52</url> + <url /> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 9175168a74..4fc272c7ff 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -90,7 +90,7 @@ </customVariables> <provider>Inconnu</provider> <providerName>Inconnu</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> @@ -197,7 +197,7 @@ </customVariables> <provider>Inconnu</provider> <providerName>Inconnu</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index f77489d7a3..a0db0d7c8e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -49,7 +49,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -142,7 +142,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -235,7 +235,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 4d5a3bb878..d820d786ab 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -44,7 +44,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> 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 fc803f8028..828f15f4aa 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Site 1 + Site 1 </h1> <p> 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 c5183f184f..88ed239c6d 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Site 1 + Site 1 </h1> <p> @@ -5152,7 +5152,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <a style="color: rgb(68,68,68);" href='http://piwik.org/faq/general/#faq_52'> + <a style="color: rgb(68,68,68);" href='http://'> Unknown </a> </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 8e8c6e7cd1..3dc09d6491 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Site 1 + Site 1 </h1> <p> @@ -4924,7 +4924,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <a style="color: rgb(68,68,68);" href='http://piwik.org/faq/general/#faq_52'> + <a style="color: rgb(68,68,68);" href='http://'> Unknown </a> </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 7891c7d5ca..1fbdd629d8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex c287c4bf01..dc400d69e0 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 25ac19a415..f8da6f787c 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -82,7 +82,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -293,7 +293,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 30ae50eb8f..75cf165e0c 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -158,7 +158,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -488,7 +488,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -704,7 +704,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> 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 451b79191c..03178c7d32 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Piwik test + Piwik test </h1> <p> 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 b5f59686c4..4c0d5a3173 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Piwik test + Piwik test </h1> <p> @@ -6827,7 +6827,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <a style="color: rgb(68,68,68);" href='http://piwik.org/faq/general/#faq_52'> + <a style="color: rgb(68,68,68);" href='http://'> Unknown </a> </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 8283259e33..2c71900b41 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 @@ -7,7 +7,7 @@ <a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> - Website Piwik test + Piwik test </h1> <p> @@ -6521,7 +6521,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <a style="color: rgb(68,68,68);" href='http://piwik.org/faq/general/#faq_52'> + <a style="color: rgb(68,68,68);" href='http://'> Unknown </a> </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex e8e37848fd..3db8e7ed77 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 8112427124..9dec8f6d62 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -52,7 +52,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -167,7 +167,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -342,7 +342,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 20546709ec..949ab7b840 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -95,7 +95,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -211,7 +211,7 @@ <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <providerUrl /> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml index eb96e297f5..95d4b86627 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml @@ -34,6 +34,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <url>http://piwik.org/faq/general/#faq_52</url> + <url /> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php index 3e2d0ec4c7..b2b875d7fc 100644 --- a/tests/PHPUnit/TestingEnvironment.php +++ b/tests/PHPUnit/TestingEnvironment.php @@ -88,7 +88,7 @@ class Piwik_TestingEnvironment if (isset($_SERVER['QUERY_STRING']) && !$this->dontUseTestConfig ) { - \Piwik\Log::verbose("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true)); + @\Piwik\Log::verbose("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true)); } } catch (Exception $ex) { // ignore diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject d98325f48a495a6d5d71cb1ffed231f6834f30b +Subproject 6100f9642a51ee82b613d4f25595e4ee914878a |