From db49b9316545a19f9a7391d981ee79a1610ad4ce Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Date: Wed, 9 Aug 2017 11:04:22 -0400 Subject: [PATCH] fix(Number.isInteger) Add polyfill for Number.isInteger - #350 --- src/URI.js | 8 ++++++-- test/test.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/URI.js b/src/URI.js index 03f2c6c1..effa0e03 100644 --- a/src/URI.js +++ b/src/URI.js @@ -77,6 +77,10 @@ return this; } + function isInteger(value) { + return /^[0-9]+$/.test(value); + } + URI.version = '1.18.11'; var p = URI.prototype; @@ -1058,8 +1062,8 @@ } var port = Number(v); - if (Number.isInteger(port) && (port > 0) && (port < 65536)) { - return; + if (isInteger(port) && (port > 0) && (port < 65536)) { + return true; } throw new TypeError('Port "' + v + '" is not a valid port'); diff --git a/test/test.js b/test/test.js index 8ebf8623..d6f91da5 100644 --- a/test/test.js +++ b/test/test.js @@ -1681,6 +1681,36 @@ deepEqual(links, expected, 'urls extracted'); equal(result, source, 'source not modified'); }); + test('ensureValidPort', function() { + + function testPort(value) { + var result = true; + try { + URI.ensureValidPort(value); + } catch(e) { + result = false; + } + + return result; + } + + equal(testPort(8000), true); + equal(testPort('8080'), true); + + equal(testPort(0), false); + equal(testPort(1), true); + + equal(testPort(65535), true); + equal(testPort(65536), false); + + equal(testPort(-8080), false); + equal(testPort('-8080'), false); + + equal(testPort('a8080'), false); + equal(testPort('8080a'), false); + + equal(testPort(8080.2), false); + }); test('noConflict', function() { var actual_lib = URI; // actual library; after loading, before noConflict() var unconflicted = URI.noConflict();