diff options
| author | Matthieu Aubry <matt@piwik.org> | 2016-04-19 03:18:17 +0300 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2016-04-19 03:18:17 +0300 |
| commit | 823a06ac0d22ccbf14b0b5934707f0c00a6e0eec (patch) | |
| tree | aae1c2a0535cc2c59a5da5d77c5bd7fc2b5d9371 /tests | |
| parent | 030922c1d9e6eea83472d5819e7b88a0454d4f2d (diff) | |
Trigger a Goal conversion for "Event matching goals" even when an event is tracked without a URL (#10018)
* use idGoal parameter in system tests
* Trigger a Goal conversion for "Event matching goals" even when an event is tracked without a URL
* Test files for green build
* Add new expected test file
Diffstat (limited to 'tests')
33 files changed, 656 insertions, 237 deletions
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php index 9fbff49def..cd2a714ab2 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php @@ -19,7 +19,7 @@ class TwoVisitsWithCustomEvents extends Fixture { public $dateTime = '2010-01-03 11:22:33'; public $idSite = 1; - public $idGoal1 = 1; + public static $idGoalTriggeredOnEventCategory = 3; public function setUp() { @@ -38,6 +38,9 @@ class TwoVisitsWithCustomEvents extends Fixture // These two goals are to check events don't trigger for URL or Title matching APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'url', 'webradio', 'contains'); APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'title', 'Music', 'contains'); + $idGoalTriggeredOnEventCategory = APIGoals::getInstance()->addGoal($this->idSite, 'event matching', 'event_category', 'CategoryTriggersGoal', 'contains'); + + $this->assertEquals($idGoalTriggeredOnEventCategory, self::$idGoalTriggeredOnEventCategory); } } @@ -48,6 +51,7 @@ class TwoVisitsWithCustomEvents extends Fixture $this->trackMusicPlaying($vis); $this->trackMusicRatings($vis); + $this->trackEventWithoutUrl($vis); $this->trackMovieWatchingIncludingInterval($vis); $this->dateTime = Date::factory($this->dateTime)->addHour(0.5); @@ -67,6 +71,14 @@ class TwoVisitsWithCustomEvents extends Fixture return $vis->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($hour)->getDatetime()); } + protected function trackEventWithoutUrl(PiwikTracker $vis) + { + $url = $vis->pageUrl; + $vis->setUrl(''); + self::checkResponse($vis->doTrackEvent('CategoryTriggersGoal here', 'This is an event without a URL')); + $vis->setUrl($url); + } + protected function trackMusicPlaying(PiwikTracker $vis) { $vis->setUrl('http://example.org/webradio'); diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php index 3669d5aa20..f0eef83354 100644 --- a/tests/PHPUnit/System/CustomEventsTest.php +++ b/tests/PHPUnit/System/CustomEventsTest.php @@ -18,6 +18,9 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents; */ class CustomEventsTest extends SystemTestCase { + /** + * @var TwoVisitsWithCustomEvents + */ public static $fixture = null; // initialized below class definition /** @@ -83,15 +86,15 @@ class CustomEventsTest extends SystemTestCase 'testSuffix' => '_segmentMatchesEventActionPlay') ), - // eventValue should not match any page view -// array('Actions.getPageUrls', array( -// 'idSite' => $idSite1, -// 'date' => $dateTime, -// 'periods' => $dayPeriod, -// 'segment' => "eventValue>0", -// 'setDateLastN' => false, -// 'testSuffix' => '_eventSegmentMatchNoAction') -// ), + // Goals and events + array('Goals.get', array( + 'idSite' => $idSite1, + 'date' => $dateTime, + 'periods' => $dayPeriod, + 'idGoal' => TwoVisitsWithCustomEvents::$idGoalTriggeredOnEventCategory, + 'setDateLastN' => false) + ) + ); $apiToCallProcessedReportMetadata = array( diff --git a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php index 31a3646e71..3ef1040f7f 100755 --- a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php @@ -263,8 +263,8 @@ class EcommerceOrderWithItemsTest extends SystemTestCase array('Goals.get', array('idSite' => $idSite, 'date' => $dateTime, 'periods' => array('week'), + 'idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER, 'otherRequestParameters' => array( - 'idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER, 'columns' => 'avg_order_revenue'), 'testSuffix' => '_AvgOrderRevenue')), diff --git a/tests/PHPUnit/System/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php index efdf021061..16ad1c4b3f 100755 --- a/tests/PHPUnit/System/RowEvolutionTest.php +++ b/tests/PHPUnit/System/RowEvolutionTest.php @@ -118,17 +118,18 @@ class RowEvolutionTest extends SystemTestCase // Goals > Visits Until Conversion, idGoal != 0 $config['testSuffix'] = '_goals_visitsUntilConversion'; $config['periods'] = array('day'); + $config['idGoal'] = '2'; $config['otherRequestParameters']['date'] = '2010-02-06,2010-03-06'; $config['otherRequestParameters']['period'] = 'day'; $config['otherRequestParameters']['apiModule'] = 'Goals'; $config['otherRequestParameters']['apiAction'] = 'getVisitsUntilConversion'; $config['otherRequestParameters']['label'] = ('1 visit, 2 visits'); - $config['otherRequestParameters']['idGoal'] = '2'; $return[] = array('API.getRowEvolution', $config); // Goals > Visits Until Conversion, idGoal != 0, without specifying labels $config['testSuffix'] = '_goals_visitsUntilConversion_WithoutLabels'; $config['periods'] = array('day'); + $config['idGoal'] = '2'; $config['otherRequestParameters']['date'] = '2010-02-06,2010-03-06'; $config['otherRequestParameters']['period'] = 'day'; $config['otherRequestParameters']['apiModule'] = 'Goals'; @@ -136,7 +137,6 @@ class RowEvolutionTest extends SystemTestCase $config['otherRequestParameters']['label'] = false; $config['otherRequestParameters']['filter_limit'] = 2; $config['otherRequestParameters']['filter_sort_column'] = 'nb_conversions'; - $config['otherRequestParameters']['idGoal'] = '2'; $return[] = array('API.getRowEvolution', $config); // test date range where most recent date has no data (for #3465) diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index 235eb8744e..76a2a559ea 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -213,6 +213,15 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -231,7 +240,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 9554b5beca..649376535a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -150,6 +150,15 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -163,61 +172,64 @@ <row> <segment>eventAction==playTrailer</segment> - <idsubdatatable>807</idsubdatatable> + <idsubdatatable>848</idsubdatatable> </row> <row> <segment>eventAction==Search</segment> - <idsubdatatable>800</idsubdatatable> + <idsubdatatable>841</idsubdatatable> </row> <row> <segment>eventAction==play25%25</segment> - <idsubdatatable>802</idsubdatatable> + <idsubdatatable>843</idsubdatatable> </row> <row> <segment>eventAction==play50%25</segment> - <idsubdatatable>803</idsubdatatable> + <idsubdatatable>844</idsubdatatable> </row> <row> <segment>eventAction==play75%25</segment> - <idsubdatatable>804</idsubdatatable> + <idsubdatatable>845</idsubdatatable> </row> <row> <segment>eventAction==playEnd</segment> - <idsubdatatable>805</idsubdatatable> + <idsubdatatable>846</idsubdatatable> </row> <row> <segment>eventAction==rating</segment> - <idsubdatatable>806</idsubdatatable> + <idsubdatatable>847</idsubdatatable> </row> <row> <segment>eventAction==clickBuyNow</segment> - <idsubdatatable>808</idsubdatatable> + <idsubdatatable>849</idsubdatatable> </row> <row> <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>810</idsubdatatable> + <idsubdatatable>851</idsubdatatable> </row> <row> <segment>eventAction==play</segment> - <idsubdatatable>801</idsubdatatable> + <idsubdatatable>842</idsubdatatable> </row> <row> <segment>eventAction==playStart</segment> - <idsubdatatable>809</idsubdatatable> + <idsubdatatable>850</idsubdatatable> </row> <row> <segment>eventAction==Purchase</segment> </row> + <row> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -227,7 +239,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml index 97ac365384..fa987fd80f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml @@ -195,6 +195,15 @@ <max_event_value>10</max_event_value> <avg_event_value>9.5</avg_event_value> </row> + <row> + <label>CategoryTriggersGoal here - This is an event without a URL</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -213,7 +222,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index c541958923..f95203c60b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -69,6 +69,15 @@ <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -82,17 +91,22 @@ <row> <segment>eventCategory==Movie</segment> - <idsubdatatable>745</idsubdatatable> + <idsubdatatable>784</idsubdatatable> </row> <row> <segment>eventCategory==Music</segment> - <idsubdatatable>746</idsubdatatable> + <idsubdatatable>785</idsubdatatable> </row> <row> <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>747</idsubdatatable> + <idsubdatatable>786</idsubdatatable> + </row> + <row> + + <segment>eventCategory==CategoryTriggersGoal+here</segment> + <idsubdatatable>787</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010" /> @@ -103,7 +117,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml index 6cdeaabe5a..3ad8fa53f8 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml @@ -222,6 +222,15 @@ <max_event_value>9.66</max_event_value> <avg_event_value>9.66</avg_event_value> </row> + <row> + <label>Event Name not defined - This is an event without a URL</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Monday, January 4, 2010" /> <result prettyDate="Tuesday, January 5, 2010" /> @@ -240,7 +249,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index cd0dfb593d..ac0f1dd702 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -62,7 +62,7 @@ </row> <row> <label>Event Name not defined</label> - <nb_events>6</nb_events> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> @@ -118,36 +118,36 @@ <row> <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> - <idsubdatatable>873</idsubdatatable> + <idsubdatatable>914</idsubdatatable> </row> <row> <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> - <idsubdatatable>872</idsubdatatable> + <idsubdatatable>913</idsubdatatable> </row> <row> - <idsubdatatable>871</idsubdatatable> + <idsubdatatable>912</idsubdatatable> </row> <row> <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>877</idsubdatatable> + <idsubdatatable>918</idsubdatatable> </row> <row> <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> - <idsubdatatable>875</idsubdatatable> + <idsubdatatable>916</idsubdatatable> </row> <row> <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> - <idsubdatatable>874</idsubdatatable> + <idsubdatatable>915</idsubdatatable> </row> <row> <segment>eventName==Search+query+here</segment> - <idsubdatatable>876</idsubdatatable> + <idsubdatatable>917</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010" /> @@ -158,7 +158,7 @@ <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> - <nb_visits>42</nb_visits> - <nb_uniq_visitors>40</nb_uniq_visitors> + <nb_visits>43</nb_visits> + <nb_uniq_visitors>41</nb_uniq_visitors> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml index 2539c55bb3..445b742211 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml @@ -29,7 +29,7 @@ <max_time_generation>0.333</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>30</entry_nb_actions> + <entry_nb_actions>31</entry_nb_actions> <entry_sum_visit_length>7202</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <avg_time_on_page>1499</avg_time_on_page> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml index dfbc1b65a0..0b56a1fbd5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml @@ -27,7 +27,7 @@ <min_time_generation>0.333</min_time_generation> <max_time_generation>0.333</max_time_generation> <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>30</entry_nb_actions> + <entry_nb_actions>31</entry_nb_actions> <entry_sum_visit_length>7202</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml index 529442b5c2..6dcae08f50 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml @@ -364,4 +364,16 @@ <avg_event_value>0</avg_event_value> <segment>eventAction==Purchase</segment> </row> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml index 3c9792b64e..38da7199d0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml @@ -364,4 +364,16 @@ <avg_event_value>0</avg_event_value> <segment>eventAction==Purchase</segment> </row> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml index 705ab95996..8b98dbd18e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml @@ -229,4 +229,29 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + <subtable> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml index 0ec9655add..ced40076d2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml @@ -229,4 +229,29 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + <subtable> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml index 83e54f1311..0b77d852e2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml @@ -184,9 +184,9 @@ </row> <row> <label>Event Name not defined</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> @@ -215,6 +215,17 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml index 98c7fa3bad..66d8473330 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml @@ -184,13 +184,13 @@ </row> <row> <label>Event Name not defined</label> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> <subtable> <row> @@ -215,6 +215,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml new file mode 100644 index 0000000000..40d1317d97 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>0</revenue> + <conversion_rate>10%</conversion_rate> + <nb_conversions_new_visit>1</nb_conversions_new_visit> + <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit> + <revenue_new_visit>0</revenue_new_visit> + <conversion_rate_new_visit>10%</conversion_rate_new_visit> + <nb_conversions_returning_visit>0</nb_conversions_returning_visit> + <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> + <revenue_returning_visit>0</revenue_returning_visit> + <conversion_rate_returning_visit>0%</conversion_rate_returning_visit> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 81d8899dcf..ccccf3da47 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -9,9 +9,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>21</pageId> + <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -114,9 +114,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -219,9 +219,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>16</pageId> + <pageId>17</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -233,9 +233,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>17</pageId> + <pageId>18</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -247,9 +247,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>19</pageId> + <pageId>20</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> @@ -261,9 +261,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>22</pageId> + <pageId>23</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -277,7 +277,7 @@ <url /> <pageIdAction /> - <pageId>23</pageId> + <pageId>24</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -290,9 +290,9 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>25</pageIdAction> + <pageIdAction>27</pageIdAction> - <pageId>24</pageId> + <pageId>25</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> @@ -397,9 +397,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>18</pageId> + <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -500,6 +500,17 @@ <actionDetails> <row> + <type>goal</type> + <goalName>triggered js</goalName> + <goalId>1</goalId> + <revenue>0</revenue> + <goalPageId>1</goalPageId> + + <url>http://example.org/webradio</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>action</type> <url>http://example.org/webradio</url> <pageTitle>Welcome!</pageTitle> @@ -513,17 +524,6 @@ </row> <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - <revenue>0</revenue> - <goalPageId>1</goalPageId> - - <url>http://example.org/webradio</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>event</type> <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> @@ -660,6 +660,30 @@ </customVariables> <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon>plugins/Morpheus/images/event.png</icon> + + </row> + <row> + <type>goal</type> + <goalName>event matching</goalName> + <goalId>3</goalId> + <revenue>0</revenue> + <goalPageId>9</goalPageId> + + <url /> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> + <type>event</type> + <url /> + <pageIdAction /> + + <pageId>9</pageId> + <eventCategory>CategoryTriggersGoal here</eventCategory> + <eventAction>This is an event without a URL</eventAction> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -669,9 +693,9 @@ <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> - <pageIdAction>13</pageIdAction> + <pageIdAction>15</pageIdAction> - <pageId>9</pageId> + <pageId>10</pageId> <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -681,9 +705,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>10</pageId> + <pageId>11</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> @@ -695,9 +719,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>11</pageId> + <pageId>12</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> @@ -709,9 +733,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>12</pageId> + <pageId>13</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -723,9 +747,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>13</pageId> + <pageId>14</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -737,9 +761,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>14</pageId> + <pageId>15</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -751,9 +775,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>15</pageId> + <pageId>16</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -761,7 +785,7 @@ </row> </actionDetails> - <goalConversions>1</goalConversions> + <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> @@ -782,7 +806,7 @@ <visitDuration>3601</visitDuration> <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> - <actions>15</actions> + <actions>16</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -809,7 +833,7 @@ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <events>13</events> + <events>14</events> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -857,9 +881,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>45</pageId> + <pageId>46</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -958,9 +982,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>44</pageId> + <pageId>45</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -1059,9 +1083,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>40</pageId> + <pageId>41</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1073,9 +1097,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>41</pageId> + <pageId>42</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1087,9 +1111,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>43</pageId> + <pageId>44</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> @@ -1101,9 +1125,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>46</pageId> + <pageId>47</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1117,7 +1141,7 @@ <url /> <pageIdAction /> - <pageId>47</pageId> + <pageId>48</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1130,9 +1154,9 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>25</pageIdAction> + <pageIdAction>27</pageIdAction> - <pageId>48</pageId> + <pageId>49</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> @@ -1233,9 +1257,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>42</pageId> + <pageId>43</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -1337,7 +1361,7 @@ <pageTitle>Welcome!</pageTitle> <pageIdAction>2</pageIdAction> - <pageId>25</pageId> + <pageId>26</pageId> <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -1349,7 +1373,7 @@ <goalName>triggered js</goalName> <goalId>1</goalId> <revenue>0</revenue> - <goalPageId>25</goalPageId> + <goalPageId>26</goalPageId> <url>http://example.org/webradio</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1360,7 +1384,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>26</pageId> + <pageId>27</pageId> <eventCategory>Music</eventCategory> <eventAction>play</eventAction> <customVariables> @@ -1380,7 +1404,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>27</pageId> + <pageId>28</pageId> <eventCategory>Music</eventCategory> <eventAction>play25%</eventAction> <customVariables> @@ -1400,7 +1424,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>28</pageId> + <pageId>29</pageId> <eventCategory>Music</eventCategory> <eventAction>play50%</eventAction> <customVariables> @@ -1420,7 +1444,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>29</pageId> + <pageId>30</pageId> <eventCategory>Music</eventCategory> <eventAction>play75%</eventAction> <customVariables> @@ -1440,7 +1464,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>30</pageId> + <pageId>31</pageId> <eventCategory>Music</eventCategory> <eventAction>playEnd</eventAction> <customVariables> @@ -1460,7 +1484,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>31</pageId> + <pageId>32</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -1481,7 +1505,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -1501,9 +1525,9 @@ <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> - <pageIdAction>13</pageIdAction> + <pageIdAction>15</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -1513,9 +1537,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> @@ -1527,9 +1551,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> @@ -1541,9 +1565,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1555,9 +1579,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1569,9 +1593,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1583,9 +1607,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>39</pageId> + <pageId>40</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 81d8899dcf..ccccf3da47 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -9,9 +9,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>21</pageId> + <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -114,9 +114,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -219,9 +219,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>16</pageId> + <pageId>17</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -233,9 +233,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>17</pageId> + <pageId>18</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -247,9 +247,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>19</pageId> + <pageId>20</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> @@ -261,9 +261,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>22</pageId> + <pageId>23</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -277,7 +277,7 @@ <url /> <pageIdAction /> - <pageId>23</pageId> + <pageId>24</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -290,9 +290,9 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>25</pageIdAction> + <pageIdAction>27</pageIdAction> - <pageId>24</pageId> + <pageId>25</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> @@ -397,9 +397,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>18</pageId> + <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -500,6 +500,17 @@ <actionDetails> <row> + <type>goal</type> + <goalName>triggered js</goalName> + <goalId>1</goalId> + <revenue>0</revenue> + <goalPageId>1</goalPageId> + + <url>http://example.org/webradio</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> <type>action</type> <url>http://example.org/webradio</url> <pageTitle>Welcome!</pageTitle> @@ -513,17 +524,6 @@ </row> <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - <revenue>0</revenue> - <goalPageId>1</goalPageId> - - <url>http://example.org/webradio</url> - <icon>plugins/Morpheus/images/goal.png</icon> - - </row> - <row> <type>event</type> <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> @@ -660,6 +660,30 @@ </customVariables> <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon>plugins/Morpheus/images/event.png</icon> + + </row> + <row> + <type>goal</type> + <goalName>event matching</goalName> + <goalId>3</goalId> + <revenue>0</revenue> + <goalPageId>9</goalPageId> + + <url /> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> + <type>event</type> + <url /> + <pageIdAction /> + + <pageId>9</pageId> + <eventCategory>CategoryTriggersGoal here</eventCategory> + <eventAction>This is an event without a URL</eventAction> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -669,9 +693,9 @@ <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> - <pageIdAction>13</pageIdAction> + <pageIdAction>15</pageIdAction> - <pageId>9</pageId> + <pageId>10</pageId> <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -681,9 +705,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>10</pageId> + <pageId>11</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> @@ -695,9 +719,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>11</pageId> + <pageId>12</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> @@ -709,9 +733,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>12</pageId> + <pageId>13</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -723,9 +747,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>13</pageId> + <pageId>14</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -737,9 +761,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>14</pageId> + <pageId>15</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -751,9 +775,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>15</pageId> + <pageId>16</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -761,7 +785,7 @@ </row> </actionDetails> - <goalConversions>1</goalConversions> + <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> @@ -782,7 +806,7 @@ <visitDuration>3601</visitDuration> <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> - <actions>15</actions> + <actions>16</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -809,7 +833,7 @@ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <events>13</events> + <events>14</events> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -857,9 +881,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>45</pageId> + <pageId>46</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -958,9 +982,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>44</pageId> + <pageId>45</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -1059,9 +1083,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>40</pageId> + <pageId>41</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1073,9 +1097,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>41</pageId> + <pageId>42</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1087,9 +1111,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>43</pageId> + <pageId>44</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> @@ -1101,9 +1125,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>46</pageId> + <pageId>47</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1117,7 +1141,7 @@ <url /> <pageIdAction /> - <pageId>47</pageId> + <pageId>48</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1130,9 +1154,9 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>25</pageIdAction> + <pageIdAction>27</pageIdAction> - <pageId>48</pageId> + <pageId>49</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> @@ -1233,9 +1257,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>42</pageId> + <pageId>43</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <icon>plugins/Morpheus/images/event.png</icon> @@ -1337,7 +1361,7 @@ <pageTitle>Welcome!</pageTitle> <pageIdAction>2</pageIdAction> - <pageId>25</pageId> + <pageId>26</pageId> <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -1349,7 +1373,7 @@ <goalName>triggered js</goalName> <goalId>1</goalId> <revenue>0</revenue> - <goalPageId>25</goalPageId> + <goalPageId>26</goalPageId> <url>http://example.org/webradio</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1360,7 +1384,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>26</pageId> + <pageId>27</pageId> <eventCategory>Music</eventCategory> <eventAction>play</eventAction> <customVariables> @@ -1380,7 +1404,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>27</pageId> + <pageId>28</pageId> <eventCategory>Music</eventCategory> <eventAction>play25%</eventAction> <customVariables> @@ -1400,7 +1424,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>28</pageId> + <pageId>29</pageId> <eventCategory>Music</eventCategory> <eventAction>play50%</eventAction> <customVariables> @@ -1420,7 +1444,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>29</pageId> + <pageId>30</pageId> <eventCategory>Music</eventCategory> <eventAction>play75%</eventAction> <customVariables> @@ -1440,7 +1464,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>30</pageId> + <pageId>31</pageId> <eventCategory>Music</eventCategory> <eventAction>playEnd</eventAction> <customVariables> @@ -1460,7 +1484,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>31</pageId> + <pageId>32</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -1481,7 +1505,7 @@ <url>http://example.org/webradio</url> <pageIdAction>3</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <eventCategory>Music</eventCategory> <eventAction>rating</eventAction> <customVariables> @@ -1501,9 +1525,9 @@ <type>action</type> <url>http://example.org/movies</url> <pageTitle>Movie Theater</pageTitle> - <pageIdAction>13</pageIdAction> + <pageIdAction>15</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> @@ -1513,9 +1537,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> @@ -1527,9 +1551,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> @@ -1541,9 +1565,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1555,9 +1579,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1569,9 +1593,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> @@ -1583,9 +1607,9 @@ <row> <type>event</type> <url>http://example.org/movies</url> - <pageIdAction>14</pageIdAction> + <pageIdAction>16</pageIdAction> - <pageId>39</pageId> + <pageId>40</pageId> <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml index 705ab95996..8b98dbd18e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml @@ -229,4 +229,29 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + <subtable> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml index 0ec9655add..ced40076d2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml @@ -229,4 +229,29 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + <subtable> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml index 83e54f1311..0b77d852e2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml @@ -184,9 +184,9 @@ </row> <row> <label>Event Name not defined</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> @@ -215,6 +215,17 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml index 98c7fa3bad..66d8473330 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml @@ -184,13 +184,13 @@ </row> <row> <label>Event Name not defined</label> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> <subtable> <row> @@ -215,6 +215,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> </row> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml index 31da89e717..5270d12b50 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml @@ -355,4 +355,29 @@ </row> </subtable> </row> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + <subtable> + <row> + <label>CategoryTriggersGoal here</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml index f695f351a1..8503a4dc17 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml @@ -355,4 +355,29 @@ </row> </subtable> </row> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + <subtable> + <row> + <label>CategoryTriggersGoal here</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml index 2945259531..0638418b3c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml @@ -52,9 +52,9 @@ </row> <row> <label>Event Name not defined</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> @@ -72,6 +72,17 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml index bfa292b1ec..d74eaf2f14 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml @@ -52,13 +52,13 @@ </row> <row> <label>Event Name not defined</label> - <nb_visits>6</nb_visits> - <nb_events>6</nb_events> + <nb_visits>7</nb_visits> + <nb_events>7</nb_events> <nb_events_with_value>0</nb_events_with_value> <sum_event_value>0</sum_event_value> <min_event_value>0</min_event_value> <max_event_value>0</max_event_value> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> <subtable> <row> @@ -72,6 +72,17 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <avg_event_value>0</avg_event_value> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + </row> </subtable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml index 529442b5c2..6dcae08f50 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml @@ -364,4 +364,16 @@ <avg_event_value>0</avg_event_value> <segment>eventAction==Purchase</segment> </row> + <row> + <label>This is an event without a URL</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml index 3c9792b64e..38da7199d0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml @@ -364,4 +364,16 @@ <avg_event_value>0</avg_event_value> <segment>eventAction==Purchase</segment> </row> + <row> + <label>This is an event without a URL</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventAction==This+is+an+event+without+a+URL</segment> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml index 9d0c930867..7e91e6fb24 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml @@ -108,4 +108,16 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml index 96f053cf19..bdaa1e343f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml @@ -108,4 +108,16 @@ </row> </subtable> </row> + <row> + <label>CategoryTriggersGoal here</label> + <nb_visits>1</nb_visits> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_event_value>0</avg_event_value> + <segment>eventCategory==CategoryTriggersGoal+here</segment> + </row> </result>
\ No newline at end of file |