From f77bb431cc4cd0271a33215504b859a543259a57 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Tue, 14 Aug 2012 03:30:08 +0000
Subject: [PATCH] Refs #3163 * Fixing Log Analytics integration - adding a new
index.php proxy to force to use test DB * Refactored call to get browser
language forgotten earlier
TODO:
* Benaka, could you please remove --tracker-url feature from the import_logs.py ? it's not used anymore
git-svn-id: http://dev.piwik.org/svn/trunk@6743 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/FrontController.php | 28 ++++++++-----
core/Tracker/GoalManager.php | 4 +-
core/Tracker/Visit.php | 3 +-
core/Updater.php | 3 +-
tests/PHPUnit/Integration/ImportLogsTest.php | 15 +++----
tests/PHPUnit/proxy/index.php | 40 +++++++++++++++++++
.../{proxy-piwik.php => proxy/piwik.php} | 5 ++-
tests/integration/ImportLogs.test.php | 14 +++----
tests/integration/Integration.php | 2 +-
...rtLogs__Actions.getEntryPageUrls_month.xml | 30 +++++++-------
...ortLogs__Actions.getExitPageUrls_month.xml | 30 +++++++-------
..._ImportLogs__Actions.getPageUrls_month.xml | 30 +++++++-------
...oreAdminHome.getWebsiteIdsToInvalidate.xml | 4 +-
13 files changed, 131 insertions(+), 77 deletions(-)
create mode 100644 tests/PHPUnit/proxy/index.php
rename tests/PHPUnit/{proxy-piwik.php => proxy/piwik.php} (92%)
diff --git a/core/FrontController.php b/core/FrontController.php
index ba0c83b087..8690bebba3 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -192,6 +192,22 @@ class Piwik_FrontController
;
}
+ /**
+ * Loads the config file and assign to the global registry
+ * This is overriden in tests to ensure test config file is used
+ */
+ protected function createConfigObject()
+ {
+ $exceptionToThrow = false;
+ try {
+ Piwik::createConfigObject();
+ } catch(Exception $e) {
+ Piwik_PostEvent('FrontController.NoConfigurationFile', $e, $info = array(), $pending = true);
+ $exceptionToThrow = $e;
+ }
+ return $exceptionToThrow;
+ }
+
/**
* Must be called before dispatch()
* - checks that directories are writable,
@@ -230,14 +246,7 @@ class Piwik_FrontController
Piwik_Translate::getInstance()->loadEnglishTranslation();
- $exceptionToThrow = false;
-
- try {
- Piwik::createConfigObject();
- } catch(Exception $e) {
- Piwik_PostEvent('FrontController.NoConfigurationFile', $e, $info = array(), $pending = true);
- $exceptionToThrow = $e;
- }
+ $exceptionToThrow = $this->createConfigObject();
if(Piwik_Session::isFileBasedSessions())
{
@@ -271,8 +280,7 @@ class Piwik_FrontController
$url = str_replace("http://", "https://", $url);
Piwik_Url::redirectToUrl($url);
}
-
-
+
$pluginsManager = Piwik_PluginsManager::getInstance();
$pluginsToLoad = Piwik_Config::getInstance()->Plugins['Plugins'];
$pluginsManager->loadPlugins( $pluginsToLoad );
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index e0cef4d55b..1cecd73109 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -234,12 +234,12 @@ class Piwik_Tracker_GoalManager
* @param string $referrerCampaignName
* @param string $referrerCampaignKeyword
*/
- public function recordGoals($idSite, $visitorInformation, $visitCustomVariables, $action, $referrerTimestamp, $referrerUrl, $referrerCampaignName, $referrerCampaignKeyword)
+ public function recordGoals($idSite, $visitorInformation, $visitCustomVariables, $action, $referrerTimestamp, $referrerUrl, $referrerCampaignName, $referrerCampaignKeyword, $browserLanguage)
{
$location_country = isset($visitorInformation['location_country'])
? $visitorInformation['location_country']
: Piwik_Common::getCountry(
- Piwik_Common::getBrowserLanguage(),
+ $browserLanguage,
$enableLanguageToCountryGuess = Piwik_Config::getInstance()->Tracker['enable_language_to_country_guess'],
$visitorInformation['location_ip']
);
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index b3a8051dae..9b5f83c42a 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -280,7 +280,8 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
$refererTimestamp,
$refererUrl,
$refererCampaignName,
- $refererCampaignKeyword
+ $refererCampaignKeyword,
+ $this->getBrowserLanguage()
);
}
unset($this->goalManager);
diff --git a/core/Updater.php b/core/Updater.php
index 9629723250..ae3821d080 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -265,7 +265,8 @@ class Piwik_Updater
{
if($name === 'core')
{
- $currentVersion = '0.2.9';
+ // This should not happen
+ $currentVersion = Piwik_Version::VERSION;
}
else
{
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index c7ed3b158f..46e63259fc 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -65,17 +65,18 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase
*/
protected static function trackVisits()
{
- $cmd = "python "
- . PIWIK_INCLUDE_PATH.'/misc/log-analytics/import_logs.py ' # script loc
- . '--url="'.self::getRootUrl().'" '
- . '--tracker-url="'.self::getTrackerUrl().'" '
- . '--idsite='.self::$idSite.' '
+ $python = Piwik_Common::isWindows() ? "C:\Python27\python.exe" : 'python';
+ $cmd = $python . ' "'
+ . PIWIK_INCLUDE_PATH.'/misc/log-analytics/import_logs.py" ' # script loc
+// . '-ddd ' // debug
+ . '--url="'.$this->getRootUrl().'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files
+ . '--idsite='.$this->idSite.' '
. '--recorders=4 '
. '--enable-http-errors '
. '--enable-http-redirects '
. '--enable-static '
- . '--enable-bots '
- . PIWIK_INCLUDE_PATH.'/tests/resources/fake_logs.log ' # log file
+ . '--enable-bots "'
+ . PIWIK_INCLUDE_PATH.'/tests/resources/fake_logs.log" ' # log file
. '2>&1'
;
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
new file mode 100644
index 0000000000..ccb7c41eac
--- /dev/null
+++ b/tests/PHPUnit/proxy/index.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Proxy to index.php, but will use the Test DB
+ * Currently only used only for the test: tests/PHPUnit/Integration/ImportLogsTest.php
+ * since other integration tests do not call index.php via http but use the Piwik_API_Request object
+ *
+ */
+
+// Wrapping the request inside ob_start() calls to ensure that the Test
+// calling us waits for the full request to process before unblocking
+ob_start();
+
+define('PIWIK_INCLUDE_PATH', '../../..');
+define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
+
+require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/upgrade.php';
+require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
+
+Piwik_Tracker::setTestEnvironment();
+Piwik_Common::deleteTrackerCache();
+
+class Piwik_FrontController_Test extends Piwik_FrontController
+{
+ protected function createConfigObject()
+ {
+ // Config files forced to use the test database
+ Piwik::createConfigObject();
+ Piwik_Config::getInstance()->setTestEnvironment();
+ }
+}
+
+// Disable index.php dispatch since we do it manually below
+define('PIWIK_ENABLE_DISPATCH', false);
+include PIWIK_INCLUDE_PATH . '/index.php';
+
+$controller = new Piwik_FrontController_Test;
+$controller->init();
+$controller->dispatch();
+
+ob_flush();
diff --git a/tests/PHPUnit/proxy-piwik.php b/tests/PHPUnit/proxy/piwik.php
similarity index 92%
rename from tests/PHPUnit/proxy-piwik.php
rename to tests/PHPUnit/proxy/piwik.php
index fbdc065c3d..43540905af 100755
--- a/tests/PHPUnit/proxy-piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -8,11 +8,12 @@
* @see Main.test.php
*
*/
+
// Wrapping the request inside ob_start() calls to ensure that the Test
// calling us waits for the full request to process before unblocking
ob_start();
-define('PIWIK_INCLUDE_PATH', '../..');
+define('PIWIK_INCLUDE_PATH', '../../..');
define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/upgrade.php';
@@ -31,5 +32,5 @@ Piwik_Option::getInstance()->clearCache();
Piwik_Site::clearCache();
Piwik_Common::deleteTrackerCache();
-include '../../piwik.php';
+include PIWIK_INCLUDE_PATH . '/piwik.php';
ob_flush();
diff --git a/tests/integration/ImportLogs.test.php b/tests/integration/ImportLogs.test.php
index df5d10b31c..ef073e58bb 100755
--- a/tests/integration/ImportLogs.test.php
+++ b/tests/integration/ImportLogs.test.php
@@ -46,20 +46,20 @@ class Test_Piwik_Integration_ImportLogs extends Test_Integration_Facade
*/
protected function trackVisits()
{
- $cmd = "python "
- . PIWIK_INCLUDE_PATH.'/misc/log-analytics/import_logs.py ' # script loc
- . '--url="'.$this->getRootUrl().'" '
- . '--tracker-url="'.$this->getTrackerUrl().'" '
+ $python = Piwik_Common::isWindows() ? "C:\Python27\python.exe" : 'python';
+ $cmd = $python . ' "'
+ . PIWIK_INCLUDE_PATH.'/misc/log-analytics/import_logs.py" ' # script loc
+// . '-ddd ' // debug
+ . '--url="'.$this->getRootUrl().'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files
. '--idsite='.$this->idSite.' '
. '--recorders=4 '
. '--enable-http-errors '
. '--enable-http-redirects '
. '--enable-static '
- . '--enable-bots '
- . PIWIK_INCLUDE_PATH.'/tests/resources/fake_logs.log ' # log file
+ . '--enable-bots "'
+ . PIWIK_INCLUDE_PATH.'/tests/resources/fake_logs.log" ' # log file
. '2>&1'
;
-
exec($cmd, $output, $result);
if ($result !== 0)
{
diff --git a/tests/integration/Integration.php b/tests/integration/Integration.php
index 5ac8e2b6b4..367c32cbc1 100644
--- a/tests/integration/Integration.php
+++ b/tests/integration/Integration.php
@@ -302,7 +302,7 @@ abstract class Test_Integration extends Test_Database_Base
*/
protected function getTrackerUrl()
{
- return $this->getRootUrl().'tests/integration/proxy-piwik.php';
+ return $this->getRootUrl().'tests/PHPUnit/proxy-piwik.php';
}
/**
diff --git a/tests/integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 7bd1cd6d1c..fd9bce57b3 100755
--- a/tests/integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -44,7 +44,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-websites/</url>
+ <url>http://piwik.net/docs/manage-websites/</url>
</row>
</subtable>
</row>
@@ -64,7 +64,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/</url>
+ <url>http://piwik.net/docs/</url>
</row>
<row>
<label>manage-users</label>
@@ -96,7 +96,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-users/</url>
+ <url>http://piwik.net/docs/manage-users/</url>
</row>
</subtable>
</row>
@@ -132,7 +132,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/</url>
+ <url>http://piwik.net/faq/</url>
</row>
<row>
<label>how-to</label>
@@ -164,7 +164,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to/</url>
+ <url>http://piwik.net/faq/how-to/</url>
</row>
</subtable>
</row>
@@ -198,7 +198,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to-install/</url>
+ <url>http://piwik.net/faq/how-to-install/</url>
</row>
</subtable>
</row>
@@ -262,7 +262,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/community/</url>
+ <url>http://piwik.net/blog/category/community/</url>
</row>
</subtable>
</row>
@@ -296,7 +296,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/meta/</url>
+ <url>http://piwik.net/blog/category/meta/</url>
</row>
</subtable>
</row>
@@ -360,7 +360,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/2012/08/survey-your-opinion-matters/</url>
+ <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url>
</row>
</subtable>
</row>
@@ -386,7 +386,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/</url>
+ <url>http://piwik.net/</url>
</row>
<row>
<label>download</label>
@@ -432,7 +432,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/download/counter/</url>
+ <url>http://piwik.net/download/counter/</url>
</row>
</subtable>
</row>
@@ -468,7 +468,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/hosting/</url>
+ <url>http://piwik.net/hosting/</url>
</row>
</subtable>
</row>
@@ -502,7 +502,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/intranet-analytics/</url>
+ <url>http://piwik.net/intranet-analytics/</url>
</row>
</subtable>
</row>
@@ -536,7 +536,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/newsletter/</url>
+ <url>http://piwik.net/newsletter/</url>
</row>
</subtable>
</row>
@@ -570,7 +570,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/translations/</url>
+ <url>http://piwik.net/translations/</url>
</row>
</subtable>
</row>
diff --git a/tests/integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 7bd1cd6d1c..fd9bce57b3 100755
--- a/tests/integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -44,7 +44,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-websites/</url>
+ <url>http://piwik.net/docs/manage-websites/</url>
</row>
</subtable>
</row>
@@ -64,7 +64,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/</url>
+ <url>http://piwik.net/docs/</url>
</row>
<row>
<label>manage-users</label>
@@ -96,7 +96,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-users/</url>
+ <url>http://piwik.net/docs/manage-users/</url>
</row>
</subtable>
</row>
@@ -132,7 +132,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/</url>
+ <url>http://piwik.net/faq/</url>
</row>
<row>
<label>how-to</label>
@@ -164,7 +164,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to/</url>
+ <url>http://piwik.net/faq/how-to/</url>
</row>
</subtable>
</row>
@@ -198,7 +198,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to-install/</url>
+ <url>http://piwik.net/faq/how-to-install/</url>
</row>
</subtable>
</row>
@@ -262,7 +262,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/community/</url>
+ <url>http://piwik.net/blog/category/community/</url>
</row>
</subtable>
</row>
@@ -296,7 +296,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/meta/</url>
+ <url>http://piwik.net/blog/category/meta/</url>
</row>
</subtable>
</row>
@@ -360,7 +360,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/2012/08/survey-your-opinion-matters/</url>
+ <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url>
</row>
</subtable>
</row>
@@ -386,7 +386,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/</url>
+ <url>http://piwik.net/</url>
</row>
<row>
<label>download</label>
@@ -432,7 +432,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/download/counter/</url>
+ <url>http://piwik.net/download/counter/</url>
</row>
</subtable>
</row>
@@ -468,7 +468,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/hosting/</url>
+ <url>http://piwik.net/hosting/</url>
</row>
</subtable>
</row>
@@ -502,7 +502,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/intranet-analytics/</url>
+ <url>http://piwik.net/intranet-analytics/</url>
</row>
</subtable>
</row>
@@ -536,7 +536,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/newsletter/</url>
+ <url>http://piwik.net/newsletter/</url>
</row>
</subtable>
</row>
@@ -570,7 +570,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/translations/</url>
+ <url>http://piwik.net/translations/</url>
</row>
</subtable>
</row>
diff --git a/tests/integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 7bd1cd6d1c..fd9bce57b3 100755
--- a/tests/integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -44,7 +44,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-websites/</url>
+ <url>http://piwik.net/docs/manage-websites/</url>
</row>
</subtable>
</row>
@@ -64,7 +64,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/</url>
+ <url>http://piwik.net/docs/</url>
</row>
<row>
<label>manage-users</label>
@@ -96,7 +96,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/docs/manage-users/</url>
+ <url>http://piwik.net/docs/manage-users/</url>
</row>
</subtable>
</row>
@@ -132,7 +132,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/</url>
+ <url>http://piwik.net/faq/</url>
</row>
<row>
<label>how-to</label>
@@ -164,7 +164,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to/</url>
+ <url>http://piwik.net/faq/how-to/</url>
</row>
</subtable>
</row>
@@ -198,7 +198,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/faq/how-to-install/</url>
+ <url>http://piwik.net/faq/how-to-install/</url>
</row>
</subtable>
</row>
@@ -262,7 +262,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/community/</url>
+ <url>http://piwik.net/blog/category/community/</url>
</row>
</subtable>
</row>
@@ -296,7 +296,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/category/meta/</url>
+ <url>http://piwik.net/blog/category/meta/</url>
</row>
</subtable>
</row>
@@ -360,7 +360,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/blog/2012/08/survey-your-opinion-matters/</url>
+ <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url>
</row>
</subtable>
</row>
@@ -386,7 +386,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/</url>
+ <url>http://piwik.net/</url>
</row>
<row>
<label>download</label>
@@ -432,7 +432,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/download/counter/</url>
+ <url>http://piwik.net/download/counter/</url>
</row>
</subtable>
</row>
@@ -468,7 +468,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/hosting/</url>
+ <url>http://piwik.net/hosting/</url>
</row>
</subtable>
</row>
@@ -502,7 +502,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/intranet-analytics/</url>
+ <url>http://piwik.net/intranet-analytics/</url>
</row>
</subtable>
</row>
@@ -536,7 +536,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/newsletter/</url>
+ <url>http://piwik.net/newsletter/</url>
</row>
</subtable>
</row>
@@ -570,7 +570,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://doctorwho.com/translations/</url>
+ <url>http://piwik.net/translations/</url>
</row>
</subtable>
</row>
diff --git a/tests/integration/expected/test_ImportLogs__CoreAdminHome.getWebsiteIdsToInvalidate.xml b/tests/integration/expected/test_ImportLogs__CoreAdminHome.getWebsiteIdsToInvalidate.xml
index c234bed59e..70bdb9e417 100755
--- a/tests/integration/expected/test_ImportLogs__CoreAdminHome.getWebsiteIdsToInvalidate.xml
+++ b/tests/integration/expected/test_ImportLogs__CoreAdminHome.getWebsiteIdsToInvalidate.xml
@@ -1,2 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>1</row>
+</result>
\ No newline at end of file
--
GitLab