From bc7d7ff6c146494f58b9426c89376a5b01782a7f Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Thu, 2 Apr 2020 16:01:13 -0700 Subject: [PATCH] fix(example-express-composition): use an assinged port number for testing --- docs/site/express-with-lb4-rest-tutorial.md | 12 +++++++----- examples/express-composition/.eslintrc.js | 8 ++++++++ .../src/__tests__/acceptance/test-helper.ts | 2 +- examples/express-composition/src/server.ts | 4 ++-- 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 examples/express-composition/.eslintrc.js diff --git a/docs/site/express-with-lb4-rest-tutorial.md b/docs/site/express-with-lb4-rest-tutorial.md index 64af2df24ca5..c98bde0cece2 100644 --- a/docs/site/express-with-lb4-rest-tutorial.md +++ b/docs/site/express-with-lb4-rest-tutorial.md @@ -155,8 +155,9 @@ import {ApplicationConfig} from '@loopback/core'; import express from 'express'; export class ExpressServer { - private app: express.Application; - private lbApp: NoteApplication; + public readonly app: express.Application; + public readonly lbApp: NoteApplication; + private server?: http.Server; constructor(options: ApplicationConfig = {}) { this.app = express(); @@ -223,8 +224,9 @@ Express application: import pEvent from 'p-event'; export class ExpressServer { - private app: express.Application; - private lbApp: NoteApplication; + public readonly app: express.Application; + public readonly lbApp: NoteApplication; + private server?: http.Server; constructor(options: ApplicationConfig = {}) { //... @@ -236,7 +238,7 @@ export class ExpressServer { public async start() { await this.lbApp.start(); - const port = this.lbApp.restServer.config.port || 3000; + const port = this.lbApp.restServer.config.port ?? 3000; const host = this.lbApp.restServer.config.host || '127.0.0.1'; this.server = this.app.listen(port, host); await pEvent(this.server, 'listening'); diff --git a/examples/express-composition/.eslintrc.js b/examples/express-composition/.eslintrc.js new file mode 100644 index 000000000000..243ea4d86296 --- /dev/null +++ b/examples/express-composition/.eslintrc.js @@ -0,0 +1,8 @@ +// Copyright IBM Corp. 2020. All Rights Reserved. +// Node module: @loopback/example-express-composition +// This file is licensed under the MIT License. +// License text available at https://opensource.org/licenses/MIT + +module.exports = { + extends: ['@loopback/eslint-config'], +}; diff --git a/examples/express-composition/src/__tests__/acceptance/test-helper.ts b/examples/express-composition/src/__tests__/acceptance/test-helper.ts index a667a8e39f08..030fd92f9f17 100644 --- a/examples/express-composition/src/__tests__/acceptance/test-helper.ts +++ b/examples/express-composition/src/__tests__/acceptance/test-helper.ts @@ -15,7 +15,7 @@ export async function setupExpressApplication(): Promise { const lbApp = server.lbApp; - const client = supertest('http://127.0.0.1:3000'); + const client = supertest(server.app); return {server, client, lbApp}; } diff --git a/examples/express-composition/src/server.ts b/examples/express-composition/src/server.ts index 6480e646b639..761a0a77af5f 100644 --- a/examples/express-composition/src/server.ts +++ b/examples/express-composition/src/server.ts @@ -11,7 +11,7 @@ import path from 'path'; import {NoteApplication} from './application'; export class ExpressServer { - private app: express.Application; + public readonly app: express.Application; public readonly lbApp: NoteApplication; private server?: http.Server; @@ -40,7 +40,7 @@ export class ExpressServer { public async start() { await this.lbApp.start(); - const port = this.lbApp.restServer.config.port || 3000; + const port = this.lbApp.restServer.config.port ?? 3000; const host = this.lbApp.restServer.config.host ?? '127.0.0.1'; this.server = this.app.listen(port, host); await pEvent(this.server, 'listening');