Merge pull request #26 from mocks-server/v1.2.0

V1.2.0

Author: javierbrea

.eslintrc.json

@@ -15,6 +15,7 @@
         "parser": "flow"
       }
     ],
+    "no-undef": "error",
     "no-unused-vars": ["error", { "vars": "all", "args": "after-used", "ignoreRestSiblings": false }]
   },
   "extends": ["prettier"],

CHANGELOG.md

@@ -14,6 +14,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Removed
 
+## [1.2.0] - 2019-11-13
+### Added
+- Add api acceptance tests
+
+### Changed
+- Upgrade dependencies
+
+### Fixed
+- Catch server.listen error and reject start method promise with it when occurs.
+
 ## [1.1.1] - 2019-11-12
 ### Changed
 - Change readme. Add links to docs website.

jest.config.js

@@ -28,6 +28,6 @@ module.exports = {
   testEnvironment: "node",
 
   // The glob patterns Jest uses to detect test files
-  testMatch: ["**/test/unit/**/?(*.)+(spec|test).js?(x)"],
+  testMatch: ["**/test/unit/**/?(*.)+(spec|test).js?(x)"]
   //testMatch: ["**/test/unit/**/options.spec.js"]
 };

lib/Server.js

@@ -127,17 +127,25 @@ class Server {
   }
 
   startServer(resolve, reject) {
-    this._server.listen(this._options, error => {
-      if (error) {
-        tracer.error(`Error starting server: ${error.message}`);
-        this._error = error;
-        reject(error);
-      } else {
-        tracer.info(`Server started and listening at http://localhost:${this._options.port}`);
-        this._error = null;
-        resolve(this);
-      }
-    });
+    try {
+      this._server.listen(this._options, error => {
+        if (error) {
+          tracer.error(`Error starting server: ${error.message}`);
+          this._serverStarting = false;
+          this._serverStarted = false;
+          this._error = error;
+          reject(error);
+        } else {
+          tracer.info(`Server started and listening at http://localhost:${this._options.port}`);
+          this._error = null;
+          this._serverStarting = false;
+          this._serverStarted = true;
+          resolve(this);
+        }
+      });
+    } catch (error) {
+      reject(error);
+    }
   }
 
   get settings() {