Skip to content

if startPort is provided by user, actually use it #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2025
Merged

if startPort is provided by user, actually use it #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65274a6
if `startPort` is provided by user, actually use it
eriktrom Mar 14, 2025
8523a9c
Update test/port-finder.test.js
eriktrom Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/portfinder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ exports.setBasePath = function (path) {
};

internals.getPort = function (options, callback) {
options.port = Number(options.port) || Number(exports.basePort);
options.port = Number(options.port) || Number(options.startPort) || Number(exports.basePort);
options.host = options.host || null;
options.stopPort = Number(options.stopPort) || Number(exports.highestPort);

Expand Down
60 changes: 35 additions & 25 deletions test/port-finder.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
const portfinder = require('../lib/portfinder'),
helper = require('./helper');

portfinder.basePort = 32768;
const basePort = 32768;
portfinder.basePort = basePort;

describe('with 5 existing servers', function () {
const servers = [];
Expand Down Expand Up @@ -152,32 +153,41 @@ describe('with no existing servers', function () {
});
});

describe.each([
['getPort()', false, portfinder.getPort],
['getPort()', true, portfinder.getPort],
['getPortPromise()', true, portfinder.getPortPromise],
])(`the %s method (promise: %p)`, function (name, isPromise, method) {
test('with startPort less than or equal to 80', function (done) {
if (isPromise) {
method({ startPort: 80 })
Copy link
Member Author

@eriktrom eriktrom Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we had this test which was hiding the fact that startPort didn't even work - we thought we set it to port 80 and then tested it went higher but it was the basePort that was making it do that - now its correct

.then(function (port) {
expect(port).toBeGreaterThanOrEqual(80);

describe('with startPort provided', function () {
beforeAll(function () {
portfinder.basePort = 8000;
});
afterAll(function () {
portfinder.basePort = basePort;
});
describe.each([
['getPort()', false, portfinder.getPort],
['getPort()', true, portfinder.getPort],
['getPortPromise()', true, portfinder.getPortPromise],
])(`the %s method (promise: %p)`, function (name, isPromise, method) {
test('with startPort less than or equal to 9050', function (done) {
if (isPromise) {
method({ startPort: 9050 })
.then(function (port) {
expect(port).toBeGreaterThanOrEqual(9050);
done();
})
.catch(function (err) {
done(err);
});
} else {
method({ startPort: 9050 }, function (err, port) {
if (err) {
done(err);
return;
}
expect(err).toBeNull();
expect(port).toBeGreaterThanOrEqual(9050);
done();
})
.catch(function (err) {
done(err);
});
} else {
method({ startPort: 80 }, function (err, port) {
if (err) {
done(err);
return;
}
expect(err).toBeNull();
expect(port).toBeGreaterThanOrEqual(80);
done();
});
}
}
});
});
});

Expand Down