File tree 2 files changed +4
-5
lines changed
2 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -100,9 +100,10 @@ class TestInitCommand implements ICommand {
100
100
const frameworks = [ frameworkToInstall ] . concat ( this . karmaConfigAdditionalFrameworks [ frameworkToInstall ] || [ ] )
101
101
. map ( fw => `'${ fw } '` )
102
102
. join ( ', ' ) ;
103
- const testFiles = `'${ fromWindowsRelativePathToUnix ( relativeTestsDir ) } /**/*${ projectFilesExtension } '` ;
103
+ const testFilesWithBundle = `'${ fromWindowsRelativePathToUnix ( relativeTestsDir ) } /**/*${ projectFilesExtension } '` ;
104
+ const testFilesWithoutBundle = `'${ fromWindowsRelativePathToUnix ( relativeTestsDir ) } /**/*.js'` ;
104
105
const karmaConfTemplate = this . $resources . readText ( 'test/karma.conf.js' ) ;
105
- const karmaConf = _ . template ( karmaConfTemplate ) ( { frameworks, testFiles } ) ;
106
+ const karmaConf = _ . template ( karmaConfTemplate ) ( { frameworks, testFilesWithBundle , testFilesWithoutBundle } ) ;
106
107
107
108
this . $fs . writeFile ( path . join ( projectDir , 'karma.conf.js' ) , karmaConf ) ;
108
109
Original file line number Diff line number Diff line change @@ -11,9 +11,7 @@ module.exports = function(config) {
11
11
12
12
13
13
// list of files / patterns to load in the browser
14
- files : [
15
- $ { testFiles }
16
- ] ,
14
+ files : config . bundle ? [ $ { testFilesWithBundle } ] : [ $ { testFilesWithoutBundle } ] ,
17
15
18
16
19
17
// list of files to exclude
You can’t perform that action at this time.
0 commit comments