fix(test): Update targets for up-to-date Hapi

test/gh_215_target.js

@@ -2,24 +2,24 @@
 
 const Hapi = require('hapi');
 
-const server = new Hapi.Server();
-server.connection({host: 'localhost', port: 3004});
-server.route([{
-  path: '/api/v1/register',
-  method: 'POST',
-  handler: register
-}]);
+const main = async() => {
+  const server = Hapi.server({ port: 3004, host: 'localhost' });
+  server.route({
+    path: '/api/v1/register',
+    method: 'POST',
+    handler: register
+  });
+  await server.start();
+  return server;
+};
 
-server.start(function(err) {
-  if (err) {
-    console.log(err);
-    process.exit(-1);
-  }
-  console.log('listening on 3004');
-});
+main()
+  .then((server) => console.log(`Listening on ${server.info.uri}`))
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
 
-function register(req, reply) {
-  setTimeout(function() {
-    reply({status: 'success'});
-  }, Math.floor(Math.random() * 50));
+function register(req, h) {
+  return {status: 'success'};
 }

test/targets/calc-server.js

@@ -5,8 +5,17 @@
 'use strict';
 
 const create = require('./targetServer').createCalcServer;
-const server = create('127.0.0.1', process.env.PORT);
 
-server.start().then(function() {
-  console.log('server listening on:', server.info.uri);
-});
+
+const main = async () => {
+  const server = create('127.0.0.1', process.env.PORT);
+  await server.start();
+  return server;
+};
+
+main()
+  .then((server) => console.log(`Server listening on ${server.info.uri}`))
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });

test/targets/targetServer.js

@@ -11,10 +11,7 @@ module.exports = {
 };
 
 function createServer(host, port) {
-  const server = new Hapi.Server();
-  host = host || '127.0.0.1';
-  port = port || Math.floor(Math.random() * 50000) + 4048;
-  server.connection({ host: host, port: port });
+  const server = Hapi.server({ port: port, host: host });
   return server;
 }
 
@@ -43,18 +40,18 @@ function createCalcServer(host, port) {
  * Example: curl -sv -X POST localhost:52628/double --data 'number=5'
  *
  */
-function double(req, reply) {
+function double(req, h) {
   if (!req.payload || !req.payload.number) {
-    return reply().code(400);
+    return h.response().code(400);
   }
 
   const number = Number(req.payload.number);
 
   if (isNaN(number)) {
-    return reply().code(400);
+    return h.response().code(400);
   }
 
-  return reply({ result: number * 2 }).code(200);
+  return h.response({ result: number * 2 }).code(200);
 }
 
 /**
@@ -63,16 +60,16 @@ function double(req, reply) {
  * Example: curl -sv -X POST localhost:52628/double --data 'number=1'
  *
  */
-function inc(req, reply) {
+function inc(req, h) {
   if (!req.payload || !req.payload.number) {
-    return reply().code(400);
+    return h.response().code(400);
   }
 
   const number = Number(req.payload.number);
 
   if (isNaN(number)) {
-    return reply().code(400);
+    return h.response().code(400);
   }
 
-  return reply({ result: number + 1 }).code(200);
+  return h.response({ result: number + 1 }).code(200);
 }