assignment3

zoe-1 · Dec 25, 2017 · 7cd9e61 · 7cd9e61
1 parent 7630cda
commit 7cd9e61
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -13,7 +13,7 @@ const Version = require('./version');
 const internals = {};
 
 internals.customPlugins = [
-    { plugin: Version, options: { message: 'lesson2' } }
+    { plugin: Version, options: { message: 'lesson3' } }
 ];
 
 internals.init = async (serverOptions) => {

diff --git a/lib/start.js b/lib/start.js
@@ -14,25 +14,33 @@ internals.serverOptions = {
     port: process.env.PORT || 8000
 };
 
-// @todo clean this up
-// Server.init(internals.serverOptions,(err, server) => {
-//
-//     console.log('server started' + server.info.uri);
-// });
+Server.init(internals.serverOptions)
+    .then((server) => {
+
+        console.log('Server started: ' + server.info.uri);
+    })
+    .catch((err) => {
+
+        console.log('Error: ' + err);
+    });
+
+// @option async style
+// const Start = async () => {
+// 
+//     // try {
+// 
+//     //     const server = await  Server.init(internals.serverOptions);
+// 
+//     //     console.log('starting server ' + server.info.uri);
+//     //     // await server.stop();
+//     // }
+//     // catch (err) {
+// 
+//     //     console.log('WATCHER ' + err);
+//     // }
+// 
+// 
+// };
+// 
+// Start();
 
-const Start = async () => {
-
-    try {
-
-        const server = await  Server.init(internals.serverOptions);
-
-        console.log('starting server ' + server.info.uri);
-        // await server.stop();
-    }
-    catch (err) {
-
-        console.log('WATCHER ' + err);
-    }
-};
-
-Start();
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "university-v1.0.0",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "rewrite of the university",
   "main": "lib/index.js",
   "directories": {

diff --git a/test/version.js b/test/version.js
@@ -14,26 +14,19 @@ const it = lab.test;
 
 const internals = {};
 
-// server options
-
-internals.serverOptions = {
-    port: process.env.PORT || 8000
-};
-
-
 describe('/version', () => {
 
     it('/version success', { parallel: false }, async () => {
 
         const University = require('../lib');
 
-        const server = await University.init(internals.serverOptions);
+        const server = await University.init({});
 
         expect(server).to.be.an.object();
 
         const res = await server.inject('/version');
 
-        expect(res.result).to.equal('version 1.0.0 lesson2');
+        expect(res.result).to.equal('version 1.0.3 lesson3');
         await server.stop();
     });
 });