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

Format deploy console messages to include protocol

Browse Source
This commit is contained in:
David Glasser
2014-10-13 17:36:21 -07:00
parent 51a23fc346
commit 8f3966fbf4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deploy.js
View File

@@ -386,7 +386,7 @@ var bundleAndDeploy = function (options) {
var buildDir = path.join(options.appDir, '.meteor', 'local', 'build_tar'); var buildDir = path.join(options.appDir, '.meteor', 'local', 'build_tar');
var bundlePath = path.join(buildDir, 'bundle'); var bundlePath = path.join(buildDir, 'bundle');
Console.stdout.write('Deploying to ' + site + '. Bundling...\n'); Console.stdout.write('Deploying to http://' + site + '. Bundling...\n');
var settings = null; var settings = null;
var messages = buildmessage.capture({ var messages = buildmessage.capture({
@@ -452,7 +452,7 @@ var bundleAndDeploy = function (options) {
var deployedAt = require('url').parse(result.payload.url); var deployedAt = require('url').parse(result.payload.url);
var hostname = deployedAt.hostname; var hostname = deployedAt.hostname;
Console.stdout.write('Now serving at ' + hostname + '\n'); Console.stdout.write('Now serving at http://' + hostname + '\n');
files.rm_recursive(buildDir); files.rm_recursive(buildDir);
if (! hostname.match(/meteor\.com$/)) { if (! hostname.match(/meteor\.com$/)) {

2
tools/test-utils.js
View File

@@ -113,7 +113,7 @@ exports.createAndDeployApp = function (sandbox, options) {
} }
var run = sandbox.run.apply(sandbox, runArgs); var run = sandbox.run.apply(sandbox, runArgs);
run.waitSecs(90); run.waitSecs(90);
run.match('Now serving at ' + name); run.match('Now serving at http://' + name);
run.waitSecs(10); run.waitSecs(10);
run.expectExit(0); run.expectExit(0);
return name; return name;

6
tools/tests/deploy-auth.js
View File

@@ -111,7 +111,7 @@ selftest.define('deploy - logged in', ['net', 'slow'], function () {
// deploy to the legacy app. // deploy to the legacy app.
var run = sandbox.run('deploy', noPasswordLegacyApp); var run = sandbox.run('deploy', noPasswordLegacyApp);
run.waitSecs(90); run.waitSecs(90);
run.match('Now serving at ' + noPasswordLegacyApp); run.match('Now serving at http://' + noPasswordLegacyApp);
run.expectExit(0); run.expectExit(0);
// And we should have claimed the app by deploying to it. // And we should have claimed the app by deploying to it.
run = sandbox.run('claim', noPasswordLegacyApp); run = sandbox.run('claim', noPasswordLegacyApp);
@@ -141,7 +141,7 @@ selftest.define('deploy - logged in', ['net', 'slow'], function () {
run.expectExit(0); run.expectExit(0);
run = sandbox.run('deploy', passwordLegacyApp); run = sandbox.run('deploy', passwordLegacyApp);
run.waitSecs(90); run.waitSecs(90);
run.match('Now serving at ' + passwordLegacyApp); run.match('Now serving at http://' + passwordLegacyApp);
run.expectExit(0); run.expectExit(0);
// Clean up // Clean up
testUtils.cleanUpApp(sandbox, passwordLegacyApp); testUtils.cleanUpApp(sandbox, passwordLegacyApp);
@@ -193,7 +193,7 @@ selftest.define('deploy - logged out', ['net', 'slow'], function () {
run.matchErr('Password:'); run.matchErr('Password:');
run.write('testtest\n'); run.write('testtest\n');
run.waitSecs(90); run.waitSecs(90);
run.match('Now serving at ' + appName); run.match('Now serving at http://' + appName);
run.expectExit(0); run.expectExit(0);
testUtils.cleanUpApp(s, appName); testUtils.cleanUpApp(s, appName);