Skip to content

Commit 5a50c9c

Browse files
committed
chore: add separate test files for --bundle and no-bundle case
1 parent 51cb7ca commit 5a50c9c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

lib/commands/test-init.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ class TestInitCommand implements ICommand {
100100
const frameworks = [frameworkToInstall].concat(this.karmaConfigAdditionalFrameworks[frameworkToInstall] || [])
101101
.map(fw => `'${fw}'`)
102102
.join(', ');
103-
const testFiles = `'${fromWindowsRelativePathToUnix(relativeTestsDir)}/**/*${projectFilesExtension}'`;
103+
const testFilesWithBundle = `'${fromWindowsRelativePathToUnix(relativeTestsDir)}/**/*${projectFilesExtension}'`;
104+
const testFilesWithoutBundle = `'${fromWindowsRelativePathToUnix(relativeTestsDir)}/**/*.js'`;
104105
const karmaConfTemplate = this.$resources.readText('test/karma.conf.js');
105-
const karmaConf = _.template(karmaConfTemplate)({ frameworks, testFiles });
106+
const karmaConf = _.template(karmaConfTemplate)({ frameworks, testFilesWithBundle, testFilesWithoutBundle });
106107

107108
this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf);
108109

resources/test/karma.conf.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ module.exports = function(config) {
1111

1212

1313
// list of files / patterns to load in the browser
14-
files: [
15-
${ testFiles }
16-
],
14+
files: config.bundle ? [ ${ testFilesWithBundle } ] : [ ${ testFilesWithoutBundle }],
1715

1816

1917
// list of files to exclude

0 commit comments

Comments
 (0)