Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2014-12-21 02:50:24 +0300
committersgiehl <stefan@piwik.org>2014-12-21 02:50:24 +0300
commit837eb1e625a9f34c7f6ede5e02cd6ebc8ff49b84 (patch)
treeb4aa9967ac48f80e8b374a8767817e730bc04321 /plugins/Contents
parent30bec38c4f36254f26097f810aaf139e9a42a61d (diff)
fixed some tests
Diffstat (limited to 'plugins/Contents')
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml36
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml36
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml36
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml36
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml36
5 files changed, 90 insertions, 90 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 a57da45c9a..95459f0177 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
@@ -49,17 +49,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -92,6 +81,17 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
@@ -147,13 +147,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>director</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -186,6 +179,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</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 a57da45c9a..95459f0177 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
@@ -49,17 +49,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -92,6 +81,17 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
@@ -147,13 +147,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>director</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -186,6 +179,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</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 a57da45c9a..95459f0177 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
@@ -49,17 +49,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -92,6 +81,17 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
@@ -147,13 +147,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>director</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -186,6 +179,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</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 a57da45c9a..95459f0177 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
@@ -49,17 +49,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -92,6 +81,17 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
@@ -147,13 +147,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>director</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -186,6 +179,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</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 a57da45c9a..95459f0177 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
@@ -49,17 +49,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -92,6 +81,17 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
@@ -147,13 +147,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <plugins>director</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
- <pluginName>director</pluginName>
- </row>
- </pluginsIcons>
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
@@ -186,6 +179,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
+ <plugins>director</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+ <pluginName>director</pluginName>
+ </row>
+ </pluginsIcons>