diff options
19 files changed, 181 insertions, 127 deletions
diff --git a/plugins/Contents/templates/_actionContent.twig b/plugins/Contents/templates/_actionContent.twig index ae8f19018e..801974064b 100644 --- a/plugins/Contents/templates/_actionContent.twig +++ b/plugins/Contents/templates/_actionContent.twig @@ -2,10 +2,10 @@ title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}"> <div> {% if action.contentInteraction %} - <img src='{{ action.icon }}' title='{{ 'Contents_ContentInteraction'|translate }}' + <img src='{{ action.iconSVG|default(action.icon) }}' title='{{ 'Contents_ContentInteraction'|translate }}' class="action-list-action-icon content-interaction"> {% else %} - <img src='{{ action.icon }}' title='{{ 'Contents_ContentImpression'|translate }}' + <img src='{{ action.iconSVG|default(action.icon) }}' title='{{ 'Contents_ContentImpression'|translate }}' class="action-list-action-icon content-impression"> {% endif %} {% if action.contentInteraction %} diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml index 5b6bd97c42..6fe346e712 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-users/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -36,7 +37,8 @@ <goalPageId>9</goalPageId> <url>http://piwik.net/docs/manage-users/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -142,7 +144,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/docs/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -160,7 +163,8 @@ <goalPageId>8</goalPageId> <url>http://piwik.net/docs/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -266,7 +270,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/translations/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -284,7 +289,8 @@ <goalPageId>7</goalPageId> <url>http://piwik.net/translations/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -390,7 +396,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/download/counter/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -408,7 +415,8 @@ <goalPageId>6</goalPageId> <url>http://piwik.net/download/counter/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -514,7 +522,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -532,7 +541,8 @@ <goalPageId>5</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -638,7 +648,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -656,7 +667,8 @@ <goalPageId>4</goalPageId> <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -762,7 +774,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -780,7 +793,8 @@ <goalPageId>3</goalPageId> <url>http://piwik.net/blog/category/community/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -886,7 +900,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -904,7 +919,8 @@ <goalPageId>2</goalPageId> <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -1010,7 +1026,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://www.included4.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1028,7 +1045,8 @@ <goalPageId>81</goalPageId> <url>http://www.included4.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -1134,7 +1152,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://www.included2.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1152,7 +1171,8 @@ <goalPageId>83</goalPageId> <url>http://www.included2.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index 060f9cbe79..8444674964 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -22,7 +22,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -40,7 +41,8 @@ <goalPageId>70</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -61,7 +63,8 @@ <interactionPosition>5</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -87,7 +90,8 @@ <interactionPosition>9</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -113,7 +117,8 @@ <interactionPosition>2</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -139,7 +144,8 @@ <interactionPosition>6</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -165,7 +171,8 @@ <interactionPosition>10</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -191,7 +198,8 @@ <interactionPosition>3</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -217,7 +225,8 @@ <interactionPosition>7</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -243,7 +252,8 @@ <interactionPosition>4</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -267,7 +277,8 @@ <interactionPosition>8</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -378,7 +389,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -396,7 +408,8 @@ <goalPageId>84</goalPageId> <url>http://www.notdatefiltered.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -502,7 +515,8 @@ <interactionPosition>1</interactionPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -528,7 +542,8 @@ <goalPageId>30</goalPageId> <url>http://example.org/index.htm</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -651,7 +666,8 @@ <interactionPosition>1</interactionPosition> <title>Piwik Forums</title> <subtitle>http://forum.piwik.org/register.php?0,approve=9a94a02145599</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -669,7 +685,8 @@ <goalPageId>31</goalPageId> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -808,7 +825,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -826,7 +844,8 @@ <goalPageId>28</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -936,7 +955,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -954,7 +974,8 @@ <goalPageId>29</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -1066,7 +1087,8 @@ <interactionPosition>1</interactionPosition> <title>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</title> <subtitle>http://piwik.net/moved-permanently</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1084,7 +1106,8 @@ <goalPageId>26</goalPageId> <url>http://piwik.net/moved-permanently</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -1101,7 +1124,8 @@ <interactionPosition>2</interactionPosition> <title>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</title> <subtitle>http://piwik.net/temp-redirect</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1216,7 +1240,8 @@ <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <interactionPosition /> - <icon>plugins/Morpheus/images/download.svg</icon> + <icon>plugins/Morpheus/images/download.png</icon> + <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> <subtitle>http://piwik.net/thing.js</subtitle> @@ -1240,7 +1265,8 @@ <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <interactionPosition /> - <icon>plugins/Morpheus/images/download.svg</icon> + <icon>plugins/Morpheus/images/download.png</icon> + <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> <subtitle>http://piwik.net/thing.css</subtitle> @@ -1262,7 +1288,8 @@ <pageId>25</pageId> <bandwidth>3574</bandwidth> <interactionPosition /> - <icon>plugins/Morpheus/images/download.svg</icon> + <icon>plugins/Morpheus/images/download.png</icon> + <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> <subtitle>http://piwik.net/other.png</subtitle> @@ -1379,7 +1406,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1397,7 +1425,8 @@ <goalPageId>22</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> @@ -1507,7 +1536,8 @@ <interactionPosition>1</interactionPosition> <title>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</title> <subtitle>http://piwik.net/to-an-error</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1525,7 +1555,8 @@ <goalPageId>21</goalPageId> <url>http://piwik.net/to-an-error</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> <subtitle>all ($ 5 revenue)</subtitle> diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 3df4d65c590fe76cff871fe6b8cb8975a942a65 +Subproject 68506466e837617adf57c340879671630e8e6be diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject cc70437a91d9727edf172026c19b3a70f705ba2 +Subproject e6e3f79eafcb558ba2a049401aa763632f96ed0 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 050fadec57..ef6ae5bdf7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -6793,7 +6793,7 @@ <row> <idSite>1</idSite> <idVisit>9</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>175.41.192.9</visitIp> <actionDetails> <row> @@ -6898,17 +6898,17 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <visitLocalTime>21:00:42</visitLocalTime> <visitLocalHour>21</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -6921,7 +6921,7 @@ <row> <idSite>1</idSite> <idVisit>8</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>175.41.192.9</visitIp> <actionDetails> <row> @@ -7026,17 +7026,17 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <visitLocalTime>20:56:45</visitLocalTime> <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 581bd0118d..407fb98ac0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Asia</label> - <nb_visits>17</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>19</nb_visits> + <nb_actions>22</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>15</bounce_count> + <bounce_count>17</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>16</nb_conversions> - <nb_visits_converted>16</nb_visits_converted> - <revenue>80</revenue> + <nb_conversions>18</nb_conversions> + <nb_visits_converted>18</nb_visits_converted> + <revenue>90</revenue> </row> </goals> - <nb_conversions>16</nb_conversions> - <revenue>80</revenue> - <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> + <nb_conversions>18</nb_conversions> + <revenue>90</revenue> + <sum_daily_nb_uniq_visitors>19</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>Asia</code> </row> @@ -42,21 +42,21 @@ </row> <row> <label>Unknown</label> - <nb_visits>11</nb_visits> - <nb_actions>12</nb_actions> + <nb_visits>9</nb_visits> + <nb_actions>10</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>8</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>9</nb_conversions> - <nb_visits_converted>9</nb_visits_converted> - <revenue>45</revenue> + <nb_conversions>7</nb_conversions> + <nb_visits_converted>7</nb_visits_converted> + <revenue>35</revenue> </row> </goals> - <nb_conversions>9</nb_conversions> - <revenue>45</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <nb_conversions>7</nb_conversions> + <revenue>35</revenue> + <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <code>Unknown</code> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index cbc2d915ef..0f7df8603d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Japan</label> - <nb_visits>13</nb_visits> - <nb_actions>16</nb_actions> + <nb_visits>15</nb_visits> + <nb_actions>18</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>11</bounce_count> + <bounce_count>13</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>12</nb_conversions> - <nb_visits_converted>12</nb_visits_converted> - <revenue>60</revenue> + <nb_conversions>14</nb_conversions> + <nb_visits_converted>14</nb_visits_converted> + <revenue>70</revenue> </row> </goals> - <nb_conversions>12</nb_conversions> - <revenue>60</revenue> - <sum_daily_nb_uniq_visitors>13</sum_daily_nb_uniq_visitors> + <nb_conversions>14</nb_conversions> + <revenue>70</revenue> + <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>jp</code> <logo>plugins/Morpheus/icons/dist/flags/jp.png</logo> @@ -48,21 +48,21 @@ </row> <row> <label>Unknown</label> - <nb_visits>11</nb_visits> - <nb_actions>12</nb_actions> + <nb_visits>9</nb_visits> + <nb_actions>10</nb_actions> <max_actions>2</max_actions> <sum_visit_length>242</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>8</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>9</nb_conversions> - <nb_visits_converted>9</nb_visits_converted> - <revenue>45</revenue> + <nb_conversions>7</nb_conversions> + <nb_visits_converted>7</nb_visits_converted> + <revenue>35</revenue> </row> </goals> - <nb_conversions>9</nb_conversions> - <revenue>45</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <nb_conversions>7</nb_conversions> + <revenue>35</revenue> + <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <code>xx</code> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 0efbf332fe..052eee51bd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:890b778fd4846e9b8b06d389958f0d1157f41006c26de5714ecf20bef7e43cbf -size 4246791 +oid sha256:45f4b6ebca3ebee4a04f093e043c81038593999f402a9531899200633698e867 +size 4261436 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 541d455174..db694a7402 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f4a66c92053198a38668b8654cb7c533e09d1cf7e1114be9c5237ea5e9fd7ff -size 146224 +oid sha256:47340b3da78384a1d6dc6ab5fcf58ac2a2e1e2f84d8c0d8db14ed6257ca7999c +size 148131 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 75088cdb4a..1879f4118d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dcf01d06e413501b56bd58e24738864406092435974b3dac45650d46dee4dfa -size 1068670 +oid sha256:3c697b42a53740507c29775bceb10d59ccfd3047bd0c6489d9cd4d0a7a179712 +size 1079465 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index fe3156ddae..f902ce6739 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0869595907cda432fd31b52977c3c055df0a9969b4bd69fd9eb86b17e25e4d5 -size 1069291 +oid sha256:47afe7220cb95caaf7edb1c8b8a35b3c45a602a031f0259daad9b31e7ebd8a56 +size 1081131 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png new file mode 100644 index 0000000000..db694a7402 --- /dev/null +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47340b3da78384a1d6dc6ab5fcf58ac2a2e1e2f84d8c0d8db14ed6257ca7999c +size 148131 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index e892195d6f..28b3b15ec9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d18f4215e8e1878134994bcda73a375963db2580d4eb8e06c6218e851c4f8c5 -size 5040435 +oid sha256:5627259a1bc8aa935de6e29c53d2450eeb8ff62b357c7ec49d1f139f58d42b65 +size 5057367 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index d9aa6401f9..ebb1ee4d52 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ef15a493999b929e00665c7d3fcc1a9d1fe33815cd19e01c6f30a6ea5f20ee8 -size 1587956 +oid sha256:dba3b4a3b29937e9c3b783da5c406278870deede396a20cdd9a6f745b709d165 +size 1590854 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index a709f7a602..94843d3526 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aee36d8e71092bb0a0cf9f69a133ad1a6a9bd3c4b020046082852350549152b -size 274909 +oid sha256:892eb366524040fb451c7ca3e400508dbba22201877c8f82d61e1a335c2d5aa1 +size 275202 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png index 1e8c447673..f6e37e75d3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9428601203bd5f000dbe17c4b4c83967ce3e294197671b74dc885d3803313387 -size 73832 +oid sha256:a40faee10b623697c110ac7f05b64a2afaf641455013edcad9c822a29b4807f1 +size 73847 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index f275319a50..3abc4dfedf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fc2dd871e3b495a4fb344429f63e1fddf8f5f2aa126442a74dca3df0c356d03 -size 6343 +oid sha256:738b8d8eaadbe1a80b2c180f36376cf893278db2b042f2b25f15a538f3793dac +size 86747 diff --git a/tests/resources/access-logs/fake_logs.log b/tests/resources/access-logs/fake_logs.log index 1fe459bda1..aad857245d 100644 --- a/tests/resources/access-logs/fake_logs.log +++ b/tests/resources/access-logs/fake_logs.log @@ -11,8 +11,8 @@ 72.44.32.10 - - [09/Aug/2012:15:48:07 +0200] "GET / HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0" junk extra 72.44.32.10 - - [09/Aug/2012:15:48:20 +0200] "GET /download/counter/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Epiphany/2.30.6 Safari/534.7" 72.44.32.10 - - [09/Aug/2012:15:49:48 +0200] "GET /translations/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.9 Safari/536.5" -175.41.192.09 - - [09/Aug/2012:22:56:45 +0200] "GET /docs/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; Linux i686; rv:6.0) Gecko/20100101 Firefox/6.0" 456 789 -175.41.192.09 - - [09/Aug/2012:23:00:42 +0200] "GET /docs/manage-users/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_0) AppleWebKit/536.3 (KHTML, like Gecko) Chrome/19.0.1063.0 Safari/536.3" +175.41.192.9 - - [09/Aug/2012:22:56:45 +0200] "GET /docs/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; Linux i686; rv:6.0) Gecko/20100101 Firefox/6.0" 456 789 +175.41.192.9 - - [09/Aug/2012:23:00:42 +0200] "GET /docs/manage-users/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_0) AppleWebKit/536.3 (KHTML, like Gecko) Chrome/19.0.1063.0 Safari/536.3" 79.125.00.21 - - [10/Aug/2012:20:03:40 +0200] "GET /newsletter/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/5.0)" 175.41.192.34 - - [10/Aug/2012:21:59:50 +0200] "GET /faq/how-to/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/5.0)" 175.41.192.34 - - [10/Aug/2012:22:01:17 +0200] "GET /faq/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86_64; fr-FR) AppleWebKit/534.7 (KHTML, like Gecko) Epiphany/2.30.6 Safari/534.7" |
