diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-12-24 14:06:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 14:06:48 +0300 |
| commit | 2915d75f69f2340ee6dcf1a9f4401b658fb8c966 (patch) | |
| tree | 04cc3e801ae5f6d6fdbecc981c6d6e9d94403440 /tests | |
| parent | b4627cf0324de59f29e8d6e7487f987617c5a4fd (diff) | |
ProxySite related changes to let comparisons work properly (#15265)
* Make sure ProxySite will disable post processor in Visualization where API Proxy is called directly.
* Use Request::process so events are used.
* Remove disable_datatable_post_processing, since it will propagate.
* Only disable for root API request.
* Move nestedApiInvocationCount increment to top of method.
* Directly filter referrer type labels since there are a small number of them (helps comparison & proxysite).
* Fix regression.
* Update expected test files.
* Another regression fixed.
* Try to fix build again.
* fix tests
Diffstat (limited to 'tests')
17 files changed, 45 insertions, 30 deletions
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Referrers.getAll_month.xml index 0b627a1e3a..291f1d6fe6 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Referrers.getAll_month.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> @@ -216,7 +216,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Referrers.getAll_month.xml index 1941a7134c..b0410d8141 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Referrers.getAll_month.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> @@ -139,7 +139,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Referrers.getAll_range.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Referrers.getAll_range.xml index 4e8c47c8aa..081384265e 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Referrers.getAll_range.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Referrers.getAll_range.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> @@ -333,7 +333,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Referrers.getAll_month.xml index 46ffd8606f..f0b53d2276 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Referrers.getAll_month.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> @@ -333,7 +333,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Referrers.getAll_month.xml index d9e43f0b15..1e56f1d34d 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Referrers.getAll_month.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> @@ -99,7 +99,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <comparisons> <row> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml index f474e66f38..ae7de96986 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -19,7 +19,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>piwik.org</label> @@ -40,7 +40,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>sn110w.snt110.mail.live.com</label> @@ -61,7 +61,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>www.test.nl</label> @@ -82,6 +82,6 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index fc719074f4..571e6a1029 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -20,6 +20,7 @@ <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> <segment>referrerType==direct</segment> + <referrer_type>1</referrer_type> </row> <row> <label>Websites</label> @@ -41,6 +42,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> <subtable> <row> <label>example.com</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml index 11b9d69bf0..e5061b9add 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml @@ -18,7 +18,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>referrer.com</label> @@ -38,6 +38,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index 94c5ebbcb7..f784e17b36 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -19,6 +19,7 @@ <nb_conversions>1</nb_conversions> <revenue>1</revenue> <segment>referrerType==search</segment> + <referrer_type>2</referrer_type> <subtable> <row> <label>purchase</label> @@ -60,6 +61,7 @@ <nb_conversions>1</nb_conversions> <revenue>42</revenue> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> <subtable> <row> <label>referrer.com</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index 0475723891..7806d128ae 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -19,7 +19,7 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>1</revenue> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>referrer.com</label> @@ -40,6 +40,6 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>42</revenue> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index 84ffaabdb9..f61eb0b084 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -20,6 +20,7 @@ <nb_conversions>1</nb_conversions> <revenue>1</revenue> <segment>referrerType==search</segment> + <referrer_type>2</referrer_type> <subtable> <row> <label>purchase</label> @@ -63,6 +64,7 @@ <nb_conversions>1</nb_conversions> <revenue>42</revenue> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> <subtable> <row> <label>referrer.com</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml index 52be85572a..5d9996856d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>this search term</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>search term 2</label> @@ -34,7 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>whatever1.com</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml index b05ee719f9..4816204d53 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -11,6 +11,7 @@ <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> + <referrer_type>1</referrer_type> </row> <row> <label>Search Engines</label> @@ -23,6 +24,7 @@ <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search</segment> + <referrer_type>2</referrer_type> <subtable> <row> <label>search term 2</label> @@ -70,6 +72,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> <subtable> <row> <label>whatever0.com</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml index f00d41d063..bb74ffcc64 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <Referrers_Referrer>whatever0.com</Referrers_Referrer> </row> <row> @@ -36,7 +36,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> <Referrers_Referrer>this search term</Referrers_Referrer> </row> <row> @@ -49,7 +49,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> <Referrers_Referrer>search term 2</Referrers_Referrer> </row> <row> @@ -62,7 +62,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> <Referrers_Referrer>whatever1.com</Referrers_Referrer> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index 7db3ae2c01..cda2084b29 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -11,6 +11,7 @@ <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> + <referrer_type>1</referrer_type> </row> <row> <label>Search Engines</label> @@ -23,6 +24,7 @@ <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search</segment> + <referrer_type>2</referrer_type> </row> <row> <label>Websites</label> @@ -35,5 +37,6 @@ <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml index 52be85572a..5d9996856d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>this search term</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>search term 2</label> @@ -34,7 +34,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>2</referer_type> + <referer_type>Search Engines</referer_type> </row> <row> <label>whatever1.com</label> @@ -46,7 +46,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <referer_type>3</referer_type> + <referer_type>Websites</referer_type> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml index b05ee719f9..4816204d53 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml @@ -11,6 +11,7 @@ <bounce_count>55</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==direct</segment> + <referrer_type>1</referrer_type> </row> <row> <label>Search Engines</label> @@ -23,6 +24,7 @@ <bounce_count>12</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search</segment> + <referrer_type>2</referrer_type> <subtable> <row> <label>search term 2</label> @@ -70,6 +72,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==website</segment> + <referrer_type>3</referrer_type> <subtable> <row> <label>whatever0.com</label> |