@villedemontreal/http-request 7.4.11 → 7.5.0

package/dist/src/httpUtils.test.js

@@ -2,15 +2,6 @@
 // Ok in test files :
 // tslint:disable:no-string-literal
 // tslint:disable: max-func-body-length
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const src_1 = require("@villedemontreal/general-utils/dist/src");
 const chai_1 = require("chai");
@@ -30,50 +21,50 @@ const superagentMocker = require('superagent-mocker');
 (0, testingConfigurations_1.setTestingConfigurations)();
 describe('httpUtils', () => {
     describe('urlJoin', () => {
-        it('single param with slash', () => __awaiter(void 0, void 0, void 0, function* () {
+        it('single param with slash', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/'), 'http://google.com');
-        }));
-        it('single param no slash', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('single param no slash', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com'), 'http://google.com');
-        }));
-        it('with slashes', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with slashes', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', 'foo/', '/bar/'), 'http://google.com/foo/bar');
-        }));
-        it('without slashes', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('without slashes', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com', 'foo', 'bar'), 'http://google.com/foo/bar');
-        }));
-        it('without double slashes', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('without double slashes', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', '//foo/', '//bar/'), 'http://google.com/foo/bar');
-        }));
-        it('with slashes without text', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with slashes without text', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', '///', '//bar/'), 'http://google.com/bar');
-        }));
-        it('with slashes and empty text', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with slashes and empty text', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', '', '//bar/'), 'http://google.com/bar');
-        }));
-        it('with slashes and null text', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with slashes and null text', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', null, '//bar/'), 'http://google.com/bar');
-        }));
-        it('with slashes and undefined text', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with slashes and undefined text', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://google.com/', undefined, '//bar/'), 'http://google.com/bar');
-        }));
-        it('with http 2 slashes', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with http 2 slashes', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://', 'google.com', 'foo', 'bar'), 'http://google.com/foo/bar');
-        }));
-        it('with http 1 slash', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with http 1 slash', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http:/', 'google.com', 'foo', 'bar'), 'http://google.com/foo/bar');
-        }));
-        it('with http no slash', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('with http no slash', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http:', 'google.com', 'foo', 'bar'), 'http://google.com/foo/bar');
-        }));
-        it('another example', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('another example', async () => {
             chai_1.assert.equal(httpUtils_1.httpUtils.urlJoin('http://api.montreal.ca/accounts/', '/inum', '@5441521452', 'tickets'), 'http://api.montreal.ca/accounts/inum/@5441521452/tickets');
-        }));
+        });
     });
     describe('send', () => {
         describe('mocked', () => {
             let mock;
-            before(() => __awaiter(void 0, void 0, void 0, function* () {
+            before(async () => {
                 mock = superagentMocker(superagent);
                 mock.get('http://localhost/test', (req) => {
                     return {
@@ -82,25 +73,25 @@ describe('httpUtils', () => {
                         },
                     };
                 });
-            }));
-            after(() => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            after(async () => {
                 mock.clearRoutes();
                 mock.unmock(superagent);
-            }));
-            it('URL must have a hostname', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('URL must have a hostname', async () => {
                 const request = superagent.get('/test');
                 try {
-                    yield httpUtils_1.httpUtils.send(request);
+                    await httpUtils_1.httpUtils.send(request);
                     chai_1.assert.fail('expected send to throw an error');
                 }
                 catch (err) {
                     chai_1.assert.strictEqual(err.message, 'The URL in your request MUST have a protocol and a hostname. Received: /test');
                 }
-            }));
-            it('The Correlation Id is set automatically', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('The Correlation Id is set automatically', async () => {
                 const currentCid = configs_1.configs.correlationId;
                 const request = superagent.get('http://localhost/test').set('titi', '123');
-                const response = yield httpUtils_1.httpUtils.send(request);
+                const response = await httpUtils_1.httpUtils.send(request);
                 chai_1.assert.isOk(response);
                 chai_1.assert.isOk(response.status);
                 chai_1.assert.strictEqual(response.status, 200);
@@ -109,8 +100,8 @@ describe('httpUtils', () => {
                 const headers = response.body.headers;
                 chai_1.assert.strictEqual(headers.titi, '123');
                 chai_1.assert.strictEqual(headers[http_header_fields_typed_1.default.X_CORRELATION_ID.toLowerCase()], currentCid);
-            }));
-            it('Regular response response', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('Regular response response', async () => {
                 for (const status of [200, 201, 301, 400, 404, 500, 501]) {
                     mock.get('http://localhost/test', (req) => {
                         return {
@@ -121,48 +112,48 @@ describe('httpUtils', () => {
                         };
                     });
                     const request = superagent.get('http://localhost/test');
-                    const response = yield httpUtils_1.httpUtils.send(request);
+                    const response = await httpUtils_1.httpUtils.send(request);
                     chai_1.assert.isOk(response);
                     chai_1.assert.isOk(response.status);
                     chai_1.assert.strictEqual(response.status, status);
                     chai_1.assert.isObject(response.body);
                     chai_1.assert.strictEqual(response.body.msg, 'titi');
                 }
-            }));
-            it('Timeouts are added, if not already set', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('Timeouts are added, if not already set', async () => {
                 const request = superagent.get('http://localhost/test').set('titi', '123');
                 chai_1.assert.isUndefined(request['_responseTimeout']);
                 chai_1.assert.isUndefined(request['_timeout']);
-                const response = yield httpUtils_1.httpUtils.send(request);
+                const response = await httpUtils_1.httpUtils.send(request);
                 chai_1.assert.isOk(response);
                 chai_1.assert.strictEqual(request['_responseTimeout'], constants_1.constants.request.timeoutsDefault.response);
                 chai_1.assert.strictEqual(request['_timeout'], constants_1.constants.request.timeoutsDefault.deadline);
-            }));
-            it('Response timeout already set', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('Response timeout already set', async () => {
                 const request = superagent.get('http://localhost/test').set('titi', '123');
                 request.timeout({
                     response: 55555,
                 });
                 chai_1.assert.strictEqual(request['_responseTimeout'], 55555);
                 chai_1.assert.isUndefined(request['_timeout']);
-                const response = yield httpUtils_1.httpUtils.send(request);
+                const response = await httpUtils_1.httpUtils.send(request);
                 chai_1.assert.isOk(response);
                 chai_1.assert.strictEqual(request['_responseTimeout'], 55555);
                 chai_1.assert.strictEqual(request['_timeout'], constants_1.constants.request.timeoutsDefault.deadline);
-            }));
-            it('Deadline timeout already set', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('Deadline timeout already set', async () => {
                 const request = superagent.get('http://localhost/test').set('titi', '123');
                 request.timeout({
                     deadline: 55555,
                 });
                 chai_1.assert.isUndefined(request['_responseTimeout']);
                 chai_1.assert.strictEqual(request['_timeout'], 55555);
-                const response = yield httpUtils_1.httpUtils.send(request);
+                const response = await httpUtils_1.httpUtils.send(request);
                 chai_1.assert.isOk(response);
                 chai_1.assert.strictEqual(request['_responseTimeout'], constants_1.constants.request.timeoutsDefault.response);
                 chai_1.assert.strictEqual(request['_timeout'], 55555);
-            }));
-            it('Both timeouts timeout already set', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('Both timeouts timeout already set', async () => {
                 const request = superagent.get('http://localhost/test').set('titi', '123');
                 request.timeout({
                     deadline: 55555,
@@ -170,34 +161,34 @@ describe('httpUtils', () => {
                 });
                 chai_1.assert.strictEqual(request['_responseTimeout'], 66666);
                 chai_1.assert.strictEqual(request['_timeout'], 55555);
-                const response = yield httpUtils_1.httpUtils.send(request);
+                const response = await httpUtils_1.httpUtils.send(request);
                 chai_1.assert.isOk(response);
                 chai_1.assert.strictEqual(request['_responseTimeout'], 66666);
                 chai_1.assert.strictEqual(request['_timeout'], 55555);
-            }));
+            });
         });
         describe('Network/Server error', () => {
-            it('Network/Server error', () => __awaiter(void 0, void 0, void 0, function* () {
+            it('Network/Server error', async () => {
                 const mock = superagentMocker(superagent);
                 mock.get('http://localhost/test', (req) => {
                     throw new Error('Network error');
                 });
                 try {
                     const request = superagent.get('http://localhost/test');
-                    const response = yield httpUtils_1.httpUtils.send(request);
+                    const response = await httpUtils_1.httpUtils.send(request);
                     chai_1.assert.isNotOk(response);
                     chai_1.assert.fail();
                 }
                 catch (err) {
                     /* ok */
                 }
-            }));
+            });
         });
         describe('not mocked', () => {
-            it('Errors are handled properly', () => __awaiter(void 0, void 0, void 0, function* () {
+            it('Errors are handled properly', async () => {
                 try {
                     const request = superagent.get('httttp://nope').timeout(100);
-                    const response = yield httpUtils_1.httpUtils.send(request);
+                    const response = await httpUtils_1.httpUtils.send(request);
                     chai_1.assert.isNotOk(response);
                     chai_1.assert.fail();
                 }
@@ -206,7 +197,7 @@ describe('httpUtils', () => {
                     chai_1.assert.isTrue('msg' in err);
                     chai_1.assert.isTrue('originalError' in err);
                 }
-            }));
+            });
         });
     });
     describe(`Express request related tests`, () => {
@@ -214,38 +205,34 @@ describe('httpUtils', () => {
         let server;
         let port;
         let expressRequest;
-        function startServer(caseSensitive) {
-            return __awaiter(this, void 0, void 0, function* () {
-                app = express();
-                app.set('case sensitive routing', caseSensitive);
-                app.get('/', (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-                    expressRequest = req;
-                    res.sendStatus(HttpStatusCodes.OK);
-                }));
-                port = yield src_1.utils.findFreePort();
-                server = yield app.listen(port);
+        async function startServer(caseSensitive) {
+            app = express();
+            app.set('case sensitive routing', caseSensitive);
+            app.get('/', async (req, res, next) => {
+                expressRequest = req;
+                res.sendStatus(HttpStatusCodes.OK);
             });
+            port = await src_1.utils.findFreePort();
+            server = app.listen(port);
         }
-        function send(pathAndQueryString) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const superagentRequest = superagent.get(`http://localhost:${port}${pathAndQueryString}`);
-                const response = yield httpUtils_1.httpUtils.send(superagentRequest);
-                chai_1.assert.strictEqual(response.status, HttpStatusCodes.OK);
-            });
+        async function send(pathAndQueryString) {
+            const superagentRequest = superagent.get(`http://localhost:${port}${pathAndQueryString}`);
+            const response = await httpUtils_1.httpUtils.send(superagentRequest);
+            chai_1.assert.strictEqual(response.status, HttpStatusCodes.OK);
         }
         describe(`Query params functions - Case sensitive`, () => {
-            before(() => __awaiter(void 0, void 0, void 0, function* () {
+            before(async () => {
                 // ==========================================
                 // Set the configs for case sensitivity!
                 // ==========================================
                 (0, testingConfigurations_1.setTestingConfigurations)(true);
-                yield startServer(true);
-            }));
+                await startServer(true);
+            });
             after(() => {
                 server.close();
             });
-            it(`no query params`, () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/`);
+            it(`no query params`, async () => {
+                await send(`/`);
                 const values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, []);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -256,9 +243,9 @@ describe('httpUtils', () => {
                 chai_1.assert.deepEqual(value, undefined);
                 value = httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
                 chai_1.assert.deepEqual(value, undefined);
-            }));
-            it(`one query params - simple string`, () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?k=toto`);
+            });
+            it(`one query params - simple string`, async () => {
+                await send(`/?k=toto`);
                 let values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, ['toto']);
                 values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'K'); // case sensitive
@@ -313,10 +300,10 @@ describe('httpUtils', () => {
                     return 123;
                 });
                 chai_1.assert.deepEqual(value, 123);
-            }));
-            it('one query params - date string', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('one query params - date string', async () => {
                 const dateStr = '2020-04-21T17:13:33.107Z';
-                yield send(`/?k=${encodeURIComponent(dateStr)}`);
+                await send(`/?k=${encodeURIComponent(dateStr)}`);
                 const values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, [dateStr]);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -371,10 +358,10 @@ describe('httpUtils', () => {
                     chai_1.assert.fail();
                 }
                 chai_1.assert.deepEqual(error.message, `Custom Error`);
-            }));
-            it('one query params - number string', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('one query params - number string', async () => {
                 const testNumber = 123;
-                yield send(`/?k=${testNumber}`);
+                await send(`/?k=${testNumber}`);
                 const values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, [testNumber + '']);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -401,18 +388,18 @@ describe('httpUtils', () => {
                 if (!error) {
                     chai_1.assert.fail();
                 }
-            }));
-            it(`one query params - boolean`, () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?k=true`);
+            });
+            it(`one query params - boolean`, async () => {
+                await send(`/?k=true`);
                 let value = httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
                 chai_1.assert.deepEqual(value, true);
-                yield send(`/?k=TrUe`);
+                await send(`/?k=TrUe`);
                 value = httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
                 chai_1.assert.deepEqual(value, true);
-                yield send(`/?k=false`);
+                await send(`/?k=false`);
                 value = httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
                 chai_1.assert.deepEqual(value, false);
-                yield send(`/?k=0`);
+                await send(`/?k=0`);
                 let error;
                 try {
                     httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
@@ -423,7 +410,7 @@ describe('httpUtils', () => {
                 if (!error) {
                     chai_1.assert.fail();
                 }
-                yield send(`/?k=1`);
+                await send(`/?k=1`);
                 try {
                     httpUtils_1.httpUtils.getQueryParamOneAsBoolean(expressRequest, 'k');
                 }
@@ -433,9 +420,9 @@ describe('httpUtils', () => {
                 if (!error) {
                     chai_1.assert.fail();
                 }
-            }));
-            it('two different query params', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?k1=123&k2=titi`);
+            });
+            it('two different query params', async () => {
+                await send(`/?k1=123&k2=titi`);
                 let values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k1');
                 chai_1.assert.deepEqual(values, ['123']);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k1');
@@ -444,9 +431,9 @@ describe('httpUtils', () => {
                 chai_1.assert.deepEqual(values, ['titi']);
                 value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k2');
                 chai_1.assert.deepEqual(value, 'titi');
-            }));
-            it('two different query params, different only by casing!', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?k=123&K=titi`);
+            });
+            it('two different query params, different only by casing!', async () => {
+                await send(`/?k=123&K=titi`);
                 let values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, ['123']);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -455,11 +442,11 @@ describe('httpUtils', () => {
                 chai_1.assert.deepEqual(values, ['titi']);
                 value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'K');
                 chai_1.assert.deepEqual(value, 'titi');
-            }));
-            it('One query param with multiple values - first value is a number, second value is a date', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('One query param with multiple values - first value is a number, second value is a date', async () => {
                 const dateStr = '2020-04-21T17:13:33.107Z';
                 const testNumber = 123;
-                yield send(`/?k=${testNumber}&k=${encodeURIComponent(dateStr)}`);
+                await send(`/?k=${testNumber}&k=${encodeURIComponent(dateStr)}`);
                 const values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, [testNumber + '', dateStr]);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -478,11 +465,11 @@ describe('httpUtils', () => {
                 if (!error) {
                     chai_1.assert.fail();
                 }
-            }));
-            it('One query param with multiple values - first value is a date, second value is a number', () => __awaiter(void 0, void 0, void 0, function* () {
+            });
+            it('One query param with multiple values - first value is a date, second value is a number', async () => {
                 const dateStr = '2020-04-21T17:13:33.107Z';
                 const testNumber = 123;
-                yield send(`/?k=${encodeURIComponent(dateStr)}&k=${testNumber}`);
+                await send(`/?k=${encodeURIComponent(dateStr)}&k=${testNumber}`);
                 const values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k');
                 chai_1.assert.deepEqual(values, [dateStr, testNumber + '']);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k');
@@ -494,21 +481,21 @@ describe('httpUtils', () => {
                 // last value wins and can be parsed to a number
                 value = httpUtils_1.httpUtils.getQueryParamOneAsNumber(expressRequest, 'k');
                 chai_1.assert.deepEqual(value, testNumber);
-            }));
+            });
         });
         describe('Query params functions - Case insensitive', () => {
-            before(() => __awaiter(void 0, void 0, void 0, function* () {
+            before(async () => {
                 // ==========================================
                 // Set the configs for case insensitivity!
                 // ==========================================
                 (0, testingConfigurations_1.setTestingConfigurations)(false);
-                yield startServer(false);
-            }));
+                await startServer(false);
+            });
             after(() => {
                 server.close();
             });
-            it('two different query params, different by casing!', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?k=123&K=titi`);
+            it('two different query params, different by casing!', async () => {
+                await send(`/?k=123&K=titi`);
                 let values = httpUtils_1.httpUtils.getQueryParamAll(expressRequest, 'k'); // lowercase
                 chai_1.assert.deepEqual(values, ['123', 'titi']);
                 let value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'k'); // lowercase
@@ -517,30 +504,30 @@ describe('httpUtils', () => {
                 chai_1.assert.deepEqual(values, ['123', 'titi']);
                 value = httpUtils_1.httpUtils.getQueryParamOne(expressRequest, 'K'); // uppercase
                 chai_1.assert.deepEqual(value, 'titi'); // last value wins
-            }));
+            });
         });
         describe('getOrderBys - Case insensitive', () => {
-            before(() => __awaiter(void 0, void 0, void 0, function* () {
+            before(async () => {
                 (0, testingConfigurations_1.setTestingConfigurations)(false);
-                yield startServer(false);
-            }));
+                await startServer(false);
+            });
             after(() => {
                 server.close();
             });
-            it('Nil', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/`);
+            it('Nil', async () => {
+                await send(`/`);
                 let orderBys = httpUtils_1.httpUtils.getOrderBys(null);
                 chai_1.assert.deepEqual(orderBys, []);
                 orderBys = httpUtils_1.httpUtils.getOrderBys(undefined);
                 chai_1.assert.deepEqual(orderBys, []);
-            }));
-            it('No orderBys', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/`);
+            });
+            it('No orderBys', async () => {
+                await send(`/`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, []);
-            }));
-            it('one orderBy, default is asc', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=name`);
+            });
+            it('one orderBy, default is asc', async () => {
+                await send(`/?orderBy=name`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -548,9 +535,9 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.ASC,
                     },
                 ]);
-            }));
-            it('one orderBy, explicit asc', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=+name`);
+            });
+            it('one orderBy, explicit asc', async () => {
+                await send(`/?orderBy=+name`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -558,9 +545,9 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.ASC,
                     },
                 ]);
-            }));
-            it('one orderBy, desc', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=-name`);
+            });
+            it('one orderBy, desc', async () => {
+                await send(`/?orderBy=-name`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -568,9 +555,9 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.DESC,
                     },
                 ]);
-            }));
-            it('multiple orderBys', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=-name,age,+nick,-color`);
+            });
+            it('multiple orderBys', async () => {
+                await send(`/?orderBy=-name,age,+nick,-color`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -590,9 +577,9 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.DESC,
                     },
                 ]);
-            }));
-            it('The case sensitivity of the "orderBy" key is not important', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?ORDERBY=-name`);
+            });
+            it('The case sensitivity of the "orderBy" key is not important', async () => {
+                await send(`/?ORDERBY=-name`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -600,9 +587,9 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.DESC,
                     },
                 ]);
-            }));
-            it('The case sensitivity of the orderBy *value* is kept', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=-NAME`);
+            });
+            it('The case sensitivity of the orderBy *value* is kept', async () => {
+                await send(`/?orderBy=-NAME`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -610,23 +597,23 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.DESC,
                     },
                 ]);
-            }));
+            });
         });
         describe('getOrderBys - Case sensitive', () => {
-            before(() => __awaiter(void 0, void 0, void 0, function* () {
+            before(async () => {
                 (0, testingConfigurations_1.setTestingConfigurations)(true);
-                yield startServer(true);
-            }));
+                await startServer(true);
+            });
             after(() => {
                 server.close();
             });
-            it('The case sensitivity of the "orderBy" key is important', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?ORDERBY=-name`);
+            it('The case sensitivity of the "orderBy" key is important', async () => {
+                await send(`/?ORDERBY=-name`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, []);
-            }));
-            it('The case sensitivity of the orderBy *value* is kept', () => __awaiter(void 0, void 0, void 0, function* () {
-                yield send(`/?orderBy=-NAME`);
+            });
+            it('The case sensitivity of the orderBy *value* is kept', async () => {
+                await send(`/?orderBy=-NAME`);
                 const orderBys = httpUtils_1.httpUtils.getOrderBys(expressRequest);
                 chai_1.assert.deepEqual(orderBys, [
                     {
@@ -634,7 +621,7 @@ describe('httpUtils', () => {
                         direction: src_1.OrderByDirection.DESC,
                     },
                 ]);
-            }));
+            });
         });
     });
 });