Merge with 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

@@ -15,9 +15,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### 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() {

package-lock.json

@@ -30,10 +30,10 @@
     "mocks-server": "./bin/mocks-server"
   },
   "scripts": {
-    "lint": "eslint index.js lib test",
+    "lint": "eslint index.js lib test jest.config.js jest.acceptance.config.js",
     "lint-staged": "lint-staged",
     "test": "jest",
-    "test-acceptance": "jest --config=jest.acceptance.config.js",
+    "test-acceptance": "jest --config=jest.acceptance.config.js --runInBand",
     "test-ci": "npm run test && npm run test-acceptance",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
@@ -64,11 +64,16 @@
     "jest": "24.9.0",
     "lint-staged": "^9.4.2",
     "prettier": "^1.19.1",
+    "request": "^2.88.0",
+    "request-promise": "^4.2.5",
     "sinon": "^7.5.0"
   },
   "lint-staged": {
     "lib/**/*.js": "eslint",
-    "test/**/*.js": "eslint"
+    "test/**/*.js": "eslint",
+    "index.js": "eslint",
+    "jest.config.js": "eslint",
+    "jest.acceptance.config.js": "eslint"
   },
   "husky": {
     "hooks": {

package.json

@@ -0,0 +1,12 @@
+{
+  "globals": {
+    "jest": true,
+    "beforeAll": true,
+    "beforeEach": true,
+    "afterEach": true,
+    "afterAll": true,
+    "describe": true,
+    "expect": true,
+    "it": true
+  }
+}

test/.eslintrc.json

@@ -0,0 +1,42 @@
+/*
+Copyright 2019 Javier Brea
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+*/
+
+const { startServer, stopServer, request, changeDelay, TimeCounter } = require("./utils");
+
+describe("delay setting", () => {
+  let server;
+
+  beforeAll(async () => {
+    server = await startServer();
+  });
+
+  afterAll(() => {
+    stopServer(server);
+  });
+
+  describe("When started", () => {
+    it("should respond with no delay", async () => {
+      const timeCounter = new TimeCounter();
+      await request("/api/users");
+      timeCounter.stop();
+      expect(timeCounter.total).toBeLessThan(200);
+    });
+  });
+
+  describe("When delay is changed through admin-api", () => {
+    it("should respond after defined delay", async () => {
+      await changeDelay(1000);
+      const timeCounter = new TimeCounter();
+      await request("/api/users");
+      timeCounter.stop();
+      expect(timeCounter.total).toBeGreaterThan(999);
+    });
+  });
+});