diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-08-11 10:17:20 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-08-11 10:17:20 +0300 |
| commit | 78426614c226c50ba3ab9afc37aa2821500fa6d5 (patch) | |
| tree | af0d74401e3425aea4e31ca3a61eb577ced4f52e /tests | |
| parent | 30ae2ddbd43e46c773a01467e9a7f6da95a02fb9 (diff) | |
In piwik.updatePeriodParamsFromUrl() get period/date values from hash or URL. (#13268)
* In piwik.updatePeriodParamsFromUrl() get period/date values from hash or URL.
* Remove date parameter from defaults in ajaxHelper, already handled properly below.
* Remove .only
* fixing tests & add new test for MultiSites
* correct screenshot
* upload screenshot + remove rejected change
* Remove port in Url::isLocalHost().
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PHPUnit/Unit/UrlTest.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/PHPUnit/Unit/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php index bb4a2ab1ba..e853ebca82 100644 --- a/tests/PHPUnit/Unit/UrlTest.php +++ b/tests/PHPUnit/Unit/UrlTest.php @@ -185,6 +185,14 @@ class UrlTest extends \PHPUnit_Framework_TestCase array($isLocal = true, '127.0.0.1'), array($isLocal = true, '::1'), array($isLocal = true, '[::1]'), + + // with port + array($isLocal = false, '172.30.1.1:80'), + array($isLocal = false, '3ffe:1900:4545:3:200:f8ff:fe21:67cf:1005'), + array($isLocal = true, 'localhost:3000'), + array($isLocal = true, '127.0.0.1:213424'), + array($isLocal = true, '::1:345'), + array($isLocal = true, '[::1]:443'), ); } |