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

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-01-27 02:46:15 +0300
committerGitHub <noreply@github.com>2020-01-27 02:46:15 +0300
commitd3aabbd01e87c6de2f6c3cff3f8f3f9a30fa9ae3 (patch)
treeba5bf66f4ab8859766af7e0810c7d939554676a3 /tests
parent9f2f380b06b57d28cd41fd789b550fe3e3d204c3 (diff)
Support goal metrics for browser name dimension (#15409)
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/System/BackwardsCompatibility1XTest.php4
-rw-r--r--tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserEngines_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserFamilies_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserVersions_day.xml15
-rw-r--r--tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowsers_day.xml15
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml72
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml72
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html8
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv8
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml146
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml30
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png4
21 files changed, 461 insertions, 18 deletions
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index a8745832cd..eb29b65d33 100644
--- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
@@ -118,6 +118,10 @@ class BackwardsCompatibility1XTest extends SystemTestCase
// those reports generate a different segment as a different raw value was stored that time
'DevicesDetection.getOsVersions',
+ 'DevicesDetection.getBrowserFamilies',
+ 'DevicesDetection.getBrowserVersions',
+ 'DevicesDetection.getBrowserEngines',
+ 'DevicesDetection.getBrowsers',
'Goals.get',
// Following #9345
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserEngines_day.xml
new file mode 100644
index 0000000000..1e5bfba16d
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserEngines_day.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Gecko (Firefox)</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+
+ <bounce_count>1</bounce_count>
+
+ <segment>browserEngine==gecko</segment>
+ </row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserFamilies_day.xml
new file mode 100644
index 0000000000..13ca1ba5ec
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserFamilies_day.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Firefox</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+
+ <bounce_count>1</bounce_count>
+
+ <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
+ </row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserVersions_day.xml
new file mode 100644
index 0000000000..ea268fc55d
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowserVersions_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Firefox 3.6</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+
+ <bounce_count>1</bounce_count>
+
+ <segment>browserCode==FF;browserVersion==3.6</segment>
+ <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
+ </row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowsers_day.xml
new file mode 100644
index 0000000000..77de3fc187
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getBrowsers_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Firefox</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+
+ <bounce_count>1</bounce_count>
+
+ <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
+ <segment>browserCode==FF</segment>
+ </row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 41e39d8828..c2920295b9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -8,6 +8,15 @@
<sum_visit_length>305</sum_visit_length>
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
+ </row>
+ </goals>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
@@ -20,6 +29,15 @@
<sum_visit_length>4</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
+ </row>
+ </goals>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo>
@@ -32,6 +50,15 @@
<sum_visit_length>242</sum_visit_length>
<bounce_count>7</bounce_count>
<nb_visits_converted>8</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
+ </row>
+ </goals>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
@@ -44,6 +71,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>5</bounce_count>
<nb_visits_converted>5</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
+ </row>
+ </goals>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/EP.png</logo>
@@ -56,6 +92,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>5</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
@@ -68,6 +113,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/AN.png</logo>
@@ -80,6 +134,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
@@ -92,6 +155,15 @@
<sum_visit_length>2</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/CM.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 2bc6b9c3ac..1eebfd78fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -8,6 +8,15 @@
<sum_visit_length>305</sum_visit_length>
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
+ </row>
+ </goals>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
@@ -21,6 +30,15 @@
<sum_visit_length>4</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
+ </row>
+ </goals>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo>
@@ -34,6 +52,15 @@
<sum_visit_length>242</sum_visit_length>
<bounce_count>7</bounce_count>
<nb_visits_converted>8</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
+ </row>
+ </goals>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
@@ -47,6 +74,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>5</bounce_count>
<nb_visits_converted>5</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
+ </row>
+ </goals>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/EP.png</logo>
@@ -60,6 +96,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>5</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
@@ -73,6 +118,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/AN.png</logo>
@@ -86,6 +140,15 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
@@ -99,6 +162,15 @@
<sum_visit_length>2</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/CM.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
index 3134a830bd..4c991191a3 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
@@ -9,6 +9,20 @@
<sum_visit_length>1622</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>42</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>43</revenue>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
index a07764bd2f..499b1f2ee1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
@@ -9,6 +9,20 @@
<sum_visit_length>1622</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>42</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>43</revenue>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
<segment>browserCode==FF</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
index 37b45aa307..10df495e79 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
@@ -10,6 +10,20 @@
<sum_visit_length>1622</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>42</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>43</revenue>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
index ce0cfc0c05..059fb9bd93 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
@@ -10,6 +10,20 @@
<sum_visit_length>1622</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>42</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>43</revenue>
<logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo>
<segment>browserCode==FF</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
index bf05786f61..49bdac6c95 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
@@ -73,7 +73,6 @@
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
<bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
</columns>
</metadata>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html
index 92f265bb8f..734045e760 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -1452,7 +1452,7 @@
&nbsp;Bounce Rate&nbsp;&nbsp;
</th>
<th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; text-align:right;">
- &nbsp;Conversion Rate&nbsp;&nbsp;
+ &nbsp;Revenue&nbsp;&nbsp;
</th>
</thead>
<tbody>
@@ -1478,7 +1478,7 @@
0%
</td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
- 0%
+ $0
</td>
</tr>
@@ -1503,7 +1503,7 @@
100%
</td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
- 0%
+ $0
</td>
</tr>
@@ -1528,7 +1528,7 @@
100%
</td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
- 0%
+ $0
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv
index 8c490ef098..04dccee3f6 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -60,10 +60,10 @@ Unknown,8,40,0%,5,00:15:01,0%
Windows XP,3,3,0%,1,00:00:00,100%
Browsers
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox,2,2,0%,1,00:00:00,100%
-Opera,1,1,0%,1,00:00:00,100%
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Unknown,8,40,5,00:15:01,0%,$0
+Firefox,2,2,1,00:00:00,100%,$0
+Opera,1,1,1,00:00:00,100%,$0
Browser version
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 77bebb2118..289c0cd59e 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -554,7 +554,6 @@
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
<bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
<relatedReports>
<row>
@@ -563,6 +562,13 @@
<action>getBrowserVersions</action>
</row>
</relatedReports>
+ <metricsGoal>
+ <nb_conversions>Conversions</nb_conversions>
+ <revenue>Revenue</revenue>
+ </metricsGoal>
+ <processedMetricsGoal>
+ <revenue_per_visit>Revenue per Visit</revenue_per_visit>
+ </processedMetricsGoal>
<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>DevicesDetection_getBrowsers</uniqueId>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
index f1619e0897..57315251c6 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
@@ -1855,6 +1855,35 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Browsers</name>
+ <category>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>1</idGoal>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Visits per server time</name>
<category>
<id>Goals by User attribute</id>
@@ -2462,6 +2491,35 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Browsers</name>
+ <category>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>2</idGoal>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Visits per server time</name>
<category>
<id>Goals by User attribute</id>
@@ -3069,6 +3127,35 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Browsers</name>
+ <category>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>3</idGoal>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Visits per server time</name>
<category>
<id>Goals by User attribute</id>
@@ -3731,6 +3818,35 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Browsers</name>
+ <category>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Goals by User location</id>
+ <name>Goals by User location</name>
+ <order>99</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>0</idGoal>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Visits per server time</name>
<category>
<id>Goals by User attribute</id>
@@ -4520,6 +4636,36 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Browsers</name>
+ <category>
+ <id>Sales by User location</id>
+ <name>Sales by User location</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Sales by User location</id>
+ <name>Sales by User location</name>
+ <order>99</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>ecommerceOrder</idGoal>
+ <segmented_visitor_log_segment_suffix>visitEcommerceStatus==ordered</segmented_visitor_log_segment_suffix>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrdersegmented_visitor_log_segment_suffixvisitEcommerceStatus3D3Dordered</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Visits per server time</name>
<category>
<id>Sales by User attribute</id>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index d1ef5a13c9..577ea12963 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -2144,6 +2144,36 @@
<isReport>1</isReport>
</row>
<row>
+ <name>Sales by User location: Browsers</name>
+ <category>
+ <id>Goals_Ecommerce</id>
+ <name>Ecommerce</name>
+ <order>20</order>
+ <icon>icon-reporting-ecommerce</icon>
+ </category>
+ <subcategory>
+ <id>Ecommerce_Sales</id>
+ <name>Sales</name>
+ <order>15</order>
+ </subcategory>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <order>208</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>tableGoals</viewDataTable>
+ <module>DevicesDetection</module>
+ <action>getBrowsers</action>
+ <documentationForGoalsPage>1</documentationForGoalsPage>
+ <idGoal>ecommerceOrder</idGoal>
+ <segmented_visitor_log_segment_suffix>visitEcommerceStatus==ordered</segmented_visitor_log_segment_suffix>
+ </parameters>
+ <uniqueId>widgetDevicesDetectiongetBrowsersforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrdersegmented_visitor_log_segment_suffixvisitEcommerceStatus3D3Dordered</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>tableGoals</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
<name>Sales by User location: Device model</name>
<category>
<id>Goals_Ecommerce</id>
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png
index dadb2b16fa..c003897296 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:43f50d9cb6862443e316b839f15894d9ed49bb9b4862fbaf31aa9d34b7e433d5
-size 90220
+oid sha256:7ab85bd580f2fcc4c32737f90942fd16efdbbb1701facf90dce18724a0133f58
+size 92009
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
index 0cc2718679..b35029c4ab 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:72a00984bfadfcc7451329ae81bd1432c98fa09aee59838a8f3e45e812b25115
-size 194735
+oid sha256:c2198a7973f8b50aec5a79390dc504b1bc90740e5b288c9d6188e26043b11bfd
+size 196431
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
index 50c2197c32..6463823f7d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d650e4b46268dfee454155e41350ff79779fa83570b88c2a49960a24ad299e6f
-size 195483
+oid sha256:9391cc9f9938c822d70ba16644b1efc3fc4b2ff220f1fb3d7810f9d076b302fd
+size 197279
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png
index 11c0b6390c..692668570f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:24e0cb4b7f6182e7e431883d740bd7725d388c60f1249569533eb07b550d6067
-size 159264
+oid sha256:3a4a311ffc5fa277858856346fb7950969707709d99f0d6178048b5702d2046c
+size 160989