From a4f8566d95c7c9c172f411c78c01e281ed5b34e6 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Sat, 6 May 2017 10:44:14 +0200 Subject: Move old brand icons to piwik icons (#11635) * move old brand icons to piwik icons * update submodule * fix some tests * update submodule * fix another test * Updates screenshots * update UI test screenshots * update system test files --- ...ImportLogs__DevicesDetection.getBrand_month.xml | 8 ++++---- ...torTwoVisits__DevicesDetection.getBrand_day.xml | 2 +- ...ookieSupport__DevicesDetection.getBrand_day.xml | 2 +- ...duledReports.generateReport_month.original.html | 4 ++-- ...duledReports.generateReport_month.original.html | 2 +- ...eduledReports.generateReport_month.original.pdf | Bin 552375 -> 552454 bytes ...eduledReports.generateReport_week.original.html | 4 ++-- ...eduledReports.generateReport_week.original.html | 2 +- ...heduledReports.generateReport_week.original.pdf | Bin 568880 -> 568941 bytes 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/PHPUnit/System/expected') 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 59e8831abf..2d1a7bd095 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 @@ 33 2 0 - plugins/DevicesDetection/images/brand/Unknown.png + plugins/Morpheus/icons/dist/brand/Unknown.png deviceBrand==Unknown @@ -40,7 +40,7 @@ 10 2 0 - plugins/DevicesDetection/images/brand/HTC.png + plugins/Morpheus/icons/dist/brand/HTC.png deviceBrand==HTC @@ -61,7 +61,7 @@ 5 1 0 - plugins/DevicesDetection/images/brand/Apple.png + plugins/Morpheus/icons/dist/brand/Apple.png deviceBrand==Apple @@ -82,7 +82,7 @@ 5 1 1 - plugins/DevicesDetection/images/brand/Samsung.png + plugins/Morpheus/icons/dist/brand/Samsung.png deviceBrand==Samsung \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index 13a8112681..da99abbc01 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -22,7 +22,7 @@ 2 43 - plugins/DevicesDetection/images/brand/Unknown.ico + plugins/Morpheus/icons/dist/brand/Unknown.ico deviceBrand==Unknown \ No newline at end of file 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 f03b829dbf..e498a16332 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 @@ 2 43 - plugins/DevicesDetection/images/brand/Unknown.png + plugins/Morpheus/icons/dist/brand/Unknown.png deviceBrand==Unknown \ No newline at end of file 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 0bb9cceec4..d97d63c1f2 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 @@ -563,7 +563,7 @@ @@ -762,7 +762,7 @@ - +   Unknown 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 4c9121ed82..13af6755f2 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 @@ - +   Unknown 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 1c30f1752e..b1c7db1191 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 d9b30ad3ca..39c0960025 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 @@ -731,7 +731,7 @@ @@ -905,7 +905,7 @@ - +   Unknown 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 14ea464a75..84bff31348 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 @@ - +   Unknown 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 6f742b60c7..71bbf00529 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 -- cgit v1.2.3