Merge pull request #6443 from colemanw/CRM-12527

[civicrm-core.git] / karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
index ef710fcefd35c08b2cd757074091d1e526f0f789..eada18ded519964e83d60c5e5d179d07534fd613 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -8,9 +8,9 @@ module.exports = function(config) {
       'bower_components/jquery/dist/jquery.min.js',
       'bower_components/jquery-ui/jquery-ui.min.js',
       'bower_components/lodash-compat/lodash.min.js',
-      'packages/jquery/plugins/select2/select2.min.js',
+      'bower_components/select2/select2.min.js',
       'packages/jquery/plugins/jquery.blockUI.js',
-      'packages/jquery/plugins/jquery.validate.js',
+      'bower_components/jquery-validation/dist/jquery.validate.min.js',
       'packages/jquery/plugins/jquery.timeentry.js',
       'js/Common.js',
       'bower_components/angular/angular.js',
@@ -23,18 +23,18 @@ module.exports = function(config) {
       'bower_components/angular-unsavedChanges/dist/unsavedChanges.js',
       'tests/karma/modules.js',
       'js/crm.ajax.js',
-      'js/angular-*.js',
-      'js/angular-crmMailing/*.js',
+      'ang/*.js',
+      'ang/**/*.js',
       'tests/karma/lib/*.js',
       'tests/karma/**/*.js',
-      'partials/**/*.html'
+      'ang/**/*.html'
     ],
     preprocessors : {
-      'partials/**/*.html' : ['ng-html2js']
+      'ang/**/*.html' : ['ng-html2js']
     },
 
     ngHtml2JsPreprocessor: {
-      stripPrefix: 'partials/',
+      stripPrefix: 'ang/',
       prependPrefix: '~/',
       moduleName: 'crmResource'
     },