diff options
| author | Jesus Macias Portela <jesus.macias.portela@gmail.com> | 2015-12-03 14:35:49 +0300 |
|---|---|---|
| committer | Jesus Macias Portela <jesus.macias.portela@gmail.com> | 2015-12-03 14:35:49 +0300 |
| commit | dcfbbe4737e9939b6c038f8e48b49957c66a52e8 (patch) | |
| tree | 8163f2d7537708d7d5486a093bb3dab9cc63f9d2 /tests/karma.config.js | |
| parent | a79ae4ae086c08c75a6d974966458251e2167347 (diff) | |
| parent | e62b6c1617886b2cdd7553ea9b119c431e4eb363 (diff) | |
Merge branch 'master' into issue_20427
Diffstat (limited to 'tests/karma.config.js')
| -rw-r--r-- | tests/karma.config.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index 10c5fa3344e..df09ee1b310 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -165,15 +165,15 @@ module.exports = function(config) { // need to test the core app as well ? if (testCore) { // core tests - files.push(corePath + 'tests/specs/*.js'); + files.push(corePath + 'tests/specs/**/*.js'); } function addApp(app) { // if only a string was specified, expand to structure if (typeof(app) === 'string') { app = { - srcFiles: 'apps/' + app + '/js/*.js', - testFiles: 'apps/' + app + '/tests/js/*.js' + srcFiles: 'apps/' + app + '/js/**/*.js', + testFiles: 'apps/' + app + '/tests/js/**/*.js' }; } |