New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move old brand icons to piwik icons #11635
Conversation
As usual we need to change plugins/CustomDimensions. (hopefully for the last time) diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
index 9b55fd8..899c81f 100644
--- a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
+++ b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
@@ -65,7 +65,7 @@
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
- <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
<operatingSystem>Windows XP</operatingSystem>
@@ -183,7 +183,7 @@
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
- <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
<operatingSystem>Windows XP</operatingSystem>
@@ -299,7 +299,7 @@
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
- <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
<operatingSystem>Windows XP</operatingSystem>
@@ -447,7 +447,7 @@
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
- <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
<operatingSystem>Windows XP</operatingSystem>
@@ -563,7 +563,7 @@
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
- <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
<operatingSystem>Windows XP</operatingSystem> |
The mentioned diff should already be applied. But guess there might be changes in brand icons. |
You are right that was the previous change. Seems like there are no brand icons in the test files. $ grep -r "brand"
tests/System/expected/test___API.getReportMetadata_day.xml: <name>Device brand</name>
tests/System/expected/test___API.getReportMetadata_day.xml: <dimension>Device brand</dimension>
tests/System/expected/test___API.getSegmentsMetadata.xml: <name>Device brand</name> |
Yesterday I have replaced the most important brands with better icons: matomo-org/matomo-icons@583c1ad It was easier than I thought because Wikimedia has many of them (even as svg). |
@Findus23 guess that would be good to merge. Do you have time to rebase and update the expected screenshots and remaining system test files? |
@sgiehl I'll finish it as far as I'm able to. Notes:
I hope I didn't destroy anything in git lfs with bd803d5 |
Those changes are caused by the precise image update of travis. Guess we simply need to update those screenshots as well |
Two more things:
I've seen them before. Can I just update the number? I tried to download the system test artifacts but |
No problem. Simply update those tests as well.
No, the files needs to be updates. That message occurs for non xml files like csv or pdf. |
That makes sense. But I can't replace them as the download from builds-artifacts.piwik.org doesn't work and I the still haven't looked into running the tests locally. Could you commit them? (The branch is called |
I'm able to download the file in the browser. I'll update those files |
Ok. Now all tests seem to run again 👍 |
had another rough look through all changes. Looks good. Will merge now 🎉 |
First step towards #11626
I'll look into the tests later.