diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml index 6f23cb8eb7e7083a5b7810b78c9bfe05e0ee2fba..de19b588f6d47e6738266c197579dd86e8413318 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml @@ -39,7 +39,7 @@ </goals> <nb_conversions>3</nb_conversions> <revenue>62.26</revenue> - <logo>plugins/Morpheus/icons/dist/brand/Unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> <row> diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons index 1b5597760791b2b305e6b9c26ca1a6b8b15ee0e5..a4a79c96561af63c626285673a464d59eeaea4f5 160000 --- a/plugins/Morpheus/icons +++ b/plugins/Morpheus/icons @@ -1 +1 @@ -Subproject commit 1b5597760791b2b305e6b9c26ca1a6b8b15ee0e5 +Subproject commit a4a79c96561af63c626285673a464d59eeaea4f5 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 2d1a7bd0955f5ea15925c2a4bb24ea5b71ca06e3..89aca6e48fc627091ff14eb2f56a5f7c513bcc1b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -19,7 +19,7 @@ <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/Morpheus/icons/dist/brand/Unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> <row> @@ -85,4 +85,4 @@ <logo>plugins/Morpheus/icons/dist/brand/Samsung.png</logo> <segment>deviceBrand==Samsung</segment> </row> -</result> \ No newline at end of file +</result> 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 e498a1633260b03163c9be23a0d03f9b59b58c61..bef5da30d58699583520b764a426708e8d13d11c 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 @@ -23,7 +23,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>43</revenue> - <logo>plugins/Morpheus/icons/dist/brand/Unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> -</result> \ No newline at end of file +</result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index f94bb1df2feb5ab625617875e70bc8955e605019..c08c9b38e3c4967420a1c86fe030ffa747eced22 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -762,7 +762,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/unk.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 13af6755f27bfa6a6aea2d68c9ac582dec301ec7..4129e1960699c4cc93f19e2156569ad0c9a9bca7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -727,7 +727,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/unk.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index b1c7db119147da9138aff5babb7772d00fb0ac5b..f1a9297d724e39431ec4e8c40d6bf8ac3637fe6b 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 91b68caf4f0e5efb45357ddeccd70ed5fd10b476..7af97958ce5436e37765ea705a25fbc55b1b0114 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -905,7 +905,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/unk.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 84bff31348d19d5612e317e85f9d9cad7cb411eb..ab685ce1f2b318bf8a73d7290772442df4f3a17e 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -863,7 +863,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/Unknown.png'> + <img height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/brand/unk.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf index 71bbf00529eca90aa4f93d3db05b2f59de6e62b4..909cc51c3676ca88968c2f8802eb8e9f51b52f56 100644 Binary files a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 4a0672578230a6301520a856586f37b2db02a3e4..ff309ef54d850761d620252e80f7c44da2de1a86 100644 Binary files a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png and b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png differ diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 95eb9f0c590c3abcaf88488516639e0f47e9327d..361fb00ce1497ece952fcc4fa50391fd52ecc8fc 100644 Binary files a/tests/UI/expected-screenshots/Dashboard_removed.png and b/tests/UI/expected-screenshots/Dashboard_removed.png differ diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 3f7a34e7df450d9f7bb9353c4aa021d81c7c4d00..a21b21832bd29915dbd53c90e2b37d4225046278 100644 Binary files a/tests/UI/expected-screenshots/Theme_home.png and b/tests/UI/expected-screenshots/Theme_home.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index e7c292c53285ca8be3919481c1cf5ecade7c1740..fcc21e542a9abdd207be16bf48f1c22ce541bdc4 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 1bbe405b57b9c8ab3f53e3c6f64875645ab9bfed..b0e4bc66d148dc1fcc625ae1a599c0fc6aab0748 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index 1987d000a5b0253fe54df43592b7f120aff0e2f7..8d1a585afa85dc093d5c75120f3e0cac4ff409ea 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png and b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index fb7836055acfe82561dd4eed6ccc980ab4c011af..8db53690882542382f1b72b636915077484d8dfb 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index ead2ba7ffd7592d235523207bba9f071e04b54c4..c68ac73bc7d7a5d582807da2715cd38dde989263 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 395b8dd15bd9b4ed61e58fd9bd3d18b7d1f3f26b..aff97fe1f08531936b407d33ee2efeef83624089 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png differ diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index 4954de117c5f9ffe22972c2e84ed471b6db5ac91..8eeb243a0e92ec70a427fd1098233b670f61f90a 100644 Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png and b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png differ