Merge pull request #19588 from MegaphoneJon/core-2379

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

diff --git a/karma.conf.js b/karma.conf.js
index 76a758c2cebc181dee324345fcf15b5e2beaf07e..1710c33fdc590a2ebc269766c99e930cde51ba5f 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
     autoWatch: true,
     browsers: ['PhantomJS'],
     exclude: [
+      'ang/api4Explorer/Explorer.js'
     ],
     files: [
       'bower_components/phantomjs-polyfill/bind-polyfill.js',
@@ -32,6 +33,7 @@ module.exports = function(config) {
       'bower_components/jquery-validation/dist/jquery.validate.min.js',
       'packages/jquery/plugins/jquery.timeentry.js',
       'js/Common.js',
+      'js/crm.datepicker.js',
       'bower_components/angular/angular.js',
       'js/crm.angular.js',
       angularTempFile,
@@ -63,6 +65,7 @@ module.exports = function(config) {
     port: 9876,
     reporters: ['progress'],
     junitReporter: {
+      useBrowserName: false,
       outputFile: 'tests/output/karma.xml',
       suite: ''
     },