commit 5ddf778cddcc16bf582e8c0fab67c2e8f76ff2e2
author Benjamin Prosnitz <bprosnitz@google.com> Wed Apr 01 21:27:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 21:27:48 2015 +0000
tree 499a954a9a085d53561f9c460ae0a8bcdd141776
parent df497e73252c9ca1c4d310312ea6142fba6493b2
parent 631e7f46012303698b645232e2377fd62fcead37

Merge "Update playground for calling convention changes"

client/bundles/fortune/src/server/server.js

diff --git a/client/bundles/fortune/src/server/server.js b/client/bundles/fortune/src/server/server.js
index 4da88b1..91b3abb 100644
--- a/client/bundles/fortune/src/server/server.js
+++ b/client/bundles/fortune/src/server/server.js
@@ -29,7 +29,7 @@
   var randomIndex = Math.floor(Math.random() * numExistingfortunes);
   var fortune = this.fortunes[randomIndex];
   console.info('Serving:', fortune);
-  return fortune;
+  return Promise.resolve(fortune);
 };
 
 // Adds a new fortune
@@ -39,6 +39,7 @@
   }
   console.info('Adding:', fortune);
   this.fortunes.push(fortune);
+  return Promise.resolve();
 };
 
 /**

go/src/playground/testdata/src/pong/pong.js

diff --git a/go/src/playground/testdata/src/pong/pong.js b/go/src/playground/testdata/src/pong/pong.js
index 49c3134..9fec979 100644
--- a/go/src/playground/testdata/src/pong/pong.js
+++ b/go/src/playground/testdata/src/pong/pong.js
@@ -13,7 +13,7 @@
 
 PingPongService.prototype.ping = function(ctx, message) {
   console.log('[' + ctx.remoteBlessingStrings + '] ' + message);
-  return 'PONG';
+  return Promise.resolve('PONG');
 };
 
 var pingPongService = new PingPongService();