diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-02-11 06:26:42 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-02-11 06:26:42 +0400 |
| commit | 0e4d5e8ebf4c2ec46ab06e2b0c88f7bb2d9d3ce5 (patch) | |
| tree | 192e4688b17c1e7b03e5359e087e044894880ef7 | |
| parent | 4124ad4e250b0e62d8a21627e425b5f2b6c3845b (diff) | |
Fixing tests
5 files changed, 143 insertions, 5 deletions
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php index d299d64818..8d32b5d1fc 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php @@ -139,12 +139,12 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ self::$idSite1, "Site 1", $urls = null, $ecommerce = null, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null, - $startDate = null, $excludedUserAgents = null, $keepURLFragments = 2); // No for idSite 1 + $startDate = null, $excludedUserAgents = null, $keepURLFragments = 2); // KEEP_URL_FRAGMENT_NO No for idSite 1 Piwik_SitesManager_API::getInstance()->updateSite( self::$idSite2, "Site 2", $urls = null, $ecommerce = null, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null, - $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); // Yes for idSite 2 + $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); // KEEP_URL_FRAGMENT_YES Yes for idSite 2 } protected static function trackVisits() @@ -212,7 +212,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ $visitorAsite2 = self::getTracker($idSite2, Piwik_Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true); $visitorAsite2->setUserAgent('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0;)'); $visitorAsite2->setUrlReferrer('http://only-homepage-referer.com/'); - $visitorAsite2->setUrl('http://example2.com/home#notIgnoredFragment'); + $visitorAsite2->setUrl('http://example2.com/home#notIgnoredFragment#'); $visitorAsite2->DEBUG_APPEND_URL = '&_idts=' . Piwik_Date::factory($dateTime)->addHour(24)->getTimestamp(); self::checkResponse($visitorAsite2->doTrackPageView('Website 2 page view')); // test with invalid URL diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html index 01f8b96950..9185c3bc64 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html @@ -240,6 +240,11 @@ Operating System Family Mobile vs Desktop </a> </li> +<li> +<a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> +Browser language +</a> +</li> </ul><a name ="MultiSites_getAll"/> <h2 style="color: rgb(126,115,99); font-size: 11pt;"> All Websites dashboard @@ -4533,5 +4538,69 @@ Mobile <br/> <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop"> Back to top +</a><a name ="UserSettings_getLanguage"/> +<h2 style="color: rgb(126,115,99); font-size: 11pt;"> +Browser language +</h2> +<img +alt="" +src="data:image/png;base64,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" +height="200" +width="700" /> +<br/> +<br/> +<table style="border-collapse:collapse; margin-left: 5px"> +<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> +<th style="padding: 6px 0;"> + Language +</th> +<th style="padding: 6px 0;"> + Visits +</th> +<th style="padding: 6px 0;"> + Actions +</th> +<th style="padding: 6px 0;"> + Actions per Visit +</th> +<th style="padding: 6px 0;"> + Avg. Time on Website +</th> +<th style="padding: 6px 0;"> + Bounce Rate +</th> +<th style="padding: 6px 0;"> + Conversion Rate +</th> +</thead> +<tbody> +<tr style=""> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +French +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +3 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +8 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +2.67 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +00:07:01 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +33.33% +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +0% +</td> +</tr> +</tbody> +</table> +<br/> +<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop"> +Back to top </a></body> </html>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf Binary files differindex 8509d7b00e..011a074875 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html index cdb6e9c0cd..11f5168af2 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html @@ -300,6 +300,11 @@ Operating System Family Mobile vs Desktop </a> </li> +<li> +<a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);"> +Browser language +</a> +</li> </ul><a name ="MultiSites_getAll"/> <h2 style="color: rgb(126,115,99); font-size: 11pt;"> All Websites dashboard @@ -6410,5 +6415,69 @@ Mobile <br/> <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop"> Back to top +</a><a name ="UserSettings_getLanguage"/> +<h2 style="color: rgb(126,115,99); font-size: 11pt;"> +Browser language +</h2> +<img +alt="" +src="data:image/png;base64,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" +height="200" +width="700" /> +<br/> +<br/> +<table style="border-collapse:collapse; margin-left: 5px"> +<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> +<th style="padding: 6px 0;"> + Language +</th> +<th style="padding: 6px 0;"> + Visits +</th> +<th style="padding: 6px 0;"> + Actions +</th> +<th style="padding: 6px 0;"> + Actions per Visit +</th> +<th style="padding: 6px 0;"> + Avg. Time on Website +</th> +<th style="padding: 6px 0;"> + Bounce Rate +</th> +<th style="padding: 6px 0;"> + Conversion Rate +</th> +</thead> +<tbody> +<tr style=""> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +French +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +5 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +16 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +3.2 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +00:22:49 +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +20% +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +80% +</td> +</tr> +</tbody> +</table> +<br/> +<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop"> +Back to top </a></body> </html>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index b27707201a..7e5a08ea2b 100755 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -33,8 +33,8 @@ <nb_hits>The number of times this page was visited.</nb_hits> <exit_rate>The percentage of visits that left the website after viewing this page.</exit_rate> </metricsDocumentation> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2010-01-03&idSubtable=9</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2009-12-05,2010-01-03&idSubtable=9</imageGraphEvolutionUrl> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2010-01-03&idSubtable=</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2009-12-05,2010-01-03&idSubtable=</imageGraphEvolutionUrl> <uniqueId>CustomVariables_getCustomVariablesValuesFromNameId</uniqueId> </metadata> <columns> |