diff options
| -rw-r--r-- | plugins/SitesManager/API.php | 1 | ||||
| -rw-r--r-- | plugins/SitesManager/tests/Integration/ApiTest.php | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 933ba5f186..e6505320ad 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -418,6 +418,7 @@ class API extends \Piwik\Plugin\API // return all variations of the URL return array( + $url, "http://" . $hostname, "http://www." . $hostname, "https://" . $hostname, diff --git a/plugins/SitesManager/tests/Integration/ApiTest.php b/plugins/SitesManager/tests/Integration/ApiTest.php index 6f85c3abd7..011ff7a344 100644 --- a/plugins/SitesManager/tests/Integration/ApiTest.php +++ b/plugins/SitesManager/tests/Integration/ApiTest.php @@ -1004,22 +1004,21 @@ class ApiTest extends IntegrationTestCase public function test_getSitesIdFromSiteUrl_matchesBothHttpAndHttpsUrls_asSuperUser() { - API::getInstance()->addSite("site1", array("https://piwik.org", "http://example.com")); + API::getInstance()->addSite("site1", array("https://piwik.org", "http://example.com", "fb://special-url")); $this->assert_getSitesIdFromSiteUrl_matchesBothHttpAndHttpsUrls(); } public function test_getSitesIdFromSiteUrl_matchesBothHttpAndHttpsUrls_asUserWithViewPermission() { - API::getInstance()->addSite("site1", array("https://piwik.org", "http://example.com")); + API::getInstance()->addSite("site1", array("https://piwik.org", "http://example.com", "fb://special-url")); APIUsersManager::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias"); APIUsersManager::getInstance()->setUserAccess("user1", "view", array(1)); + // Make sure we're not Super user FakeAccess::setSuperUserAccess(false); FakeAccess::$identity = 'user1'; - - // Make sure we're not Super user $this->assertFalse(Piwik::hasUserSuperUserAccess()); $this->assert_getSitesIdFromSiteUrl_matchesBothHttpAndHttpsUrls(); @@ -1039,6 +1038,9 @@ class ApiTest extends IntegrationTestCase $idsites = API::getInstance()->getSitesIdFromSiteUrl('https://example.com'); $this->assertTrue(count($idsites) == 1); + $idsites = API::getInstance()->getSitesIdFromSiteUrl("fb://special-url"); + $this->assertTrue(count($idsites) == 1); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('https://random-example.com'); $this->assertTrue(count($idsites) == 0); |