@loopback/testlab 1.9.4 → 1.10.2

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.10.2](https://github.com/strongloop/loopback-next/compare/@loopback/testlab@1.10.1...@loopback/testlab@1.10.2) (2020-01-27)
+
+**Note:** Version bump only for package @loopback/testlab
+
+
+
+
+
+## [1.10.1](https://github.com/strongloop/loopback-next/compare/@loopback/testlab@1.10.0...@loopback/testlab@1.10.1) (2020-01-07)
+
+**Note:** Version bump only for package @loopback/testlab
+
+
+
+
+
+# [1.10.0](https://github.com/strongloop/loopback-next/compare/@loopback/testlab@1.9.5...@loopback/testlab@1.10.0) (2019-12-09)
+
+
+### Features
+
+* **testlab:** allow an optional agent argument for http/https get requests ([d67384b](https://github.com/strongloop/loopback-next/commit/d67384be5806bbcdab4a935d848a9c76da0a354c))
+
+
+
+
+
+## [1.9.5](https://github.com/strongloop/loopback-next/compare/@loopback/testlab@1.9.4...@loopback/testlab@1.9.5) (2019-11-25)
+
+**Note:** Version bump only for package @loopback/testlab
+
+
+
+
+
 ## [1.9.4](https://github.com/strongloop/loopback-next/compare/@loopback/testlab@1.9.3...@loopback/testlab@1.9.4) (2019-11-12)
 
 **Note:** Version bump only for package @loopback/testlab

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import * as http from 'http';
+import http from 'http';
 import supertest = require('supertest');
 export { supertest };
 export declare type Client = supertest.SuperTest<supertest.Test>;

package/dist/client.js

@@ -3,11 +3,14 @@
 // Node module: @loopback/testlab
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * HTTP client utilities
  */
-const http = require("http");
+const http_1 = __importDefault(require("http"));
 const supertest = require("supertest");
 exports.supertest = supertest;
 /**
@@ -16,7 +19,7 @@ exports.supertest = supertest;
  * @param handler
  */
 function createClientForHandler(handler) {
-    const server = http.createServer(handler);
+    const server = http_1.default.createServer(handler);
     return supertest(server);
 }
 exports.createClientForHandler = createClientForHandler;
@@ -27,7 +30,8 @@ exports.createClientForHandler = createClientForHandler;
  * @param app - A running (listening) instance of a RestApplication.
  */
 function createRestAppClient(app) {
-    const url = app.restServer.rootUrl || app.restServer.url;
+    var _a;
+    const url = (_a = app.restServer.rootUrl, (_a !== null && _a !== void 0 ? _a : app.restServer.url));
     if (!url) {
         throw new Error(`Cannot create client for ${app.constructor.name}, it is not listening.`);
     }

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAEhE;;GAEG;AAEH,6BAA6B;AAC7B,uCAAwC;AAEhC,8BAAS;AAIjB;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,OAAsE;IAEtE,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AALD,wDAKC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,GAAwB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;IACzD,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,IAAI,KAAK,CACb,4BAA4B,GAAG,CAAC,WAAW,CAAC,IAAI,wBAAwB,CACzE,CAAC;KACH;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AARD,kDAQC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE;;GAEG;AAEH,gDAAwB;AACxB,uCAAwC;AAEhC,8BAAS;AAIjB;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,OAAsE;IAEtE,MAAM,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AALD,wDAKC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,GAAwB;;IAC1D,MAAM,GAAG,SAAG,GAAG,CAAC,UAAU,CAAC,OAAO,uCAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAA,CAAC;IACzD,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,IAAI,KAAK,CACb,4BAA4B,GAAG,CAAC,WAAW,CAAC,IAAI,wBAAwB,CACzE,CAAC;KACH;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AARD,kDAQC"}

package/dist/http-error-logger.js

@@ -11,10 +11,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 function createUnexpectedHttpErrorLogger(expectedStatusCode) {
     return function logUnexpectedHttpError(err, statusCode, req) {
+        var _a;
         if (statusCode === expectedStatusCode)
             return;
         /* istanbul ignore next */
-        console.error('Unhandled error in %s %s: %s %s', req.method, req.url, statusCode, err.stack || err);
+        console.error('Unhandled error in %s %s: %s %s', req.method, req.url, statusCode, (_a = err.stack, (_a !== null && _a !== void 0 ? _a : err)));
     };
 }
 exports.createUnexpectedHttpErrorLogger = createUnexpectedHttpErrorLogger;

package/dist/http-error-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-error-logger.js","sourceRoot":"","sources":["../src/http-error-logger.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAKhE;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,kBAA2B;IAE3B,OAAO,SAAS,sBAAsB,CACpC,GAAU,EACV,UAAkB,EAClB,GAAoB;QAEpB,IAAI,UAAU,KAAK,kBAAkB;YAAE,OAAO;QAE9C,0BAA0B;QAC1B,OAAO,CAAC,KAAK,CACX,iCAAiC,EACjC,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,GAAG,EACP,UAAU,EACV,GAAG,CAAC,KAAK,IAAI,GAAG,CACjB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnBD,0EAmBC"}
+{"version":3,"file":"http-error-logger.js","sourceRoot":"","sources":["../src/http-error-logger.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAKhE;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,kBAA2B;IAE3B,OAAO,SAAS,sBAAsB,CACpC,GAAU,EACV,UAAkB,EAClB,GAAoB;;QAEpB,IAAI,UAAU,KAAK,kBAAkB;YAAE,OAAO;QAE9C,0BAA0B;QAC1B,OAAO,CAAC,KAAK,CACX,iCAAiC,EACjC,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,GAAG,EACP,UAAU,QACV,GAAG,CAAC,KAAK,uCAAI,GAAG,GACjB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnBD,0EAmBC"}

package/dist/http-server-config.js

@@ -3,13 +3,16 @@
 // Node module: @loopback/testlab
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const path = require("path");
-const FIXTURES = path.resolve(__dirname, '../fixtures');
+const path_1 = __importDefault(require("path"));
+const FIXTURES = path_1.default.resolve(__dirname, '../fixtures');
 const DUMMY_TLS_CONFIG = {
-    key: fs_1.readFileSync(path.join(FIXTURES, 'key.pem')),
-    cert: fs_1.readFileSync(path.join(FIXTURES, 'cert.pem')),
+    key: fs_1.readFileSync(path_1.default.join(FIXTURES, 'key.pem')),
+    cert: fs_1.readFileSync(path_1.default.join(FIXTURES, 'cert.pem')),
 };
 /**
  * Create an HTTP-server configuration that works well in test environments.

package/dist/http-server-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-server-config.js","sourceRoot":"","sources":["../src/http-server-config.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAEhE,2BAAgC;AAGhC,6BAA6B;AAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG;IACvB,GAAG,EAAE,iBAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,iBAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CACpD,CAAC;AAeF;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,YAAgB;IAEhB,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,SAAS;KACpB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3D,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,cAAc,CAAC,MAAM,CAAC,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAfD,sDAeC;AAED,SAAS,cAAc,CAAC,MAA0B;IAChD,IAAI,KAAK,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO;IAChD,IAAI,KAAK,IAAI,MAAM;QAAE,OAAO;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,aAAa,CACpB,MAAkC;IAElC,OAAO,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"http-server-config.js","sourceRoot":"","sources":["../src/http-server-config.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,2BAAgC;AAGhC,gDAAwB;AAExB,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG;IACvB,GAAG,EAAE,iBAAY,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,iBAAY,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CACpD,CAAC;AAeF;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,YAAgB;IAEhB,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,SAAS;KACpB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3D,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,cAAc,CAAC,MAAM,CAAC,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAfD,sDAeC;AAED,SAAS,cAAc,CAAC,MAA0B;IAChD,IAAI,KAAK,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO;IAChD,IAAI,KAAK,IAAI,MAAM;QAAE,OAAO;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,aAAa,CACpB,MAAkC;IAElC,OAAO,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC;AAC/C,CAAC"}

package/dist/request.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="node" />
-import { IncomingMessage } from 'http';
+import http, { IncomingMessage } from 'http';
+import https from 'https';
 /**
  * Async wrapper for making HTTP GET requests
  * @param urlString
  */
-export declare function httpGetAsync(urlString: string): Promise<IncomingMessage>;
+export declare function httpGetAsync(urlString: string, agent?: http.Agent): Promise<IncomingMessage>;
 /**
  * Async wrapper for making HTTPS GET requests
  * @param urlString
  */
-export declare function httpsGetAsync(urlString: string): Promise<IncomingMessage>;
+export declare function httpsGetAsync(urlString: string, agent?: https.Agent): Promise<IncomingMessage>;

package/dist/request.js

@@ -3,17 +3,22 @@
 // Node module: @loopback/testlab
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const http = require("http");
-const https = require("https");
-const url = require("url");
+const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
+const url_1 = __importDefault(require("url"));
 /**
  * Async wrapper for making HTTP GET requests
  * @param urlString
  */
-function httpGetAsync(urlString) {
+function httpGetAsync(urlString, agent) {
     return new Promise((resolve, reject) => {
-        http.get(urlString, resolve).on('error', reject);
+        const urlOptions = url_1.default.parse(urlString);
+        const options = Object.assign({ agent }, urlOptions);
+        http_1.default.get(options, resolve).on('error', reject);
     });
 }
 exports.httpGetAsync = httpGetAsync;
@@ -21,14 +26,14 @@ exports.httpGetAsync = httpGetAsync;
  * Async wrapper for making HTTPS GET requests
  * @param urlString
  */
-function httpsGetAsync(urlString) {
-    const agent = new https.Agent({
+function httpsGetAsync(urlString, agent) {
+    agent = (agent !== null && agent !== void 0 ? agent : new https_1.default.Agent({
         rejectUnauthorized: false,
-    });
-    const urlOptions = url.parse(urlString);
+    }));
+    const urlOptions = url_1.default.parse(urlString);
     const options = Object.assign({ agent }, urlOptions);
     return new Promise((resolve, reject) => {
-        https.get(options, resolve).on('error', reject);
+        https_1.default.get(options, resolve).on('error', reject);
     });
 }
 exports.httpsGetAsync = httpsGetAsync;

package/dist/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAGhE,6BAA6B;AAC7B,+BAA+B;AAC/B,2BAA2B;AAE3B;;;GAGG;AACH,SAAgB,YAAY,CAAC,SAAiB;IAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,oCAIC;AAED;;;GAGG;AACH,SAAgB,aAAa,CAAC,SAAiB;IAC7C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC;QAC5B,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,OAAO,mBAAI,KAAK,IAAK,UAAU,CAAC,CAAC;IAEvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC;AAXD,sCAWC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,gDAA2C;AAC3C,kDAA0B;AAC1B,8CAAsB;AAEtB;;;GAGG;AACH,SAAgB,YAAY,CAC1B,SAAiB,EACjB,KAAkB;IAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,aAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,OAAO,mBAAI,KAAK,IAAK,UAAU,CAAC,CAAC;QACvC,cAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC;AATD,oCASC;AAED;;;GAGG;AACH,SAAgB,aAAa,CAC3B,SAAiB,EACjB,KAAmB;IAEnB,KAAK,IACH,KAAK,aAAL,KAAK,cAAL,KAAK,GACL,IAAI,eAAK,CAAC,KAAK,CAAC;QACd,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAA,CAAC;IAEL,MAAM,UAAU,GAAG,aAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,OAAO,mBAAI,KAAK,IAAK,UAAU,CAAC,CAAC;IAEvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,eAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC;AAhBD,sCAgBC"}

package/dist/shot.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import * as express from 'express';
+import express from 'express';
 import { IncomingMessage, ServerResponse } from 'http';
 import { Listener as ShotListener, RequestOptions as ShotRequestOptions, ResponseObject } from 'shot';
 declare const inject: (dispatchFunc: ShotListener, options: ShotRequestOptions) => Promise<ResponseObject>;

package/dist/shot.js

@@ -3,14 +3,17 @@
 // Node module: @loopback/testlab
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * HTTP Request/Response mocks
  * https://github.com/hapijs/shot
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const express = require("express");
-const util = require("util");
+const express_1 = __importDefault(require("express"));
+const util_1 = __importDefault(require("util"));
 const inject = require('@hapi/shot');
 exports.inject = inject;
 const ShotRequest = require('@hapi/shot/lib/request');
@@ -47,10 +50,10 @@ function stubHandlerContext(requestOptions = { url: '/' }) {
 }
 exports.stubHandlerContext = stubHandlerContext;
 function stubExpressContext(requestOptions = { url: '/' }) {
-    const app = express();
+    const app = express_1.default();
     const request = new ShotRequest(requestOptions);
     // mix in Express Request API
-    const RequestApi = express.request;
+    const RequestApi = express_1.default.request;
     for (const key of Object.getOwnPropertyNames(RequestApi)) {
         Object.defineProperty(request, key, Object.getOwnPropertyDescriptor(RequestApi, key));
     }
@@ -61,8 +64,8 @@ function stubExpressContext(requestOptions = { url: '/' }) {
     const result = new Promise(resolve => {
         response = new ShotResponse(request, resolve);
         // mix in Express Response API
-        Object.assign(response, express.response);
-        const ResponseApi = express.response;
+        Object.assign(response, express_1.default.response);
+        const ResponseApi = express_1.default.response;
         for (const key of Object.getOwnPropertyNames(ResponseApi)) {
             Object.defineProperty(response, key, Object.getOwnPropertyDescriptor(ResponseApi, key));
         }
@@ -83,11 +86,11 @@ function parseQuery(request) {
     // Use `express.query` to parse the query string
     // See https://github.com/expressjs/express/blob/master/lib/express.js#L79
     // See https://github.com/expressjs/express/blob/master/lib/middleware/query.js
-    express.query()(request, {}, () => { });
+    express_1.default.query()(request, {}, () => { });
 }
 function defineCustomContextInspect(context, requestOptions) {
     // Setup custom inspect functions to make test error messages easier to read
-    const inspectOpts = (depth, opts) => util.inspect(requestOptions, opts);
+    const inspectOpts = (depth, opts) => util_1.default.inspect(requestOptions, opts);
     defineCustomInspect(context.request, (depth, opts) => `[RequestStub with options ${inspectOpts(depth, opts)}]`);
     defineCustomInspect(context.response, (depth, opts) => `[ResponseStub for request with options ${inspectOpts(depth, opts)}]`);
     context.result = context.result.then(r => {
@@ -96,6 +99,6 @@ function defineCustomContextInspect(context, requestOptions) {
     });
 }
 function defineCustomInspect(obj, inspectFn) {
-    obj[util.inspect.custom] = inspectFn;
+    obj[util_1.default.inspect.custom] = inspectFn;
 }
 //# sourceMappingURL=shot.js.map

package/dist/shot.js.map

@@ -1 +1 @@
-{"version":3,"file":"shot.js","sourceRoot":"","sources":["../src/shot.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAEhE;;;GAGG;AAEH,uDAAuD;AAEvD,mCAAmC;AAOnC,6BAA6B;AAE7B,MAAM,MAAM,GAGmB,OAAO,CAAC,YAAY,CAAC,CAAC;AAG7C,wBAAM;AAEd,MAAM,WAAW,GAAoB,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAGvE,SAAgB,iBAAiB,CAC/B,OAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,oCAAoC;IACpC,0EAA0E;IAC1E,kEAAkE;IAClE,yCAAyC;IACzC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,8CAUC;AAED,MAAM,YAAY,GAAqB,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAQ1E,SAAgB,kBAAkB,CAChC,OAAwB,EACxB,KAAmB;IAEnB,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,oCAAoC;IACpC,0EAA0E;IAC1E,kEAAkE;IAClE,yCAAyC;IACzC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,gDAWC;AAUD,SAAgB,kBAAkB,CAChC,iBAAqC,EAAC,GAAG,EAAE,GAAG,EAAC;IAE/C,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAClD,IAAI,QAAoC,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAmB,OAAO,CAAC,EAAE;QACrD,QAAQ,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAC,OAAO,EAAE,QAAQ,EAAE,QAAS,EAAE,MAAM,EAAC,CAAC;IACvD,0BAA0B,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC;AAZD,gDAYC;AASD,SAAgB,kBAAkB,CAChC,iBAAqC,EAAC,GAAG,EAAE,GAAG,EAAC;IAE/C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,cAAc,CAAoB,CAAC;IACnE,6BAA6B;IAC7B,MAAM,UAAU,GAAI,OAAe,CAAC,OAAO,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;QACxD,MAAM,CAAC,cAAc,CACnB,OAAO,EACP,GAAG,EACH,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,GAAG,CAAE,CAClD,CAAC;KACH;IACD,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;IAClB,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAClC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEpB,IAAI,QAAsC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAmB,OAAO,CAAC,EAAE;QACrD,QAAQ,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,CAAqB,CAAC;QAClE,8BAA8B;QAC9B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAG,OAAe,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,WAAW,GAAI,OAAe,CAAC,QAAQ,CAAC;QAC9C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;YACzD,MAAM,CAAC,cAAc,CACnB,QAAQ,EACR,GAAG,EACH,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,GAAG,CAAE,CACnD,CAAC;SACH;QACD,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;QAClB,QAAgB,CAAC,GAAG,GAAG,OAAO,CAAC;QAC/B,OAAe,CAAC,GAAG,GAAG,QAAQ,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,EAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAS,EAAE,MAAM,EAAC,CAAC;IAC5D,0BAA0B,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC;AAxCD,gDAwCC;AAED;;;GAGG;AACH,SAAS,UAAU,CAAC,OAAwB;IAC1C,gDAAgD;IAChD,0EAA0E;IAC1E,+EAA+E;IAC9E,OAAe,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,0BAA0B,CACjC,OAA2B,EAC3B,cAAkC;IAElC,4EAA4E;IAC5E,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,IAAS,EAAE,EAAE,CAC/C,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAErC,mBAAmB,CACjB,OAAO,CAAC,OAAO,EACf,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,6BAA6B,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAC1E,CAAC;IAEF,mBAAmB,CACjB,OAAO,CAAC,QAAQ,EAChB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CACd,0CAA0C,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CACxE,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QACvC,mBAAmB,CACjB,CAAC,EACD,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CACd,8CAA8C,WAAW,CACvD,KAAK,EACL,IAAI,CACL,GAAG,CACP,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAAQ,EACR,SAA2C;IAE3C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;AACvC,CAAC"}
+{"version":3,"file":"shot.js","sourceRoot":"","sources":["../src/shot.ts"],"names":[],"mappings":"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"}

package/dist/sinon.d.ts

@@ -1,5 +1,4 @@
-import * as sinon from 'sinon';
-import { SinonSpy } from 'sinon';
+import sinon, { SinonSpy } from 'sinon';
 export { sinon, SinonSpy };
 export declare type StubbedInstanceWithSinonAccessor<T> = T & {
     stubs: sinon.SinonStubbedInstance<T>;

package/dist/sinon.js

@@ -3,9 +3,12 @@
 // Node module: @loopback/testlab
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const sinon = require("sinon");
-exports.sinon = sinon;
+const sinon_1 = __importDefault(require("sinon"));
+exports.sinon = sinon_1.default;
 /**
  * Creates a new object with the given functions as the prototype and stubs all
  * implemented functions.
@@ -26,7 +29,7 @@ exports.sinon = sinon;
  * providing access to stub API for individual methods.
  */
 function createStubInstance(constructor) {
-    const stub = sinon.createStubInstance(constructor);
+    const stub = sinon_1.default.createStubInstance(constructor);
     return Object.assign(stub, { stubs: stub });
 }
 exports.createStubInstance = createStubInstance;

package/dist/sinon.js.map

@@ -1 +1 @@
-{"version":3,"file":"sinon.js","sourceRoot":"","sources":["../src/sinon.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;AAEhE,+BAA+B;AAGvB,sBAAK;AAMb;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,kBAAkB,CAChC,WAAuC;IAEvC,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;AACrD,CAAC;AALD,gDAKC"}
+{"version":3,"file":"sinon.js","sourceRoot":"","sources":["../src/sinon.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,kDAAsC;AAE9B,gBAFD,eAAK,CAEC;AAMb;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,kBAAkB,CAChC,WAAuC;IAEvC,MAAM,IAAI,GAAG,eAAK,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;AACrD,CAAC;AALD,gDAKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loopback/testlab",
-  "version": "1.9.4",
+  "version": "1.10.2",
   "description": "A collection of test utilities we use to write LoopBack tests.",
   "engines": {
     "node": ">=8.9"
@@ -20,19 +20,19 @@
     "@types/express": "^4.17.2",
     "@types/fs-extra": "^8.0.1",
     "@types/shot": "^4.0.0",
-    "@types/sinon": "^7.5.0",
+    "@types/sinon": "^7.5.1",
     "@types/supertest": "^2.0.8",
     "express": "^4.17.1",
     "fs-extra": "^8.1.0",
-    "oas-validator": "^3.3.1",
+    "oas-validator": "^3.3.2",
     "should": "^13.2.3",
-    "sinon": "^7.5.0",
+    "sinon": "^8.1.1",
     "supertest": "^4.0.2"
   },
   "devDependencies": {
-    "@loopback/build": "^2.0.16",
-    "@loopback/eslint-config": "^4.1.4",
-    "@types/node": "^10.17.5"
+    "@loopback/build": "^3.1.0",
+    "@loopback/eslint-config": "^5.0.2",
+    "@types/node": "^10.17.13"
   },
   "files": [
     "README.md",
@@ -49,5 +49,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/testlab"
   },
-  "gitHead": "7f0ae6ec124c19357c3016cd11f9bc9c739dffcb"
+  "gitHead": "d08f135a0d1040edc61497739a8d86a866e4e29a"
 }

package/src/client.ts

@@ -7,7 +7,7 @@
  * HTTP client utilities
  */
 
-import * as http from 'http';
+import http from 'http';
 import supertest = require('supertest');
 
 export {supertest};
@@ -33,7 +33,7 @@ export function createClientForHandler(
  * @param app - A running (listening) instance of a RestApplication.
  */
 export function createRestAppClient(app: RestApplicationLike) {
-  const url = app.restServer.rootUrl || app.restServer.url;
+  const url = app.restServer.rootUrl ?? app.restServer.url;
   if (!url) {
     throw new Error(
       `Cannot create client for ${app.constructor.name}, it is not listening.`,

package/src/http-error-logger.ts

@@ -27,7 +27,7 @@ export function createUnexpectedHttpErrorLogger(
       req.method,
       req.url,
       statusCode,
-      err.stack || err,
+      err.stack ?? err,
     );
   };
 }

package/src/http-server-config.ts

@@ -6,7 +6,7 @@
 import {readFileSync} from 'fs';
 import {ServerOptions as HttpsServerOptions} from 'https';
 import {ListenOptions} from 'net';
-import * as path from 'path';
+import path from 'path';
 
 const FIXTURES = path.resolve(__dirname, '../fixtures');
 const DUMMY_TLS_CONFIG = {

package/src/request.ts

@@ -3,18 +3,22 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {IncomingMessage} from 'http';
-import * as http from 'http';
-import * as https from 'https';
-import * as url from 'url';
+import http, {IncomingMessage} from 'http';
+import https from 'https';
+import url from 'url';
 
 /**
  * Async wrapper for making HTTP GET requests
  * @param urlString
  */
-export function httpGetAsync(urlString: string): Promise<IncomingMessage> {
+export function httpGetAsync(
+  urlString: string,
+  agent?: http.Agent,
+): Promise<IncomingMessage> {
   return new Promise((resolve, reject) => {
-    http.get(urlString, resolve).on('error', reject);
+    const urlOptions = url.parse(urlString);
+    const options = {agent, ...urlOptions};
+    http.get(options, resolve).on('error', reject);
   });
 }
 
@@ -22,10 +26,15 @@ export function httpGetAsync(urlString: string): Promise<IncomingMessage> {
  * Async wrapper for making HTTPS GET requests
  * @param urlString
  */
-export function httpsGetAsync(urlString: string): Promise<IncomingMessage> {
-  const agent = new https.Agent({
-    rejectUnauthorized: false,
-  });
+export function httpsGetAsync(
+  urlString: string,
+  agent?: https.Agent,
+): Promise<IncomingMessage> {
+  agent =
+    agent ??
+    new https.Agent({
+      rejectUnauthorized: false,
+    });
 
   const urlOptions = url.parse(urlString);
   const options = {agent, ...urlOptions};

package/src/shot.ts

@@ -10,14 +10,14 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import * as express from 'express';
+import express from 'express';
 import {IncomingMessage, ServerResponse} from 'http';
 import {
   Listener as ShotListener,
   RequestOptions as ShotRequestOptions,
   ResponseObject,
 } from 'shot'; // <-- workaround for missing type-defs for @hapi/shot
-import * as util from 'util';
+import util from 'util';
 
 const inject: (
   dispatchFunc: ShotListener,

package/src/sinon.ts

@@ -3,8 +3,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import * as sinon from 'sinon';
-import {SinonSpy} from 'sinon';
+import sinon, {SinonSpy} from 'sinon';
 
 export {sinon, SinonSpy};