update karma settings

kronkltd · Jan 14, 2017 · 9bfb492 · 9bfb492
1 parent 8829d6d
commit 9bfb492
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+_reports
 *.log
 .classpath
 .gems

diff --git a/karma.conf.js b/karma.conf.js
@@ -18,10 +18,10 @@ module.exports = function(config) {
       vendorBase + "/jasmine-promise-matchers/dist/jasmine-promise-matchers.js",
       "test.js",
       {pattern: vendorBase + "/**/*", included: false},
-      {pattern: "main.js", included: false},
-      "target/resources/public/cljs-none/goog/base.js",
-      "target/resources/public/cljs-none/jiksnu.js",
-      {pattern: "target/resources/public/**/*", included: false},
+      {pattern: "target/karma-cljs/**/*", included: false, watched: true},
+      {pattern: "target/karma-cljs/goog/base.js", watched: true},
+      {pattern: "target/karma-cljs/karma-test.js", included: true, watched: true},
+      {pattern: "main.js", included: false, watched: true},
       "test-runner.js"
     ],
 
@@ -30,23 +30,28 @@ module.exports = function(config) {
 
     // test results reporter to use
     // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
-    reporters: ['progress',
-                // "html",
-                // "coverage",
-                "junit", 'notify-send'],
+    reporters: [
+      // 'progress',
+      'htmlDetailed',
+      'kjhtml',
+      'nested',
+      "junit",
+      'notify-send'
+    ],
 
     junitReporter: {
       outputDir: "target/karma"
     },
 
-
     plugins: [
       'karma-browserify',
+      'karma-coverage',
       'karma-jasmine',                      // Required plugin
-      'karma-chrome-launcher',              // Launches Chrome
-      'karma-phantomjs-launcher',           // Launches PhantomJS
       'karma-html-detailed-reporter',
+      'karma-phantomjs-launcher',           // Launches PhantomJS
+      'karma-jasmine-html-reporter',
       'karma-junit-reporter',
+      'karma-nested-reporter',
       'karma-notify-send-reporter'
     ],
 
@@ -63,7 +68,7 @@ module.exports = function(config) {
     //     dir: "target/coverage/"
     // },
 
-    autoWatchBatchDelay: 2000,
+    autoWatchBatchDelay: 5000,
 
     // web server port
     port: 9876,

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "license": "GPL-3.0",
   "dependencies": {
-    "angular": "^1.5.8",
-    "angular-animate": "^1.5.8",
-    "angular-aria": "^1.5.8",
+    "angular": "1.5.8",
+    "angular-animate": "1.5.8",
+    "angular-aria": "1.5.8",
     "angular-busy": "^4.1.3",
     "angular-clipboard": "^1.5.0",
     "angular-datatables": "^0.5.0",
@@ -13,10 +13,10 @@
     "angular-markdown-directive": "0.3.1",
     "angular-material": "^1.1.0",
     "angular-material-icons": "^0.7.1",
-    "angular-messages": "^1.5.8",
-    "angular-mocks": "^1.5.8",
+    "angular-messages": "1.5.8",
+    "angular-mocks": "1.5.8",
     "angular-moment": "0.10.3",
-    "angular-sanitize": "^1.5.8",
+    "angular-sanitize": "1.5.8",
     "angular-ui-bootstrap": "^2.1.4",
     "angular-ui-notification": "^0.1.0",
     "angular-ui-router": "0.2.13",
@@ -47,7 +47,7 @@
     "utf-8-validate": "2.0.0"
   },
   "devDependencies": {
-    "angular-mocks": "^1.5.8",
+    "angular-mocks": "1.5.8",
     "browserify": "^13.1.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.2.0",
@@ -57,14 +57,13 @@
     "karma": "^1.1.2",
     "karma-browserify": "^5.1.0",
     "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^1.0.0",
+    "karma-coverage": "^1.1.1",
     "karma-html-detailed-reporter": "^1.1.4",
     "karma-hy-html-reporter": "0.0.14",
     "karma-jasmine": "^1.0.2",
-    "karma-html-detailed-reporter": "^1.1.4",
-    "karma-jasmine": "^1.0.2",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-junit-reporter": "^1.0.0",
+    "karma-nested-reporter": "^0.1.4",
     "karma-notify-send-reporter": "^0.0.3",
     "karma-phantomjs-launcher": "^1.0.0",
     "protractor-console": "^2.0.0",

diff --git a/project.clj b/project.clj
@@ -124,9 +124,9 @@
                                 {:karma
                                  {:source-paths ["src-cljs" "test-cljs"]
                                   :notify-command ["notify-send"]
-                                  :compiler {:output-to "target/karma-test.js"
-                                             :output-dir "target/karma"
-                                             :optimizations :simple
+                                  :compiler {:output-to "target/karma-cljs/karma-test.js"
+                                             :output-dir "target/karma-cljs"
+                                             :optimizations :none
                                              ;; Fix for $q's use of 'finally'
                                              :language-in :ecmascript5
                                              :pretty-print true}}}}}}