Merge pull request #1611 from openhealthcare/1300-karma-defaults

Move Pathway and Search Javascripts into the karma_defauts.js
openhealthcare · Oct 25, 2018 · 2cb6bc0 · 2cb6bc0
2 parents 61303e5 + 355ff15
commit 2cb6bc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -10,8 +10,6 @@ module.exports = function(config){
     var includedFiles = [
       'opal/app.js',
       'opal/routes.js',
-      '../../core/pathway/static/js/pathway/**/*.js',
-      '../../core/search/static/js/search/**/*.js',
       'test/*.js',
       '../../core/search/static/js/test/*',
       '../../core/pathway/static/js/test/*',

diff --git a/opal/tests/js_config/karma_defaults.js b/opal/tests/js_config/karma_defaults.js
@@ -38,6 +38,8 @@ module.exports = function(includedFiles, baseDir, coverageFiles){
       'opal/services/flow.js',
       'opal/controllers_module.js',
       'opal/controllers/*.js',
+      '../../core/pathway/static/js/pathway/**/*.js',
+      '../../core/search/static/js/search/**/*.js',
       'test/test_helper.js'
     ];