github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6964 from abernix/issue-6961-fix-test-bindaddr

Browse Source 
Allow --port in "test" to support a bindaddr, same as non-test
This commit is contained in:
Tom Coleman
2016-05-03 15:46:27 -07:00
parent a2da8d5c54 454a76191c
commit b2bb995ddf
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/cli/commands.js
View File

@@ -1671,7 +1671,12 @@ function doTestCommand(options) {
return runTestAppForPackages(projectContext, _.extend(
options,
{ mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) }));
{
mobileServerUrl: utils.formatUrl(parsedMobileServerUrl),
proxyPort: parsedServerUrl.port,
proxyHost: parsedServerUrl.host,
}
));
}
// Returns the "local-test:*" package names for the given package names (or for
@@ -1755,7 +1760,8 @@ var runTestAppForPackages = function (projectContext, options) {
var runAll = require('../runners/run-all.js');
return runAll.run({
projectContext: projectContext,
proxyPort: options.port,
proxyPort: options.proxyPort,
proxyHost: options.proxyHost,
debugPort: options['debug-port'],
disableOplog: options['disable-oplog'],
settingsFile: options.settings,

35
tools/tests/run.js
View File

@@ -391,11 +391,11 @@ selftest.define("run and SIGKILL parent process", ["yet-unsolved-windows-failure
run.stop();
});
selftest.define("'meteor run --port' requires a port", function () {
selftest.define("'meteor run --port' accepts/rejects proper values", function () {
var s = new Sandbox();
var run;
s.createApp("myapp", "app-prints-pid");
s.createApp("myapp", "standard-app");
s.cd("myapp");
run = s.run("run", "--port", "example.com");
@@ -407,6 +407,37 @@ selftest.define("'meteor run --port' requires a port", function () {
run.waitSecs(30);
run.matchErr("--port must include a port");
run.expectExit(1);
run = s.run("run", "--port", "3500");
run.match('App running at: http://localhost:3500/');
run.stop();
run = s.run("run", "--port", "127.0.0.1:3500");
run.match('App running at: http://127.0.0.1:3500/');
run.stop();
});
selftest.define("'meteor test --port' accepts/rejects proper values", function () {
var s = new Sandbox();
var run;
s.createApp("myapp", "standard-app");
s.cd("myapp");
var runAddPackage = s.run("add", "practicalmeteor:mocha");
runAddPackage.waitSecs(30);
runAddPackage.match(/practicalmeteor:mocha\b.*?added/)
runAddPackage.expectExit(0);
run = s.run("test", "--port", "3700", "--driver-package", "practicalmeteor:mocha");
run.waitSecs(30);
run.match('App running at: http://localhost:3700/');
run.stop();
run = s.run("test", "--port", "127.0.0.1:3700", "--driver-package", "practicalmeteor:mocha");
run.waitSecs(30);
run.match('App running at: http://127.0.0.1:3700/');
run.stop();
});
// Regression test for #3582. Previously, meteor run would ignore changes to