From 7b42ac024a4e9401276f02cd27854874e1a6580c Mon Sep 17 00:00:00 2001 From: fatme Date: Thu, 1 Nov 2018 18:58:18 +0200 Subject: [PATCH] fix(unit-testing): add correct files pattern in karma.conf.js when the project has nsconfig file --- lib/commands/test-init.ts | 3 ++- resources/test/karma.conf.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/commands/test-init.ts b/lib/commands/test-init.ts index 0133a56665..2f8921ed9c 100644 --- a/lib/commands/test-init.ts +++ b/lib/commands/test-init.ts @@ -105,8 +105,9 @@ class TestInitCommand implements ICommand { const frameworks = [frameworkToInstall].concat(this.karmaConfigAdditionalFrameworks[frameworkToInstall] || []) .map(fw => `'${fw}'`) .join(', '); + const testFiles = `'${relativeTestsDir}/**/*.js'`; const karmaConfTemplate = this.$resources.readText('test/karma.conf.js'); - const karmaConf = _.template(karmaConfTemplate)({ frameworks }); + const karmaConf = _.template(karmaConfTemplate)({ frameworks, testFiles }); this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf); diff --git a/resources/test/karma.conf.js b/resources/test/karma.conf.js index 0dd269a0ac..5fc70a7fb1 100644 --- a/resources/test/karma.conf.js +++ b/resources/test/karma.conf.js @@ -12,7 +12,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'app/**/*.js', + ${ testFiles } ],