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..3954dbc2 100644 --- a/test/test.js +++ b/test/test.js @@ -1681,6 +1681,37 @@ deepEqual(links, expected, 'urls extracted'); equal(result, source, 'source not modified'); }); + test('ensureValidPort', function() { + var result; + + console.dir(URI); + result = URI.ensureValidPort(8080); + equal(result, true); + + result = URI.ensureValidPort("8080"); + equal(result, true); + + result = URI.ensureValidPort('a8080'); + equal(result, undefined); + + result = URI.ensureValidPort('8080a'); + equal(result, undefined); + + result = URI.ensureValidPort('0'); + equal(result, undefined); + + result = URI.ensureValidPort('-1'); + equal(result, undefined); + + result = URI.ensureValidPort(65535); + equal(result, true); + + result = URI.ensureValidPort(65536); + equal(result, undefined); + + result = URI.ensureValidPort(80.1); + equal(result, undefined); + }); test('noConflict', function() { var actual_lib = URI; // actual library; after loading, before noConflict() var unconflicted = URI.noConflict();