diff options
author | Stefan Giehl <stefan@piwik.org> | 2017-06-02 00:46:42 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-02 00:46:42 +0300 |
commit | 457d630c4fc33f6606a500ac439f688fc1508b2a (patch) | |
tree | 40b098944a2213ee424b9bd1b51b0d52af2ce816 /plugins/Contents | |
parent | 1821691bb1e333bed804cf7c83a363a74cb9f52a (diff) |
Improve handling of DevicePlugins to make it extendable (#11748)
* Improve handling of DevicePlugins to make it extendable
* update test files
* add some comments to explain automatic plugin column detection
* submodule update
Diffstat (limited to 'plugins/Contents')
5 files changed, 50 insertions, 10 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 0513e6b34b..24930328ff 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 @@ -89,9 +89,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -201,9 +205,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> 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 0513e6b34b..24930328ff 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 @@ -89,9 +89,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -201,9 +205,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> 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 0513e6b34b..24930328ff 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 @@ -89,9 +89,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -201,9 +205,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> 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 0513e6b34b..24930328ff 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 @@ -89,9 +89,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -201,9 +205,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> 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 0513e6b34b..24930328ff 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 @@ -89,9 +89,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -201,9 +205,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> |