diff options
author | Stefan Giehl <stefan@piwik.org> | 2017-07-14 16:31:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-14 16:31:51 +0300 |
commit | b9c953e43758815f016e11b96c9e7f6a303a8691 (patch) | |
tree | 279c2af0fc60a84eeb1ac82443d1853965a8494a /tests | |
parent | 301332312e558af9cc423842cf37ab7bb38973cc (diff) |
test libs folder for non unix line endings as well (#11871)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PHPUnit/Integration/ReleaseCheckListTest.php | 1 | ||||
-rw-r--r-- | tests/javascript/index.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 04fdfc0925..d3e764746a 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -417,7 +417,6 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase strpos($file, '/tests/') !== false || strpos($file, '/lang/') !== false || strpos($file, 'yuicompressor') !== false || - strpos($file, '/libs/') !== false || (strpos($file, '/vendor') !== false && strpos($file, '/vendor/piwik') === false) || strpos($file, '/tmp/') !== false || strpos($file, '/phantomjs/') !== false diff --git a/tests/javascript/index.php b/tests/javascript/index.php index fc18670f13..a0ce0769ce 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -2873,7 +2873,7 @@ function PiwikTest() { tracker.setUserId('test'); var replacedUrl = makeReplaceHrefForCrossDomainLink('http://www.example.com'); - ok(replacedUrl.indexOf('http://www.example.com?pk_vid=a94a8fe5ccb19ba615') === 0, 'replaceHrefForCrossDomainLink, should set parameters if a URL is given ' + replacedUrl); + ok(replacedUrl.indexOf('http://www.example.com?pk_vid=a94a8fe5ccb19ba615') === 0, 'replaceHrefForCrossDomainLink, should set parameters if a URL is given'); ok(replacedUrl.indexOf(browserId) > 20, 'replaceHrefForCrossDomainLink, should set browserId if a url is given'); replacedUrl = makeReplaceHrefForCrossDomainLink(makeUrlWithVisitorId(true, currentTimestamp, 'foobar')); |