attempt at coveralls

jpoehnelt · Feb 16, 2015 · b6bc347 · b6bc347
1 parent b27781c
commit b6bc347
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -95,11 +95,11 @@ module.exports = function (grunt) {
         },
         coveralls: {
             options: {
-                debug: true,
-                coverageDir: 'coverage/',
-                dryRun: true,
-                force: true,
-                recursive: true
+                // dont fail if coveralls fails
+                force: true
+            },
+            main_target: {
+                src: "coverage/lcovonly.info"
             }
         }
     });
@@ -109,7 +109,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-sloc');
     grunt.loadNpmTasks('grunt-karma');
-    grunt.loadNpmTasks('grunt-karma-coveralls');
+    grunt.loadNpmTasks("grunt-coveralls");
 
     // Default task.
     grunt.registerTask('default', ['concat', 'uglify', 'less', 'sloc']);

diff --git a/karma.conf.js b/karma.conf.js
@@ -52,8 +52,10 @@ module.exports = function (config) {
         reporters: ['coverage'],
 
         coverageReporter: {
-            type: "lcov",
-            dir: "coverage/"
+            dir: "coverage/",
+            reporters: [
+                { type: 'lcovonly', subdir: '.', file: 'lcovonly.info' }
+            ]
         },
 
         // web server port

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "title": "Global Croplands",
-  "homepage": "www.Croplands.org",
+  "homepage": "http://www.Croplands.org",
   "author": {
     "name": "Justin Poehnelt",
     "email": "jpoehnelt@usgs.gov"
@@ -13,15 +13,17 @@
     "grunt-contrib-less": "^0.11.4",
     "grunt-contrib-uglify": "^0.6.0",
     "grunt-contrib-watch": "^0.6.1",
+    "grunt-coveralls": "^1.0.0",
     "grunt-karma": "^0.10.1",
-    "grunt-karma-coveralls": "^2.5.3",
     "grunt-sloc": "^0.5.2",
     "jasmine-core": "^2.2.0",
     "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.7",
     "karma-coverage": "^0.2.7",
-    "karma-coveralls": "^0.1.5",
     "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "^0.1.4"
+  },
+  "dependencies": {
+    "coveralls": "^2.11.2"
   }
 }