From ded79097d91521a4ad27cc01e5e84e7c95f37d68 Mon Sep 17 00:00:00 2001 From: Dmitry Krasnoukhov Date: Fri, 5 Apr 2024 19:18:08 +0300 Subject: [PATCH 1/2] Fix serverMiddleware for development mode --- packages/ember-cli-code-coverage/index.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/ember-cli-code-coverage/index.js b/packages/ember-cli-code-coverage/index.js index 30d79e3..52f3d95 100644 --- a/packages/ember-cli-code-coverage/index.js +++ b/packages/ember-cli-code-coverage/index.js @@ -143,20 +143,23 @@ module.exports = { * If coverage is enabled attach coverage middleware to the express server run by ember-cli * @param {Object} startOptions - Express server start options */ - serverMiddleware(startOptions, config) { - attachMiddleware.serverMiddleware(startOptions.app, config); + serverMiddleware(startOptions) { + attachMiddleware.serverMiddleware(startOptions.app, this._middlewareConfig()); }, testemMiddleware(app) { - const config = { + // if we're running `ember test --server` use the `serverMiddleware`. + if (process.argv.includes('--server') || process.argv.includes('-s')) { + return this.serverMiddleware({ app }); + } + attachMiddleware.testMiddleware(app, this._middlewareConfig()); + }, + + _middlewareConfig() { + return { configPath: this.project.configPath(), root: this.project.root, namespaceMappings: this.buildNamespaceMappings(), - }; - // if we're running `ember test --server` use the `serverMiddleware`. - if (process.argv.includes('--server') || process.argv.includes('-s')) { - return this.serverMiddleware({ app }, config); } - attachMiddleware.testMiddleware(app, config); }, }; From 627912d9bb4e5b44a430f9b89567cdd303a9cc3e Mon Sep 17 00:00:00 2001 From: Dmitry Krasnoukhov Date: Wed, 24 Apr 2024 15:57:01 +0300 Subject: [PATCH 2/2] fix lint --- packages/ember-cli-code-coverage/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/ember-cli-code-coverage/index.js b/packages/ember-cli-code-coverage/index.js index 52f3d95..e1a6b03 100644 --- a/packages/ember-cli-code-coverage/index.js +++ b/packages/ember-cli-code-coverage/index.js @@ -144,7 +144,10 @@ module.exports = { * @param {Object} startOptions - Express server start options */ serverMiddleware(startOptions) { - attachMiddleware.serverMiddleware(startOptions.app, this._middlewareConfig()); + attachMiddleware.serverMiddleware( + startOptions.app, + this._middlewareConfig() + ); }, testemMiddleware(app) { @@ -160,6 +163,6 @@ module.exports = { configPath: this.project.configPath(), root: this.project.root, namespaceMappings: this.buildNamespaceMappings(), - } + }; }, };