18 files changed, 260 insertions, 19 deletions
diff --git a/plugins/DevicePlugins/DevicePlugins.php b/plugins/DevicePlugins/DevicePlugins.php
index 3ac882e8ce..5ddc6d15d3 100644
--- a/plugins/DevicePlugins/DevicePlugins.php
+++ b/plugins/DevicePlugins/DevicePlugins.php
@@ -25,6 +25,7 @@ class DevicePlugins extends \Piwik\Plugin
         return array(
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
             'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
+            'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
         );
     }
 
@@ -45,4 +46,10 @@ class DevicePlugins extends \Piwik\Plugin
         $translations = array_merge($translations, $metrics);
     }
 
+    public function renameUserSettingsModuleAndAction(&$module, &$action)
+    {
+        if ($module == 'UserSettings' && $action == 'getPlugin') {
+            $module = 'DevicePlugins';
+        }
+    }
 }
diff --git a/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php b/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php
new file mode 100644
index 0000000000..1901960abb
--- /dev/null
+++ b/plugins/DevicePlugins/tests/System/UserSettingsBCTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\DevicePlugins\tests\System;
+
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * @group DevicePlugins
+ * @group DevicePlugins_System
+ */
+class UserSettingsBCTest extends SystemTestCase
+{
+    /**
+     * @var OneVisitorTwoVisits
+     */
+    public static $fixture;
+
+    /**
+     * @dataProvider getApiForTesting
+     */
+    public function test_Api($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    public function getApiForTesting()
+    {
+        $idSite = self::$fixture->idSite;
+        $dateTime = self::$fixture->dateTime;
+
+        $api = array(
+            'UserSettings.getPlugin',
+        );
+
+        $result = array();
+
+
+        foreach ($api as $method) {
+            list($module, $action) = explode('.', $method);
+
+            // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
+            // against DevicePlugins & overwrite the module & action w/ otherRequestParameters)
+            $result[] = array('DevicePlugins.getPlugin', array('idSite' => $idSite,
+                'date' => $dateTime,
+                'periods' => array('day'),
+                'testSuffix' => $module . '_' . $method . '_',
+                'otherRequestParameters' => array(
+                    'method' => $method,
+                ),
+            ));
+
+            // api metadata tests
+            $result[] = array('API.getMetadata', array(
+                'idSite' => $idSite,
+                'date' => $dateTime,
+                'apiModule' => $module,
+                'apiAction' => $action,
+                'testSuffix' => $module . '_' . $method . '_',
+            ));
+        }
+
+        return $result;
+    }
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
+}
+
+UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
+\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
index 9a4f403963..9a4f403963 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
+++ b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicesDetection.getBrowsers_day.xml b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicePlugins.getPlugin_day.xml
index 72728977e1..72728977e1 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicesDetection.getBrowsers_day.xml
+++ b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___DevicePlugins.getPlugin_day.xml
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index a4c9f419a1..2fd7b59fd2 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -66,17 +66,5 @@ class DevicesDetection extends \Piwik\Plugin
             $module = 'DevicesDetection';
             $action = $movedMethods[$action];
         }
-
-        if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
-            $module = 'Resolution';
-        }
-
-        if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) {
-            $module = 'UserLanguage';
-        }
-
-        if ($module == 'UserSettings' && $action == 'getPlugin') {
-            $module = 'DevicePlugins';
-        }
     }
 }
diff --git a/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php b/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php
index 32e133556d..e86887780d 100644
--- a/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php
+++ b/plugins/DevicesDetection/tests/System/UserSettingsBCTest.php
@@ -42,11 +42,6 @@ class UserSettingsBCTest extends SystemTestCase
             'UserSettings.getOS',
             'UserSettings.getOSFamily',
             'UserSettings.getBrowserType',
-            'UserSettings.getResolution',
-            'UserSettings.getConfiguration',
-            'UserSettings.getLanguage',
-            'UserSettings.getLanguageCode',
-            'UserSettings.getPlugin',
         );
 
         $result = array();
diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php
index 5ab7692ccf..7bd8cc3be0 100644
--- a/plugins/Resolution/Resolution.php
+++ b/plugins/Resolution/Resolution.php
@@ -23,6 +23,7 @@ class Resolution extends \Piwik\Plugin
     {
         return array(
             'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
+            'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
         );
     }
 
@@ -32,4 +33,11 @@ class Resolution extends \Piwik\Plugin
 
         $visitor['resolution']               = $instance->getResolution();
     }
+
+    public function renameUserSettingsModuleAndAction(&$module, &$action)
+    {
+        if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
+            $module = 'Resolution';
+        }
+    }
 }
diff --git a/plugins/Resolution/tests/System/UserSettingsBCTest.php b/plugins/Resolution/tests/System/UserSettingsBCTest.php
new file mode 100644
index 0000000000..beae888701
--- /dev/null
+++ b/plugins/Resolution/tests/System/UserSettingsBCTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Resolution\tests\System;
+
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * @group Resolution
+ * @group Resolution_System
+ */
+class UserSettingsBCTest extends SystemTestCase
+{
+    /**
+     * @var OneVisitorTwoVisits
+     */
+    public static $fixture;
+
+    /**
+     * @dataProvider getApiForTesting
+     */
+    public function test_Api($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    public function getApiForTesting()
+    {
+        $idSite = self::$fixture->idSite;
+        $dateTime = self::$fixture->dateTime;
+
+        $api = array(
+            'UserSettings.getResolution',
+            'UserSettings.getConfiguration',
+        );
+
+        $result = array();
+
+
+        foreach ($api as $method) {
+            list($module, $action) = explode('.', $method);
+
+            // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
+            // against Resolution & overwrite the module & action w/ otherRequestParameters)
+            $result[] = array('Resolution.getResolution', array('idSite' => $idSite,
+                'date' => $dateTime,
+                'periods' => array('day'),
+                'testSuffix' => $module . '_' . $method . '_',
+                'otherRequestParameters' => array(
+                    'method' => $method,
+                ),
+            ));
+
+            // api metadata tests
+            $result[] = array('API.getMetadata', array(
+                'idSite' => $idSite,
+                'date' => $dateTime,
+                'apiModule' => $module,
+                'apiAction' => $action,
+                'testSuffix' => $module . '_' . $method . '_',
+            ));
+        }
+
+        return $result;
+    }
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
+}
+
+UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
+\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
index 01fee59915..01fee59915 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
+++ b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___API.getMetadata_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___DevicesDetection.getBrowsers_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___Resolution.getResolution_day.xml
index a4804d3e5d..a4804d3e5d 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___DevicesDetection.getBrowsers_day.xml
+++ b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getConfiguration___Resolution.getResolution_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
index b99815c557..b99815c557 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
+++ b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___API.getMetadata_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___DevicesDetection.getBrowsers_day.xml b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___Resolution.getResolution_day.xml
index 2d97656958..2d97656958 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___DevicesDetection.getBrowsers_day.xml
+++ b/plugins/Resolution/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getResolution___Resolution.getResolution_day.xml
diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index be892d4196..7bb409a5e3 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -22,7 +22,8 @@ class UserLanguage extends \Piwik\Plugin
     public function registerEvents()
     {
         return array(
-            'Live.getAllVisitorDetails'              => 'extendVisitorDetails'
+            'Live.getAllVisitorDetails'              => 'extendVisitorDetails',
+            'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
         );
     }
 
@@ -44,4 +45,11 @@ class UserLanguage extends \Piwik\Plugin
         $out .= '<h2 piwik-enriched-headline>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>';
         $out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage');
     }
-}
-\ No newline at end of file
+
+    public function renameUserSettingsModuleAndAction(&$module, &$action)
+    {
+        if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) {
+            $module = 'UserLanguage';
+        }
+    }
+}
diff --git a/plugins/UserLanguage/tests/System/UserSettingsBCTest.php b/plugins/UserLanguage/tests/System/UserSettingsBCTest.php
new file mode 100644
index 0000000000..208048b8cc
--- /dev/null
+++ b/plugins/UserLanguage/tests/System/UserSettingsBCTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\UserLanguage\tests\System;
+
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * @group UserLanguage
+ * @group UserLanguage_System
+ */
+class UserSettingsBCTest extends SystemTestCase
+{
+    /**
+     * @var OneVisitorTwoVisits
+     */
+    public static $fixture;
+
+    /**
+     * @dataProvider getApiForTesting
+     */
+    public function test_Api($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    public function getApiForTesting()
+    {
+        $idSite = self::$fixture->idSite;
+        $dateTime = self::$fixture->dateTime;
+
+        $api = array(
+            'UserSettings.getLanguage',
+            'UserSettings.getLanguageCode',
+        );
+
+        $result = array();
+
+        foreach ($api as $method) {
+            list($module, $action) = explode('.', $method);
+
+            // api test (uses hack to test UserSettings which doesn't exist anymore. we say we're testing
+            // against UserLanguage & overwrite the module & action w/ otherRequestParameters)
+            $result[] = array('UserLanguage.getLanguage', array('idSite' => $idSite,
+                'date' => $dateTime,
+                'periods' => array('day'),
+                'testSuffix' => $module . '_' . $method . '_',
+                'otherRequestParameters' => array(
+                    'method' => $method,
+                ),
+            ));
+
+            // api metadata tests
+            $result[] = array('API.getMetadata', array(
+                'idSite' => $idSite,
+                'date' => $dateTime,
+                'apiModule' => $module,
+                'apiAction' => $action,
+                'testSuffix' => $module . '_' . $method . '_',
+            ));
+        }
+
+        return $result;
+    }
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
+}
+
+UserSettingsBCTest::$fixture = new OneVisitorTwoVisits();
+\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
index 9bf598e68f..9bf598e68f 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___API.getMetadata_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___DevicesDetection.getBrowsers_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___UserLanguage.getLanguage_day.xml
index de31fc9d35..de31fc9d35 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___DevicesDetection.getBrowsers_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguageCode___UserLanguage.getLanguage_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
index 9e886e4c3f..9e886e4c3f 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___API.getMetadata_day.xml
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___DevicesDetection.getBrowsers_day.xml b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___UserLanguage.getLanguage_day.xml
index 2e95d73c83..2e95d73c83 100644
--- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___DevicesDetection.getBrowsers_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getLanguage___UserLanguage.getLanguage_day.xml