diff options
| author | Stefan Giehl <stefan@piwik.org> | 2017-06-02 00:46:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 00:46:42 +0300 |
| commit | 457d630c4fc33f6606a500ac439f688fc1508b2a (patch) | |
| tree | 40b098944a2213ee424b9bd1b51b0d52af2ce816 /tests/PHPUnit | |
| parent | 1821691bb1e333bed804cf7c83a363a74cb9f52a (diff) | |
Improve handling of DevicePlugins to make it extendable (#11748)
* Improve handling of DevicePlugins to make it extendable
* update test files
* add some comments to explain automatic plugin column detection
* submodule update
Diffstat (limited to 'tests/PHPUnit')
24 files changed, 590 insertions, 174 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index c1ae816b8f..6f6af71852 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -417,9 +417,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> 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 5f77ec4ff9..90cf7ef7ce 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -90,9 +90,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -203,9 +207,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -394,9 +402,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -507,9 +519,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -911,9 +927,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1024,9 +1044,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -1133,9 +1157,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -1320,9 +1348,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -1429,9 +1461,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -1778,9 +1814,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> 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 5dacd5cf62..3ea5a04c04 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -90,9 +90,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -199,9 +203,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -386,9 +394,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -495,9 +507,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -844,9 +860,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> @@ -953,9 +973,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1066,9 +1090,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1257,9 +1285,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1370,9 +1402,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1774,9 +1810,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 89aca6e48f..51bf3cd8fb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -85,4 +85,4 @@ <logo>plugins/Morpheus/icons/dist/brand/Samsung.png</logo> <segment>deviceBrand==Samsung</segment> </row> -</result> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 412dafe2df..44b8339735 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -108,11 +108,11 @@ </row> </customVariables> <resolution>1366x768</resolution> - <plugins>pdf, flash, java</plugins> + <plugins>cookie, flash, java, pdf</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -122,6 +122,10 @@ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> </pluginsIcons> @@ -386,11 +390,11 @@ </row> </customVariables> <resolution>1920x1200</resolution> - <plugins>pdf, flash, java, quicktime, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -401,6 +405,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -546,11 +554,11 @@ </row> </customVariables> <resolution>2880x1800</resolution> - <plugins>pdf, flash, java, quicktime</plugins> + <plugins>cookie, flash, java, pdf, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -561,6 +569,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -672,11 +684,11 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -687,6 +699,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -811,11 +827,11 @@ </row> </customVariables> <resolution>1360x768</resolution> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -826,17 +842,21 @@ <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> - <pluginName>quicktime</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> - <pluginName>windowsmedia</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> + <pluginName>quicktime</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> </pluginsIcons> @@ -956,17 +976,21 @@ </row> </customVariables> <resolution>2560x1440</resolution> - <plugins>pdf, java, quicktime</plugins> + <plugins>cookie, java, pdf, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -1091,9 +1115,13 @@ </row> </customVariables> <resolution>360x640</resolution> - <plugins>flash</plugins> + <plugins>cookie, flash</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1218,11 +1246,11 @@ </row> </customVariables> <resolution>2560x1440</resolution> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1233,17 +1261,21 @@ <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> - <pluginName>quicktime</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> - <pluginName>windowsmedia</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> + <pluginName>quicktime</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> </pluginsIcons> @@ -1405,9 +1437,13 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1536,11 +1572,11 @@ </row> </customVariables> <resolution>1366x768</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1551,6 +1587,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -1675,11 +1715,11 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1690,6 +1730,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -3073,9 +3117,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -3202,32 +3250,36 @@ </row> </customVariables> <resolution>1280x800</resolution> - <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> + <plugins>cookie, director, flash, gears, java, pdf, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> + <pluginName>director</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> + <pluginName>gears</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> - <pluginName>gears</pluginName> - </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 5d892a0c33..9eae69ef7d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -97,11 +97,11 @@ </row> </customVariables> <resolution>1366x768</resolution> - <plugins>pdf, flash, java</plugins> + <plugins>cookie, flash, java, pdf</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -111,6 +111,10 @@ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> </pluginsIcons> @@ -353,11 +357,11 @@ </row> </customVariables> <resolution>1920x1200</resolution> - <plugins>pdf, flash, java, quicktime, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -368,6 +372,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -502,11 +510,11 @@ </row> </customVariables> <resolution>2880x1800</resolution> - <plugins>pdf, flash, java, quicktime</plugins> + <plugins>cookie, flash, java, pdf, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -517,6 +525,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -628,11 +640,11 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -643,6 +655,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -756,11 +772,11 @@ </row> </customVariables> <resolution>1360x768</resolution> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -771,17 +787,21 @@ <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> - <pluginName>quicktime</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> - <pluginName>windowsmedia</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> + <pluginName>quicktime</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> </pluginsIcons> @@ -890,17 +910,21 @@ </row> </customVariables> <resolution>2560x1440</resolution> - <plugins>pdf, java, quicktime</plugins> + <plugins>cookie, java, pdf, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> @@ -1014,9 +1038,13 @@ </row> </customVariables> <resolution>360x640</resolution> - <plugins>flash</plugins> + <plugins>cookie, flash</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1130,11 +1158,11 @@ </row> </customVariables> <resolution>2560x1440</resolution> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1145,17 +1173,21 @@ <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> - <pluginName>quicktime</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> - <pluginName>windowsmedia</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> + <pluginName>quicktime</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> </pluginsIcons> @@ -1306,9 +1338,13 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1426,11 +1462,11 @@ </row> </customVariables> <resolution>1366x768</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1441,6 +1477,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -1554,11 +1594,11 @@ </row> </customVariables> <resolution>1920x1080</resolution> - <plugins>pdf, flash, java, silverlight</plugins> + <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> @@ -1569,6 +1609,10 @@ <pluginName>java</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> @@ -1688,9 +1732,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1806,32 +1854,36 @@ </row> </customVariables> <resolution>1280x800</resolution> - <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> + <plugins>cookie, director, flash, gears, java, pdf, windowsmedia</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> - <pluginName>pdf</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> + <pluginName>director</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> + <pluginName>gears</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> </row> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> - <pluginName>gears</pluginName> - </row> </pluginsIcons> @@ -1982,9 +2034,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 1478e307b3..8646118514 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -176,9 +176,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -313,9 +317,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -493,9 +501,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 4ec6fe3ed8..3fb5f85cee 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -114,9 +114,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -313,9 +317,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -450,9 +458,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index e153c8625b..a84538ee57 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -96,9 +96,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -295,9 +299,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -432,9 +440,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -612,9 +624,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -749,9 +765,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -948,9 +968,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1085,9 +1109,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index e153c8625b..a84538ee57 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -96,9 +96,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -295,9 +299,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -432,9 +440,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -612,9 +624,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -749,9 +765,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -948,9 +968,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1085,9 +1109,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 17c182de49..1e8b2f580a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -96,9 +96,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -295,9 +299,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -432,9 +440,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -612,9 +624,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -749,9 +765,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -948,9 +968,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1085,9 +1109,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1265,9 +1293,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1402,9 +1434,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -1601,9 +1637,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index bef5da30d5..8c9d60e701 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -26,4 +26,4 @@ <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> -</result> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index ee6a4a91de..62126192b7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -98,9 +98,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -316,9 +320,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index f4868122ea..c7c3f8aec1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -85,9 +85,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -206,9 +210,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index c0ab94c8ba..5d73c1dc59 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -85,9 +85,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 920a4200ef..4d6baa10a8 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 658e543378..05562d2c49 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -123,9 +123,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -352,9 +356,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 6e884568c7..4e5f4357ea 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -206,9 +206,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -562,9 +566,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -796,9 +804,13 @@ </row> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 26e7671d01..f9e416485f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -93,9 +93,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -220,9 +224,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -412,9 +420,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 26e7671d01..f9e416485f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -93,9 +93,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -220,9 +224,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -412,9 +420,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index d94519d0d6..df5bcc5ceb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -144,9 +144,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -271,9 +275,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 26e7671d01..f9e416485f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -93,9 +93,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -220,9 +224,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -412,9 +420,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 26e7671d01..f9e416485f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -93,9 +93,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -220,9 +224,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -412,9 +420,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index d94519d0d6..df5bcc5ceb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -144,9 +144,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -271,9 +275,13 @@ </row> </customVariables> <resolution>1111x222</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> |