fix tests - there was a race condition with connect based tests & revert hapi to 9.5.1

Author: Michael Mrowetz

project-skeletons/connect/app.js

@@ -2,22 +2,24 @@
 
 var SwaggerConnect = require('swagger-connect');
 var app = require('connect')();
-module.exports = app; // for testing
+// export setup Promis for testing
+module.exports = new Promise(function (resolve, reject) {
+  var config = {
+    appRoot: __dirname // required config
+  };
 
-var config = {
-  appRoot: __dirname // required config
-};
+  SwaggerConnect.create(config, function (err, swaggerConnect) {
+    if (err) { throw err; }
 
-SwaggerConnect.create(config, function(err, swaggerConnect) {
-  if (err) { throw err; }
+    // install middleware
+    swaggerConnect.register(app);
 
-  // install middleware
-  swaggerConnect.register(app);
+    var port = process.env.PORT || 10010;
+    app.listen(port);
 
-  var port = process.env.PORT || 10010;
-  app.listen(port);
-
-  if (swaggerConnect.runner.swagger.paths['/hello']) {
-    console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
-  }
-});
+    if (swaggerConnect.runner.swagger.paths['/hello']) {
+      console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
+    }
+    resolve(app);
+  });
+});

project-skeletons/express/app.js

@@ -2,22 +2,25 @@
 
 var SwaggerExpress = require('swagger-express-mw');
 var app = require('express')();
-module.exports = app; // for testing
+// export setup Promis for testing
+module.exports = new Promise(function (resolve, reject) {
 
-var config = {
-  appRoot: __dirname // required config
-};
+  var config = {
+    appRoot: __dirname // required config
+  };
 
-SwaggerExpress.create(config, function(err, swaggerExpress) {
-  if (err) { throw err; }
+  SwaggerExpress.create(config, function (err, swaggerExpress) {
+    if (err) { throw err; }
 
-  // install middleware
-  swaggerExpress.register(app);
+    // install middleware
+    swaggerExpress.register(app);
 
-  var port = process.env.PORT || 10010;
-  app.listen(port);
-
-  if (swaggerExpress.runner.swagger.paths['/hello']) {
-    console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
-  }
-});
+    var port = process.env.PORT || 10010;
+    app.listen(port, function() {
+      if (swaggerExpress.runner.swagger.paths['/hello']) {
+        console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
+      }
+      resolve(app);
+    });
+  });
+});

project-skeletons/hapi/app.js

@@ -4,27 +4,33 @@ var SwaggerHapi = require('swagger-hapi');
 var Hapi = require('hapi');
 var app = new Hapi.Server();
 
-module.exports = app; // for testing
+// export setup Promis for testing
+module.exports = new Promise(function (resolve, reject) {
 
-var config = {
-  appRoot: __dirname // required config
-};
+  var config = {
+    appRoot: __dirname // required config
+  };
 
-SwaggerHapi.create(config, function(err, swaggerHapi) {
-  if (err) { throw err; }
+  SwaggerHapi.create(config, function (err, swaggerHapi) {
+    if (err) { throw err; }
 
-  var port = process.env.PORT || 10010;
-  app.connection({ port: port });
-  app.address = function() {
-    return { port: port };
-  };
+    var port = process.env.PORT || 10010;
+    app.connection({ port: port });
+    app.address = function () {
+      return { port: port };
+    };
 
-  app.register(swaggerHapi.plugin, function(err) {
-    if (err) { return console.error('Failed to load plugin:', err); }
-    app.start(function() {
-      if (swaggerHapi.runner.swagger.paths['/hello']) {
-        console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
+    app.register(swaggerHapi.plugin, function (err) {
+      if (err) {
+        console.error('Failed to load plugin:', err);
+        reject(err);
       }
+      app.start(function () {
+        if (swaggerHapi.runner.swagger.paths['/hello']) {
+          console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
+        }
+        resolve(app);
+      });
     });
   });
 });

project-skeletons/hapi/package.json

@@ -8,7 +8,7 @@
   "license": "",
   "main": "app.js",
   "dependencies": {
-    "hapi": "^16.1.1",
+    "hapi": "^9.5.1",
     "swagger-hapi": "^0.7.0"
   },
   "devDependencies":  {

project-skeletons/restify/app.js

@@ -4,21 +4,24 @@ var SwaggerRestify = require('swagger-restify-mw');
 var restify = require('restify');
 var app = restify.createServer();
 
-module.exports = app; // for testing
+// export setup Promis for testing
+module.exports = new Promise(function (resolve, reject) {
 
-var config = {
-  appRoot: __dirname // required config
-};
+  var config = {
+    appRoot: __dirname // required config
+  };
 
-SwaggerRestify.create(config, function(err, swaggerRestify) {
-  if (err) { throw err; }
+  SwaggerRestify.create(config, function (err, swaggerRestify) {
+    if (err) { throw err; }
 
-  swaggerRestify.register(app);
+    swaggerRestify.register(app);
 
-  var port = process.env.PORT || 10010;
-  app.listen(port);
-
-  if (swaggerRestify.runner.swagger.paths['/hello']) {
-    console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
-  }
-});
+    var port = process.env.PORT || 10010;
+    app.listen(port, function () {
+      if (swaggerRestify.runner.swagger.paths['/hello']) {
+        console.log('try this:\ncurl http://127.0.0.1:' + port + '/hello?name=Scott');
+      }
+      resolve(app);
+    });
+  });
+});

test/project-skeletons/common.js

@@ -25,7 +25,7 @@ function testFramework(framework) {
     var tmpDir, projPath, server, sails;
 
     before(function(done) {
-      this.timeout(90000);
+      this.timeout(180000);
 
       tmp.setGracefulCleanup();
 
@@ -54,8 +54,13 @@ function testFramework(framework) {
                 done(err);
               });
             } else {
-              server = require(projPath + '/app.js');
-              done();
+              // promis that resolves when the app is stated
+              require(projPath + '/app.js')
+                .then(function(app) {
+                  server = app;
+                  done();
+                })
+                .catch(done);
             }
           });
         });