dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21144
committer: Jiju K Jose <jijukjose@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-11-20 14:49:15 +0100
message:
  Added JQuery libraries in config
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/test/karma.config.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/test/karma.config.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/test/karma.config.js	2015-11-17 15:09:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/test/karma.config.js	2015-11-20 13:49:15 +0000
@@ -12,14 +12,28 @@
         ],
         files: [
             '../node_modules/phantomjs-polyfill/bind-polyfill.js',
+            '../../jQuery/jquery.min.js',
+            '../../jQuery/calendars/jquery.calendars.min.js',
+            '../../jQuery/calendars/jquery.calendars.plus.min.js',
+            '../../jQuery/calendars/jquery.calendars.picker.min.js',
+            '../../jQuery/calendars/jquery.calendars.picker.ext.js',
             '../../angular/angular.js',
+            '../../angular/angular-resource.js',
+            '../../angular/angular-cookies.js',
             '../node_modules/angular-mocks/angular-mocks.js',
+            '../../angular/plugins/angularLocalStorage.js',
             '../dhis2.angular.*.js',
             'tests.webpack.js', // just load this file
+
+            //'../../../../../../../../dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html'
+            //dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html:14
+            //dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/test/karma.config.js
+            '../views/left-bar.html'
+
         ],
         preprocessors: {
             'tests.webpack.js': [ 'webpack', 'sourcemap' ], // preprocess with webpack and our sourcemap loader
-            '../dhis2.angular.*.js': ['coverage'],
+            //'../dhis2.angular.*.js': ['coverage'],
             // '../views/left-bar.html': ['ng-html2js'], // Example for transforming html files to be angular modules that are cached
         },
         reporters: [ 'dots', 'coverage' ], // report results in this format