diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js index 6d6451ebd4..a0fbea97c9 100644 --- a/cms/static/karma_cms.conf.js +++ b/cms/static/karma_cms.conf.js @@ -23,7 +23,10 @@ var options = { // Make sure the patterns in sourceFiles and specFiles do not match the same file. // Otherwise Istanbul which is used for coverage tracking will cause tests to not run. sourceFiles: [ - {pattern: 'cms/**/!(*spec|djangojs).js'}, + // Split cms/ patterns to exclude spec/main*.js test entry points (handled by runFiles) + {pattern: 'cms/js/!(*spec|djangojs).js'}, // Direct children of cms/js/ + {pattern: 'cms/js/!(spec)/**/!(*spec|djangojs).js'}, // Subdirs of cms/js/ except spec/ + {pattern: 'cms/js/spec/**/!(*spec|djangojs|main*).js'}, // spec/ subdir, excluding main* files {pattern: 'js/**/!(*spec|djangojs).js'} ], diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js index 9a83a189be..bde06ecc84 100644 --- a/cms/static/karma_cms_squire.conf.js +++ b/cms/static/karma_cms_squire.conf.js @@ -23,7 +23,10 @@ var options = { // Make sure the patterns in sourceFiles and specFiles do not match the same file. // Otherwise Istanbul which is used for coverage tracking will cause tests to not run. sourceFiles: [ - {pattern: 'cms/js/**/!(*spec|djangojs).js'}, + // Split cms/js/ patterns to exclude spec/main*.js test entry points (handled by runFiles) + {pattern: 'cms/js/!(*spec|djangojs).js'}, // Direct children of cms/js/ + {pattern: 'cms/js/!(spec)/**/!(*spec|djangojs).js'}, // Subdirs of cms/js/ except spec/ + {pattern: 'cms/js/spec/**/!(*spec|djangojs|main*).js'}, // spec/ subdir, excluding main* files {pattern: 'js/**/!(*spec|djangojs).js'} ], diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js index 91a2d78085..ece7f1b5c4 100644 --- a/common/static/common/js/karma.common.conf.js +++ b/common/static/common/js/karma.common.conf.js @@ -60,7 +60,9 @@ var commonFiles = { ], sourceFiles: [ - {pattern: 'common/js/!(spec_helpers)/**/!(*spec).js'} + // Split common/js/ to exclude spec/main*.js test entry points (handled by runFiles) + {pattern: 'common/js/!(spec_helpers|spec)/**/!(*spec).js'}, // all non-spec, non-spec_helpers dirs + {pattern: 'common/js/spec/**/!(*spec|main*).js'} // spec dir, excluding spec and main* files ], specFiles: [ diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js index 0119d4d18c..b3b24f631e 100644 --- a/lms/static/karma_lms.conf.js +++ b/lms/static/karma_lms.conf.js @@ -34,7 +34,10 @@ var options = { {pattern: 'discussion/js/**/!(*spec).js'}, {pattern: 'js/**/!(*spec|djangojs).js'}, {pattern: 'learner_profile/**/!(*spec).js'}, - {pattern: 'lms/js/**/!(*spec).js'}, + // Split lms/js/ to exclude spec/main*.js test entry points (handled by runFiles) + {pattern: 'lms/js/!(*spec).js'}, // Direct children of lms/js/ + {pattern: 'lms/js/!(spec)/**/!(*spec).js'}, // Subdirs of lms/js/ except spec/ + {pattern: 'lms/js/spec/**/!(*spec|main*).js'}, // spec/ subdir, excluding main* files {pattern: 'support/js/**/!(*spec).js'}, {pattern: 'teams/js/**/!(*spec).js'}, {pattern: 'completion/js/**/!(*spec).js'}