From 5b94ec76e74c3ce74b99690f92b5d5b2b489e9da Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Wed, 7 Dec 2016 00:01:37 +1300 Subject: Add a system test reproducing #10857 (#10970) * testing referrer website with both HTTP and HTTPS for https://github.com/piwik/piwik/issues/10857 * Add a system test reproducing #10857 Add a system test reproducing #10857 -> confirmed that Piwik will track referrers from the same HTTP and HTTPS page as different entries. --- ...es_differentDays__Referrers.getWebsites_day.xml | 2 +- ..._differentDays__Referrers.getWebsites_month.xml | 19 +++++++++++--- ...s_differentDays__Referrers.getWebsites_week.xml | 19 +++++++++++--- ...s_differentDays__Referrers.getWebsites_year.xml | 19 +++++++++++--- ...tDays_idSiteOne___Referrers.getWebsites_day.xml | 2 +- ...ays_idSiteOne___Referrers.getWebsites_month.xml | 19 +++++++++++--- ...Days_idSiteOne___Referrers.getWebsites_week.xml | 19 +++++++++++--- ...Days_idSiteOne___Referrers.getWebsites_year.xml | 19 +++++++++++--- ...eduledReports.generateReport_month.original.csv | 3 ++- ...duledReports.generateReport_month.original.html | 29 ++++++++++++++++++++-- 10 files changed, 121 insertions(+), 29 deletions(-) (limited to 'tests/PHPUnit/System/expected') diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index 68cf105bb4..ff3cbc07e8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -72,7 +72,7 @@ referrerName==referrer.com - + 1 1 5 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index cb53e090a5..36c4c50326 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -16,13 +16,13 @@ - 4 - 20 + 2 + 10 5 - 3604 + 1802 0 0 - 4 + 2 0 @@ -36,6 +36,17 @@ 2 0 + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index db9b40253c..90f843905d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -41,15 +41,26 @@ 0 referrerName==referrer.com + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + - 3 - 15 + 1 + 5 5 - 2703 + 901 0 0 - 3 + 1 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index a20510ef16..84b2c7494b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -16,13 +16,13 @@ - 4 - 20 + 2 + 10 5 - 3604 + 1802 0 0 - 4 + 2 0 @@ -36,6 +36,17 @@ 2 0 + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 67bf4d2ac5..a850f5d23a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -71,7 +71,7 @@ referrerName==referrer.com - + 1 1 5 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index d04b442b1c..8e1330a381 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -15,13 +15,13 @@ - 4 - 20 + 2 + 10 5 - 3604 + 1802 0 0 - 4 + 2 0 @@ -35,6 +35,17 @@ 2 0 + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index 52dd01afe4..ca8b4bed53 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -40,15 +40,26 @@ 0 referrerName==referrer.com + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + - 3 - 15 + 1 + 5 5 - 2703 + 901 0 0 - 3 + 1 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index c80e5068c0..38f2a0bf84 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -15,13 +15,13 @@ - 4 - 20 + 2 + 10 5 - 3604 + 1802 0 0 - 4 + 2 0 @@ -35,6 +35,17 @@ 2 0 + + + 2 + 10 + 5 + 1802 + 0 + 0 + 2 + 0 + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 893c2dbf6f..38078f4bb9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -334,7 +334,8 @@ No data available Websites label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -referrer.com/Other_Page.htm,4,20,5,00:15:01,0%,$ 0 +referrer.com/Other_Page.htm,2,10,5,00:15:01,0%,$ 0 +referrer.com/Other_Page.htm,2,10,5,00:15:01,0%,$ 0 referrer.com/page.htm?param=valuewith some spaces,2,2,1,00:00:00,100%,$ 0 Social Networks 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 06bf981720..1cd91a523e 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 @@ -5033,10 +5033,10 @@ referrer.com/Other_Page.htm - 4 + 2 - 20 + 10 5 @@ -5053,6 +5053,31 @@ + + + referrer.com/Other_Page.htm + + + 2 + + + 10 + + + 5 + + + 00:15:01 + + + 0% + + + $ 0 + + + + referrer.com/page.htm?param=valuewith some spaces -- cgit v1.2.3 From 3cf2f077022856a7dd40a444849d7e88e1cf0367 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 7 Dec 2016 00:45:35 +1300 Subject: Add new marketplace widget and fixed some urls (#10967) * added new marketplace widget and fixed some urls * translate widget * fix system test * add some spacing --- ...apiGetReportMetadata__API.getWidgetMetadata.xml | 417 +++++++++++---------- 1 file changed, 218 insertions(+), 199 deletions(-) (limited to 'tests/PHPUnit/System/expected') diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 2607e36f1d..aeb906def4 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -822,7 +822,7 @@ 0 - Visits per visit duration + Visits per number of pages General_Visitors Visitors @@ -835,19 +835,19 @@ 30 VisitorInterest - getNumberOfVisitsPerVisitDuration - 115 + getNumberOfVisitsPerPage + 120 VisitorInterest - getNumberOfVisitsPerVisitDuration + getNumberOfVisitsPerPage - widgetVisitorInterestgetNumberOfVisitsPerVisitDuration + widgetVisitorInterestgetNumberOfVisitsPerPage 0 cloud 1 - Visits per number of pages + Visits per visit duration General_Visitors Visitors @@ -860,19 +860,19 @@ 30 VisitorInterest - getNumberOfVisitsPerPage - 120 + getNumberOfVisitsPerVisitDuration + 115 VisitorInterest - getNumberOfVisitsPerPage + getNumberOfVisitsPerVisitDuration - widgetVisitorInterestgetNumberOfVisitsPerPage + widgetVisitorInterestgetNumberOfVisitsPerVisitDuration 0 cloud 1 - Visits per server time + Visits by Day of Week General_Visitors Visitors @@ -885,13 +885,13 @@ 35 VisitTime - getVisitInformationPerServerTime - 120 + getByDayOfWeek + 125 VisitTime - getVisitInformationPerServerTime + getByDayOfWeek - widgetVisitTimegetVisitInformationPerServerTime + widgetVisitTimegetByDayOfWeek 0 graphVerticalBar 1 @@ -922,7 +922,7 @@ 1 - Visits by Day of Week + Visits per server time General_Visitors Visitors @@ -935,13 +935,13 @@ 35 VisitTime - getByDayOfWeek - 125 + getVisitInformationPerServerTime + 120 VisitTime - getByDayOfWeek + getVisitInformationPerServerTime - widgetVisitTimegetByDayOfWeek + widgetVisitTimegetVisitInformationPerServerTime 0 graphVerticalBar 1 @@ -1120,7 +1120,7 @@ 1 - Search Keywords with No Results + Page Titles Following a Site Search General_Actions Actions @@ -1133,19 +1133,19 @@ 25 Actions - getSiteSearchNoResultKeywords - 118 + getPageTitlesFollowingSiteSearch + 119 Actions - getSiteSearchNoResultKeywords + getPageTitlesFollowingSiteSearch - widgetActionsgetSiteSearchNoResultKeywords + widgetActionsgetPageTitlesFollowingSiteSearch 0 table 1 - Pages Following a Site Search + Search Keywords with No Results General_Actions Actions @@ -1158,19 +1158,19 @@ 25 Actions - getPageUrlsFollowingSiteSearch - 116 + getSiteSearchNoResultKeywords + 118 Actions - getPageUrlsFollowingSiteSearch + getSiteSearchNoResultKeywords - widgetActionsgetPageUrlsFollowingSiteSearch + widgetActionsgetSiteSearchNoResultKeywords 0 table 1 - Site Search Keywords + Pages Following a Site Search General_Actions Actions @@ -1183,19 +1183,19 @@ 25 Actions - getSiteSearchKeywords - 115 + getPageUrlsFollowingSiteSearch + 116 Actions - getSiteSearchKeywords + getPageUrlsFollowingSiteSearch - widgetActionsgetSiteSearchKeywords + widgetActionsgetPageUrlsFollowingSiteSearch 0 table 1 - Page Titles Following a Site Search + Site Search Keywords General_Actions Actions @@ -1208,13 +1208,13 @@ 25 Actions - getPageTitlesFollowingSiteSearch - 119 + getSiteSearchKeywords + 115 Actions - getPageTitlesFollowingSiteSearch + getSiteSearchKeywords - widgetActionsgetPageTitlesFollowingSiteSearch + widgetActionsgetSiteSearchKeywords 0 table 1 @@ -1373,7 +1373,7 @@ 1 - Event Actions + Event Names General_Actions Actions @@ -1386,14 +1386,14 @@ 40 Events - getAction - 101 + getName + 102 Events - getAction - eventName + getName + eventAction - widgetEventsgetActionsecondaryDimensioneventName + widgetEventsgetNamesecondaryDimensioneventAction 0 table 1 @@ -1425,7 +1425,7 @@ 1 - Event Names + Event Actions General_Actions Actions @@ -1438,20 +1438,20 @@ 40 Events - getName - 102 + getAction + 101 Events - getName - eventAction + getAction + eventName - widgetEventsgetNamesecondaryDimensioneventAction + widgetEventsgetActionsecondaryDimensioneventName 0 table 1 - Content Piece + Content Name General_Actions Actions @@ -1464,19 +1464,19 @@ 45 Contents - getContentPieces - 136 + getContentNames + 135 Contents - getContentPieces + getContentNames - widgetContentsgetContentPieces + widgetContentsgetContentNames 0 table 1 - Content Piece + Content Name General_Actions Actions @@ -1489,19 +1489,19 @@ 45 Contents - getContentPieces - 136 + getContentNames + 135 Contents - getContentPieces + getContentNames - widgetContentsgetContentPieces + widgetContentsgetContentNames 0 table 1 - Content Name + Content Piece General_Actions Actions @@ -1514,19 +1514,19 @@ 45 Contents - getContentNames - 135 + getContentPieces + 136 Contents - getContentNames + getContentPieces - widgetContentsgetContentNames + widgetContentsgetContentPieces 0 table 1 - Content Name + Content Piece General_Actions Actions @@ -1539,13 +1539,13 @@ 45 Contents - getContentNames - 135 + getContentPieces + 136 Contents - getContentNames + getContentPieces - widgetContentsgetContentNames + widgetContentsgetContentPieces 0 table 1 @@ -1651,7 +1651,7 @@ 1 - Websites + Social Networks Referrers_Referrers Referrers @@ -1664,19 +1664,19 @@ 15 Referrers - getWebsites - 105 + getSocials + 111 Referrers - getWebsites + getSocials - widgetReferrersgetWebsites + widgetReferrersgetSocials 0 - table + graphPie 1 - Social Networks + Websites Referrers_Referrers Referrers @@ -1689,15 +1689,15 @@ 15 Referrers - getSocials - 111 + getWebsites + 105 Referrers - getSocials + getWebsites - widgetReferrersgetSocials + widgetReferrersgetWebsites 0 - graphPie + table 1 @@ -1964,7 +1964,7 @@ 1 - Product Name + Product Category Goals_Ecommerce Ecommerce @@ -1977,19 +1977,19 @@ 10 Goals - getItemsName - 131 + getItemsCategory + 132 Goals - getItemsName + getItemsCategory - widgetGoalsgetItemsName + widgetGoalsgetItemsCategory 0 table 1 - Product Category + Product Name Goals_Ecommerce Ecommerce @@ -2002,13 +2002,13 @@ 10 Goals - getItemsCategory - 132 + getItemsName + 131 Goals - getItemsCategory + getItemsName - widgetGoalsgetItemsCategory + widgetGoalsgetItemsName 0 table 1 @@ -2533,31 +2533,6 @@ - - Data tables - - ExampleUI_UiFramework - UI Framework - 90 - - - - ExampleUI_GetTemperaturesDataTable - Data tables - 99 - - ExampleUI - getTemperatures - 210 - - ExampleUI - getTemperatures - - widgetExampleUIgetTemperatures - 0 - table - 1 - Advanced tag cloud: with logos and links @@ -2592,22 +2567,20 @@ - Bar graph - Bar graph + ExampleUI_GetTemperaturesDataTable + Data tables 99 ExampleUI getTemperatures 210 - 1 - graphVerticalBar ExampleUI getTemperatures - widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar + widgetExampleUIgetTemperatures 0 - graphVerticalBar + table 1 @@ -2695,6 +2668,33 @@ infoviz-treemap 1 + + Data tables + + ExampleUI_UiFramework + UI Framework + 90 + + + + Bar graph + Bar graph + 99 + + ExampleUI + getTemperatures + 210 + + 1 + graphVerticalBar + ExampleUI + getTemperatures + + widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar + 0 + graphVerticalBar + 1 + Pie graph @@ -2748,7 +2748,7 @@ 1 - Piwik.org Blog + System Summary About Piwik About Piwik @@ -2756,14 +2756,33 @@ - RssWidget - rssPiwik + CoreHome + getSystemSummary + 15 + + CoreHome + getSystemSummary + + widgetCoreHomegetSystemSummary + 0 + + + Premium Products & Services for Piwik + + About Piwik + About Piwik + 99 + + + + ProfessionalServices + promoServices 99 - RssWidget - rssPiwik + ProfessionalServices + promoServices - widgetRssWidgetrssPiwik + widgetProfessionalServicespromoServices 0 @@ -2786,26 +2805,26 @@ 0 - SEO Rankings + Piwik Changelog - SEO - SEO + About Piwik + About Piwik 99 - SEO - getRank + RssWidget + rssChangelog 99 - SEO - getRank + RssWidget + rssChangelog - widgetSEOgetRank + widgetRssWidgetrssChangelog 0 - System Check + Welcome! About Piwik About Piwik @@ -2813,18 +2832,18 @@ - Installation - getSystemCheck - 16 + CoreHome + getPromoVideo + 10 - Installation - getSystemCheck + CoreHome + getPromoVideo - widgetInstallationgetSystemCheck + widgetCoreHomegetPromoVideo 0 - Support Piwik! + Latest Marketplace Updates About Piwik About Piwik @@ -2832,18 +2851,18 @@ - CoreHome - getDonateForm - 5 + Marketplace + getNewPlugins + 19 - CoreHome - getDonateForm + Marketplace + getNewPlugins - widgetCoreHomegetDonateForm + widgetMarketplacegetNewPlugins 0 - Piwik Changelog + Piwik.org Blog About Piwik About Piwik @@ -2852,17 +2871,17 @@ RssWidget - rssChangelog + rssPiwik 99 RssWidget - rssChangelog + rssPiwik - widgetRssWidgetrssChangelog + widgetRssWidgetrssPiwik 0 - Premium Products & Services for Piwik + Premium Features About Piwik About Piwik @@ -2870,18 +2889,18 @@ - ProfessionalServices - promoServices - 99 + Marketplace + getPremiumFeatures + 20 - ProfessionalServices - promoServices + Marketplace + getPremiumFeatures - widgetProfessionalServicespromoServices + widgetMarketplacegetPremiumFeatures 0 - System Summary + System Check About Piwik About Piwik @@ -2889,18 +2908,18 @@ - CoreHome - getSystemSummary - 15 + Installation + getSystemCheck + 16 - CoreHome - getSystemSummary + Installation + getSystemCheck - widgetCoreHomegetSystemSummary + widgetInstallationgetSystemCheck 0 - Latest Marketplace Updates + Support Piwik! About Piwik About Piwik @@ -2908,33 +2927,33 @@ - Marketplace - getNewPlugins - 19 + CoreHome + getDonateForm + 5 - Marketplace - getNewPlugins + CoreHome + getDonateForm - widgetMarketplacegetNewPlugins + widgetCoreHomegetDonateForm 0 - Welcome! + Insights Overview - About Piwik - About Piwik + Insights_WidgetCategory + Insights 99 - CoreHome - getPromoVideo - 10 + Insights + getInsightsOverview + 99 - CoreHome - getPromoVideo + Insights + getInsightsOverview - widgetCoreHomegetPromoVideo + widgetInsightsgetInsightsOverview 0 @@ -2957,7 +2976,7 @@ 0 - Insights Overview + Movers and Shakers Insights_WidgetCategory Insights @@ -2966,32 +2985,32 @@ Insights - getInsightsOverview + getOverallMoversAndShakers 99 Insights - getInsightsOverview + getOverallMoversAndShakers - widgetInsightsgetInsightsOverview + widgetInsightsgetOverallMoversAndShakers 0 - Movers and Shakers + SEO Rankings - Insights_WidgetCategory - Insights + SEO + SEO 99 - Insights - getOverallMoversAndShakers + SEO + getRank 99 - Insights - getOverallMoversAndShakers + SEO + getRank - widgetInsightsgetOverallMoversAndShakers + widgetSEOgetRank 0 \ No newline at end of file -- cgit v1.2.3