Merge pull request #1555 from openhealthcare/724-karam-scaffold-glob-…

…patterns use glob patterns in our default karma config refs #724
openhealthcare · Jun 21, 2018 · 7690631 · 7690631
2 parents 424d4bf + d7b3c3e
commit 7690631
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/opal/scaffolding/plugin_scaffold/config/karma.conf.js.jinja2 b/opal/scaffolding/plugin_scaffold/config/karma.conf.js.jinja2
@@ -7,7 +7,7 @@ module.exports = function(config){
   ];
     var includedFiles = [
       __dirname+'/../{{ name }}/static/js/{{ name }}/**/*.js',
-      __dirname+'/../{{ name }}/static/js/test/*.js',
+      __dirname+'/../{{ name }}/static/js/test/**/*.js',
   ];
 
   var defaultConfig = karmaDefaults(includedFiles, baseDir, coverageFiles);

diff --git a/opal/scaffolding/scaffold/config/karma.conf.js.jinja2 b/opal/scaffolding/scaffold/config/karma.conf.js.jinja2
@@ -7,15 +7,15 @@ module.exports = function(config){
   var baseDir = __dirname + '/..';
 
   var coverageFiles = [
-    __dirname + '/../{{ name }}/static/js/{{ name }}/*',
+    __dirname + '/../{{ name }}/static/js/{{ name }}/**/*.js',
     // Add code to include on test runs here ...
   ];
 
   var includedFiles = [
     'opal/app.js',
 
     // Add test cases here
-    __dirname + '/../{{ name }}/static/js/tests/*.js',
+    __dirname + '/../{{ name }}/static/js/tests/**/*.js',
   ].concat(coverageFiles);
 
   var defaultConfig = karmaDefaults(includedFiles, baseDir, coverageFiles);