diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-03-28 20:38:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 20:38:53 +0300 |
| commit | a0f0eb8fa0cc86e14afeabde80d2a21a7e0122d9 (patch) | |
| tree | c43d4e5cada42fd9275ada7dc85e1c31320b6e05 /plugins/Contents | |
| parent | 8179b7897d6ba0538b7b24274e451d3613bbebc9 (diff) | |
All icons in own repo and included as a submodule (#11548)
* add icons submodule
* replace path
* change submodule url
* fix JSONTest
* fix integration tests
* update icon submodules
* fix preg_match
* fix remaining system tests
* better match for non dist icon files
* fix .gitmodules
* update icon submodule
* Fixed custom dimension test
* Do not completely fail when GD not enabled
* Fix http test + refactor checklist
* Refactored the code into a method
* Changed icon path refs https://github.com/piwik/piwik/pull/11383
* System tests
* Update valid UI tests
* Fix integration test
Diffstat (limited to 'plugins/Contents')
5 files changed, 35 insertions, 35 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 784d322f4a..436975fff5 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 784d322f4a..436975fff5 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 784d322f4a..436975fff5 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 784d322f4a..436975fff5 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 784d322f4a..436975fff5 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> |