From 02da78033910fc1dd8fdde15925dc940aaf0b29c Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Fri, 21 Feb 2014 00:32:03 +0100
Subject: [PATCH] refs #2174 fix more tests
---
.../javascripts/filters/htmldecode-filter.js | 12 ------------
...rentDays_Conversions__MultiSites.getAll_month.xml | 4 ++++
...erentDays_Conversions__MultiSites.getAll_week.xml | 8 ++++++++
...erentDays_Conversions__MultiSites.getAll_year.xml | 4 ++++
...nversions_idSiteOne___MultiSites.getAll_month.xml | 4 ++++
5 files changed, 20 insertions(+), 12 deletions(-)
delete mode 100644 plugins/CoreHome/javascripts/filters/htmldecode-filter.js
diff --git a/plugins/CoreHome/javascripts/filters/htmldecode-filter.js b/plugins/CoreHome/javascripts/filters/htmldecode-filter.js
deleted file mode 100644
index c87e8f8385..0000000000
--- a/plugins/CoreHome/javascripts/filters/htmldecode-filter.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * Piwik - Web Analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-angular.module('piwikApp.filter').filter('htmldecode', function() {
- return function(theString) {
- return piwikHelper.htmlDecode(theString);
- }
-});
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
index a19558ac17..b6ab1e278f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
@@ -11,6 +11,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
<row>
@@ -23,6 +25,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>0%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>2</idsite>
</row>
</result>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
index f153453973..e8fe27395c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
@@ -11,6 +11,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
</result>
@@ -25,6 +27,8 @@
<actions_evolution>3100%</actions_evolution>
<pageviews_evolution>1450%</pageviews_evolution>
<revenue_evolution>200%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
<row>
@@ -37,6 +41,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>0%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>2</idsite>
</row>
</result>
@@ -51,6 +57,8 @@
<actions_evolution>-68.8%</actions_evolution>
<pageviews_evolution>-67.7%</pageviews_evolution>
<revenue_evolution>-66.7%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
</result>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
index ae04fb0e55..fd7caaea77 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
@@ -11,6 +11,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
<row>
@@ -23,6 +25,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>0%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>2</idsite>
</row>
</result>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
index a19558ac17..b6ab1e278f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
@@ -11,6 +11,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>1</idsite>
</row>
<row>
@@ -23,6 +25,8 @@
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>0%</revenue_evolution>
+ <group/>
+ <main_url>http://piwik.net</main_url>
<idsite>2</idsite>
</row>
</result>
--
GitLab