From b194c902cdb117075eaeff7435d80828a9ea5ea9 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 23 Oct 2013 16:53:54 +1300
Subject: [PATCH] Refs #472 Adding events in other tests to make sure events
don't regress
---
plugins/Actions/ArchivingHelper.php | 4 ++++
.../Fixtures/OneVisitSeveralPageViews.php | 5 +++++
...SomeVisitsManyPageviewsWithTransitions.php | 17 +++++++++-------
...ThreeSitesWithManyVisitsWithSiteSearch.php | 6 ++++++
...belFilter_dir__Actions.getPageUrls_day.xml | 4 ++--
...ter_dir_range__Actions.getPageUrls_day.xml | 4 ++--
...s_html__Referrers.getSearchEngines_day.xml | 4 ++--
...er_thisiscool__Actions.getPageUrls_day.xml | 2 +-
...esRecursive__Actions.getPageTitles_day.xml | 4 ++--
...lter_titles__Actions.getPageTitles_day.xml | 2 +-
...Site_lastN__API.getProcessedReport_day.xml | 2 +-
...te_lastN__API.getProcessedReport_month.xml | 2 +-
...Site_lastN__API.getProcessedReport_day.xml | 2 +-
...te_lastN__API.getProcessedReport_month.xml | 2 +-
...s.getPageTitlesFollowingSiteSearch_day.xml | 4 ++--
...getPageTitlesFollowingSiteSearch_month.xml | 4 ++--
...ch_AllSites__Actions.getPageTitles_day.xml | 4 ++--
..._AllSites__Actions.getPageTitles_month.xml | 4 ++--
...ons.getPageUrlsFollowingSiteSearch_day.xml | 4 ++--
...s.getPageUrlsFollowingSiteSearch_month.xml | 4 ++--
...arch_AllSites__Actions.getPageUrls_day.xml | 4 ++--
...ch_AllSites__Actions.getPageUrls_month.xml | 4 ++--
...tes__Actions.getSiteSearchKeywords_day.xml | 4 ++--
...s__Actions.getSiteSearchKeywords_month.xml | 4 ++--
...s.getPageTitlesFollowingSiteSearch_day.xml | 4 ++--
...getPageTitlesFollowingSiteSearch_month.xml | 4 ++--
...astNPeriods__Actions.getPageTitles_day.xml | 4 ++--
...tNPeriods__Actions.getPageTitles_month.xml | 4 ++--
...ons.getPageUrlsFollowingSiteSearch_day.xml | 4 ++--
...s.getPageUrlsFollowingSiteSearch_month.xml | 4 ++--
...tLastNPeriods__Actions.getPageUrls_day.xml | 4 ++--
...astNPeriods__Actions.getPageUrls_month.xml | 4 ++--
...s__Actions.getSiteSearchKeywords_month.xml | 4 ++--
...ansitions.getTransitionsForPageUrl_day.xml | 14 ++++++-------
...sitions.getTransitionsForPageUrl_month.xml | 14 ++++++-------
...sitions.getTransitionsForPageTitle_day.xml | 10 +++++-----
...tions.getTransitionsForPageTitle_month.xml | 14 ++++++-------
...ansitions.getTransitionsForPageUrl_day.xml | 16 +++++++++------
...sitions.getTransitionsForPageUrl_month.xml | 20 +++++++++++--------
tests/PHPUnit/UI | 2 +-
40 files changed, 126 insertions(+), 100 deletions(-)
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index fdf3f541eb..6b05338e61 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -356,6 +356,10 @@ class ArchivingHelper
/* @var DataTable $currentTable */
$currentTable =& $actionsTablesByType[$actionType];
+ if(is_null($currentTable)) {
+ throw new \Exception("Action table for type '$actionType' was not found during Actions archiving.");
+ }
+
// check for ranking query cut-off
if ($actionName == DataTable::LABEL_SUMMARY_ROW) {
$summaryRow = $currentTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
diff --git a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
index 53c8dfb538..2f2341dd82 100644
--- a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
+++ b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
@@ -52,6 +52,11 @@ class Test_Piwik_Fixture_OneVisitSeveralPageViews extends Test_Piwik_BaseFixture
$t->setGenerationTime(153);
self::checkResponse($t->doTrackPageView('incredible parent title! <>,; / subtitle <>,;'));
+ $t->setUrl('http://example.org/dir/file.php?foo=bar&foo2=bar2');
+ $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.31)->getDatetime());
+ $t->setGenerationTime(153);
+ self::checkResponse($t->doTrackEvent('Category', 'Action', 'Name', 11111));
+
$t->setUrl('http://example.org/dir2/file.php?foo=bar&foo2=bar');
$t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime());
$t->setGenerationTime(1233);
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index cc8a20e8be..ba7032f177 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -48,8 +48,11 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
$this->trackPageView($tracker, 0.3, 'the/third_page.html?foo=bar');
$this->trackPageView($tracker, 0.4, 'page/one.html');
$this->trackPageView($tracker, 0.5, 'the/third_page.html?foo=bar');
+ $this->trackPageView($tracker, 0.5, 'the/third_page.html?foo=bar');
+ $this->trackPageView($tracker, 0.6, 'page/one.html');
$this->trackPageView($tracker, 0.6, 'page/one.html');
$this->trackPageView($tracker, 0.7, 'the/third_page.html?foo=baz#anchor1');
+ $this->trackPageView($tracker, 0.7, 'the/third_page.html?foo=baz#anchor1');
$this->trackPageView($tracker, 0.8, 'page/one.html');
$this->trackPageView($tracker, 0.9, 'page/one.html');
$this->trackPageView($tracker, 1.0, 'the/third_page.html?foo=baz#anchor2');
@@ -85,15 +88,13 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
// before & after
$tracker->setIp('156.5.3.6');
$tracker->setNewVisitorId();
- $this->trackPageView($tracker, 0, 'page/search.html#q=mykwd', $this->dateTime, $pageViewType = 'site-search',
- $searchKeyword = 'mykwd', $searchCategory = 'mysearchcat');
+ $this->trackPageView($tracker, 0, 'page/search.html#q=mykwd', $this->dateTime, $pageViewType = 'site-search', $searchKeyword = 'mykwd', $searchCategory = 'mysearchcat');
$this->trackPageView($tracker, 0.1, 'page/one.html');
- $this->trackPageView($tracker, 0.2, 'page/search.html#q=anotherkwd', $this->dateTime,
- $pageViewType = 'site-search', $searchKeyword = 'anotherkwd',
- $searchCategory = 'mysearchcat');
+ $this->trackPageView($tracker, 0.2, 'page/search.html#q=anotherkwd', $this->dateTime, $pageViewType = 'site-search', $searchKeyword = 'anotherkwd', $searchCategory = 'mysearchcat');
$this->trackPageView($tracker, 0.25, 'page/one.html');
$this->trackPageView($tracker, 0.3, 'to/outlink/page.html', $this->dateTime, $pageViewType = 'outlink');
$this->trackPageView($tracker, 0.35, 'page/one.html');
+ $this->trackPageView($tracker, 0.11, 'page/search.html#q=thirdkwd', $this->dateTime, $pageViewType = 'event', 'Song name here', 'Music');
$this->trackPageView($tracker, 0.4, '', $this->dateTime, $pageViewType = 'download');
$this->trackPageView($tracker, 0.45, 'page/one.html');
$this->trackPageView($tracker, 0.5, '', $this->dateTime, $pageViewType = 'download');
@@ -104,9 +105,9 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
$laterDate = Date::factory($this->dateTime)->addDay(8)->getDatetime();
$tracker->setIp('156.5.3.7');
$tracker->setNewVisitorId();
- $this->trackPageView($tracker, 0, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'site-search',
- $searchKeyword = 'thirdkwd', $searchCategory = 'mysearchcat');
+ $this->trackPageView($tracker, 0, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'site-search', $searchKeyword = 'thirdkwd', $searchCategory = 'mysearchcat');
$this->trackPageView($tracker, 0.1, 'page/one.html', $laterDate);
+ $this->trackPageView($tracker, 0.11, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'event', 'Song name here', 'Music');
$this->trackPageView($tracker, 0.15, 'to/another/outlink.html', $laterDate, $pageViewType = 'outlink');
$this->trackPageView($tracker, 0.2, 'page/one.html', $laterDate);
$this->trackPageView($tracker, 0.25, '', $laterDate, $pageViewType = 'download');
@@ -143,6 +144,8 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
self::assertTrue($visit->doTrackAction($downloadUrl, 'download'));
} else if ($pageViewType == 'site-search') {
self::assertTrue($visit->doTrackSiteSearch($searchKeyword, $searchCategory, $this->prefixCounter));
+ } else if ($pageViewType == 'event') {
+ self::assertTrue($visit->doTrackEvent($searchCategory, "event name", $searchKeyword, $this->prefixCounter));
}
}
}
diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
index 0280e3661f..353ad4ec31 100644
--- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
+++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
@@ -70,6 +70,9 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw
$visitor->setUrl('http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE');
self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE'));
+ $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.24)->getDatetime());
+ self::checkResponse($visitor->doTrackEvent("Event CAT", "Event ACTION", "Event NAME", $count = 3.33));
+
$visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.25)->getDatetime());
$visitor->setUrl('http://example.org/index.htm?standard=query&but=also#hash&q=' . urlencode('Search 1'));
self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment'));
@@ -113,6 +116,9 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw
$visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.42)->getDatetime());
self::checkResponse($visitor->doTrackSiteSearch("Keyword - Tracking API", "Category", $count = 5));
+ $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.425)->getDatetime());
+ self::checkResponse($visitor->doTrackEvent("Event CAT", "Event ACTION", "Event NAME", $count));
+
$visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.43)->getDatetime());
self::checkResponse($visitor->doTrackSiteSearch("No Result Keyword!", "Bad No Result Category :(", $count = 0));
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
index 0e48fa0611..f5d57d7a79 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
@@ -4,11 +4,11 @@
<label>dir</label>
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>720</sum_time_spent>
+ <sum_time_spent>684</sum_time_spent>
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.123</min_time_generation>
<max_time_generation>0.153</max_time_generation>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>342</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.138</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
index 12f05836b0..9ece84f6b1 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
@@ -5,11 +5,11 @@
<label>dir</label>
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>720</sum_time_spent>
+ <sum_time_spent>684</sum_time_spent>
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.123</min_time_generation>
<max_time_generation>0.153</max_time_generation>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>342</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.138</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index a9787b043a..ea194078ed 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
@@ -4,8 +4,8 @@
<label><>&\"the pdo extension is required for this adapter but the extension is not loaded</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>6</max_actions>
+ <nb_actions>7</nb_actions>
+ <max_actions>7</max_actions>
<sum_visit_length>1441</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
index 143b7b6035..bbbd02dd81 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
@@ -11,7 +11,7 @@
<max_time_generation>0.523</max_time_generation>
<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
<entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
+ <entry_nb_actions>7</entry_nb_actions>
<entry_sum_visit_length>1441</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>720</avg_time_on_page>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
index bf311ea708..718edc60ac 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
@@ -5,11 +5,11 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
- <sum_time_spent>360</sum_time_spent>
+ <sum_time_spent>324</sum_time_spent>
<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
<min_time_generation>0.153</min_time_generation>
<max_time_generation>0.153</max_time_generation>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>324</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.153</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
index c0b8a2e8e1..667e9fcd90 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
@@ -11,7 +11,7 @@
<max_time_generation>1.233</max_time_generation>
<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
<entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
+ <entry_nb_actions>7</entry_nb_actions>
<entry_sum_visit_length>1441</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>1080</avg_time_on_page>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 5615f1f837..c4b69d4157 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <avg_time_on_page>00:04:12</avg_time_on_page>
+ <avg_time_on_page>00:03:36</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
index e085a65084..8437bbfd21 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <avg_time_on_page>00:04:12</avg_time_on_page>
+ <avg_time_on_page>00:03:36</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 4d60e7116f..be049f4a08 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <avg_time_on_page>00:04:12</avg_time_on_page>
+ <avg_time_on_page>00:03:36</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index 80e35d17fe..5d5eef484a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <avg_time_on_page>00:04:12</avg_time_on_page>
+ <avg_time_on_page>00:03:36</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 42a3ffc50f..7ea5167dfd 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -18,9 +18,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
index df9d619c48..86ae401b60 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -17,10 +17,10 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
index 1844fe3ea9..9dc49472a7 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
@@ -30,9 +30,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
index 916f77350d..d9462f0f36 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
@@ -29,10 +29,10 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
index f2cd38abff..74ece58337 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -19,9 +19,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
index f3520679b3..1c66040802 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -18,10 +18,10 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index 59ae27f868..ff058d70eb 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
@@ -32,9 +32,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index 06cee59080..87e23ee986 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
@@ -31,10 +31,10 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index df088f8ae0..4798b08e6e 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
@@ -50,9 +50,9 @@
<label>Keyword - Tracking API</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>72</sum_time_spent>
+ <sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>72</avg_time_on_page>
+ <avg_time_on_page>54</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 777e926046..5b6e7c4828 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
@@ -48,9 +48,9 @@
<label>Keyword - Tracking API</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>72</sum_time_spent>
+ <sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>72</avg_time_on_page>
+ <avg_time_on_page>54</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
index e10559a3ff..66f8e8a41d 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -16,9 +16,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 6acd58438c..450ab9b87a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -15,10 +15,10 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
index ea5dc0727f..200b1c3565 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
@@ -28,9 +28,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
index e93e5be074..3adcd2fca8 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
@@ -27,10 +27,10 @@
<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
index fd921c75d2..3fbf138c64 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -17,9 +17,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 39ff15c590..77a97cfa0b 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -16,10 +16,10 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index fe8ca37c19..f709bef598 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
@@ -30,9 +30,9 @@
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index f7e45561de..a7eeb309c9 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
@@ -29,10 +29,10 @@
<label>/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>252</sum_time_spent>
+ <sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>252</avg_time_on_page>
+ <avg_time_on_page>216</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 7de408b2e2..3e1015bd31 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
@@ -46,9 +46,9 @@
<label>Keyword - Tracking API</label>
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>72</sum_time_spent>
+ <sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>72</avg_time_on_page>
+ <avg_time_on_page>54</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 08f9e6371c..71f56cb486 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>1</loops>
- <pageviews>17</pageviews>
+ <loops>2</loops>
+ <pageviews>18</pageviews>
<entries>4</entries>
- <exits>3</exits>
+ <exits>2</exits>
</pageMetrics>
<followingPages>
<row>
@@ -38,7 +38,7 @@
</row>
<row>
<label>Others</label>
- <referrals>3</referrals>
+ <referrals>4</referrals>
</row>
</followingPages>
<followingSiteSearches>
@@ -49,7 +49,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -59,11 +59,11 @@
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index f7efa407b4..22113d06bb 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>1</loops>
- <pageviews>20</pageviews>
+ <loops>2</loops>
+ <pageviews>21</pageviews>
<entries>4</entries>
- <exits>3</exits>
+ <exits>1</exits>
</pageMetrics>
<followingPages>
<row>
@@ -38,7 +38,7 @@
</row>
<row>
<label>Others</label>
- <referrals>3</referrals>
+ <referrals>5</referrals>
</row>
</followingPages>
<followingSiteSearches>
@@ -49,7 +49,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -63,11 +63,11 @@
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
index c525d6e196..380f8c0fe5 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
@@ -30,8 +30,8 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>4</loops>
- <pageviews>16</pageviews>
+ <loops>5</loops>
+ <pageviews>17</pageviews>
<entries>3</entries>
<exits>-1</exits>
</pageMetrics>
@@ -65,7 +65,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -75,11 +75,11 @@
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
index fd16ae1d5b..2e262a752e 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
@@ -34,8 +34,8 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>6</loops>
- <pageviews>19</pageviews>
+ <loops>7</loops>
+ <pageviews>20</pageviews>
<entries>3</entries>
<exits>-3</exits>
</pageMetrics>
@@ -69,7 +69,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -77,21 +77,21 @@
<referrals>1</referrals>
</row>
<row>
- <label>https://anothersite.com/to/another/outlink.html</label>
+ <label>http://anothersite.com/to/another/outlink.html</label>
<referrals>1</referrals>
</row>
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://www.example.org/downloads/38.tar.gz</label>
+ <label>https://example.org/downloads/43.tar.gz</label>
<referrals>1</referrals>
</row>
</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index d950a5b23f..b246688e1c 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>1</loops>
- <pageviews>17</pageviews>
+ <loops>2</loops>
+ <pageviews>18</pageviews>
<entries>4</entries>
- <exits>3</exits>
+ <exits>2</exits>
</pageMetrics>
<followingPages>
<row>
@@ -44,6 +44,10 @@
<label>example.org/page3.html</label>
<referrals>1</referrals>
</row>
+ <row>
+ <label>example.org/page/search.html</label>
+ <referrals>1</referrals>
+ </row>
</followingPages>
<followingSiteSearches>
<row>
@@ -53,7 +57,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -63,11 +67,11 @@
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index fd99b73f58..a7cd380666 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
</row>
</previousSiteSearches>
<pageMetrics>
- <loops>1</loops>
- <pageviews>20</pageviews>
+ <loops>2</loops>
+ <pageviews>21</pageviews>
<entries>4</entries>
- <exits>3</exits>
+ <exits>1</exits>
</pageMetrics>
<followingPages>
<row>
@@ -40,6 +40,10 @@
<label>example.org/the/third_page.html?foo=bar</label>
<referrals>2</referrals>
</row>
+ <row>
+ <label>example.org/page/search.html</label>
+ <referrals>2</referrals>
+ </row>
<row>
<label>example.org/page3.html</label>
<referrals>1</referrals>
@@ -53,7 +57,7 @@
</followingSiteSearches>
<outlinks>
<row>
- <label>https://anothersite.com/to/outlink/page.html</label>
+ <label>http://www.anothersite.com/to/outlink/page.html</label>
<referrals>1</referrals>
</row>
<row>
@@ -61,21 +65,21 @@
<referrals>1</referrals>
</row>
<row>
- <label>https://anothersite.com/to/another/outlink.html</label>
+ <label>http://anothersite.com/to/another/outlink.html</label>
<referrals>1</referrals>
</row>
</outlinks>
<downloads>
<row>
- <label>http://example.org/downloads/29.tar.gz</label>
+ <label>http://example.org/downloads/33.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>https://example.org/downloads/31.tar.gz</label>
+ <label>https://example.org/downloads/35.tar.gz</label>
<referrals>1</referrals>
</row>
<row>
- <label>http://www.example.org/downloads/38.tar.gz</label>
+ <label>https://example.org/downloads/43.tar.gz</label>
<referrals>1</referrals>
</row>
</downloads>
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 64f408608a..b42f538c50 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 64f408608a90fb6d199698b34f053de2a7aa0ba0
+Subproject commit b42f538c5002b787cf99b759fe9ad6f059233f32
--
GitLab