Make test pass and lint

heedsoftware · Jul 23, 2015 · 5ec7c10 · 5ec7c10
1 parent 5f7a734
commit 5ec7c10
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 118 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -9,13 +9,14 @@
     "unused": true,
     "trailing": true,
     "white": true,
-    "globalstrict": true,
+    "globalstrict": false,
     "browser": true,
     "node": true,
     "jquery": true,
     "devel": true,
     "globals": {
         "FormData": true,
+        "Promise": true,
 
         "before": false,
         "after": false,

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,7 +2,7 @@
 
 var fs = require('fs');
 
-module.exports = function(grunt) {
+module.exports = function (grunt) {
 
     // Load .jshintrc file.
     var hintOptions = JSON.parse(fs.readFileSync('.jshintrc', 'utf8'));
@@ -27,7 +27,9 @@ module.exports = function(grunt) {
         jsbeautifier: {
             files: ['<%= jsfiles %>'],
             options: {
-                space_after_anon_function: true
+                js: {
+                    spaceAfterAnonFunction: true
+                }
             }
         },
 

diff --git a/lib/mailUtilities.js b/lib/mailUtilities.js
@@ -39,7 +39,7 @@ module.exports = {
         verifyDkim.on('close', function (code) {
             logger.verbose('closed with return code ' + code);
             /* Convert return code to appropriate boolean. */
-            return callback(null, !! !code);
+            return callback(null, !!!code);
         });
 
         verifyDkim.stdin.write(rawEmail);
@@ -63,7 +63,7 @@ module.exports = {
             logger.verbose('closed with return code ' + code);
 
             /* Convert return code to appropriate boolean. */
-            return callback(null, !! !code);
+            return callback(null, !!!code);
         });
     },
 
@@ -74,6 +74,7 @@ module.exports = {
         }
 
         spamc.report(rawEmail, function (err, result) {
+            logger.info(result);
             if (err) logger.error(err);
             if (err) return callback(new Error('Unable to compute spam score.'));
             callback(null, result.spamScore);