Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2016-09-19 11:10:47 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2016-09-19 11:10:47 +0300
commit39b5cba5c03fe928378bc5c147cda3b260bb23ac (patch)
tree68038658606cb00528686813ba31268b1147603e /tests/PHPUnit/Fixtures
parentec18522eecc8af49e74eb2e86510f36bb7c836b4 (diff)
Make sure to set an entry page if none was set before (#10510)
* make sure to set an entry page if none is set yet * fix possible error * Site searches will set idaction=0, which is actually a valid entry page url, so we test specifically for false * Add test case where the visit directly starts with an event * Add system test where the first actions of a visit are events (without URL set), followed by a pageview later -> the pageview will be set as the entry page * Update processed api responses * UI tests: two new fields in log_visit have been updated * Processed API responses
Diffstat (limited to 'tests/PHPUnit/Fixtures')
-rw-r--r--tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
index cd2a714ab2..fc3f12d979 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
@@ -49,6 +49,11 @@ class TwoVisitsWithCustomEvents extends Fixture
$uselocal = false;
$vis = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal);
+ // $vis will start with a pageview, while $vis2 will directly start with the event
+ $vis->setUrl('http://example.org/webradio');
+ $vis->setGenerationTime(333);
+ self::checkResponse($vis->doTrackPageView('Welcome!'));
+
$this->trackMusicPlaying($vis);
$this->trackMusicRatings($vis);
$this->trackEventWithoutUrl($vis);
@@ -81,10 +86,6 @@ class TwoVisitsWithCustomEvents extends Fixture
protected function trackMusicPlaying(PiwikTracker $vis)
{
- $vis->setUrl('http://example.org/webradio');
- $vis->setGenerationTime(333);
- self::checkResponse($vis->doTrackPageView('Welcome!'));
-
$this->moveTimeForward($vis, 1);
$this->setMusicEventCustomVar($vis);
self::checkResponse($vis->doTrackEvent('Music', 'play', 'La fiancée de l\'eau'));