fixed detail reporting for jshint if there are no failures

mdasberg · Jan 23, 2015 · 8a474d3 · 8a474d3
1 parent a62f8a3
commit 8a474d3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 
 node_modules
 npm-debug.log
-tmp
+.tmp
 result.json
 test/override/results
 test/missing/results

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -176,13 +176,15 @@ module.exports = function (grunt) {
                             dir: 'test/fixtures/e2e/coverage/**/missing*.json'
                         }
                     },
-                    jshint: 'test/fixtures/missing.xml'
+                    jshint: {
+                        file: 'test/fixtures/missing.xml'
+                    }
                 }
             },
             missingFiles: {
                 options: {
-                    dir: '.tmp/does/not/exist',
-                    file: 'non-existing-file.json'
+                    dir: '.tmp/missing-files/',
+                    file: 'missing-files.json'
                 },
                 results: {
                     junit: {
@@ -201,7 +203,9 @@ module.exports = function (grunt) {
                             dir: 'non/existing/directory/*.json'
                         }
                     },
-                    jshint: 'non/existing/results.xml'
+                    jshint: {
+                        file: 'non/existing/results.xml'
+                    }
                 }
             },
             undefined: {
@@ -211,6 +215,18 @@ module.exports = function (grunt) {
                 },
                 results: {
                 }
+            },
+            jshintNoFailures: {
+                options: {
+                    dir: '.tmp/jshintNoFailures',
+                    file: 'results.json'
+                },
+                results: {
+                    jshint: {
+                        file: 'test/fixtures/jshint/jshint-nofailures.xml',
+                        details: true
+                    }
+                }
             }
         },
 

diff --git a/tasks/code_quality_report.js b/tasks/code_quality_report.js
@@ -72,7 +72,6 @@ module.exports = function (grunt) {
                     }
                 }
             }
-
         }
 
         /**
@@ -81,11 +80,7 @@ module.exports = function (grunt) {
          * @param name The name that is used when writing to disk.
          */
         function mergeTestResults(src, name) {
-            //if(typeof name === 'undefined') {
-            //    return undefined;
-            //}
-
-            var result = '<?xml version="1.0"?><testsuites>';
+           var result = '<?xml version="1.0"?><testsuites>';
             grunt.file.expand({filter: 'isFile'}, src).forEach(function (file) {
                 var content = grunt.file.read(file);
                 var matches = /<testsuite [\s\S]*>[\s\S]*<\/testsuite>/g.exec(content);
@@ -140,8 +135,10 @@ module.exports = function (grunt) {
                         }
                         results.push(result);
                     });
+
                 });
             }
+
             return results;
         }
 
@@ -159,6 +156,7 @@ module.exports = function (grunt) {
                 var browser = path.dirname(file).substring(path.dirname(file).lastIndexOf("/")+1)
                 collector.add(JSON.parse(grunt.file.read(file)));
                 var summary = utils.summarizeCoverage(collector.getFinalCoverage());
+                grunt.log.writeflags(summary);
                 results.push({
                     browser: browser,
                     lines: Number(summary.lines.pct),
@@ -191,11 +189,13 @@ module.exports = function (grunt) {
                     if (showDetails) {
                         var details = {};
                         res.testsuite.testcase.forEach(function (key) {
-                            var filename = key.$.name.substring(key.$.name.search(/[^\/]+$/g));
-                            var failures = key.failure[0]._.replace(/\n/g, "###").split("###");
-                            failures.shift();
-                            failures.pop();
-                            details[filename] = failures;
+                            if(typeof key.failure !== 'undefined') {
+                                var filename = key.$.name.substring(key.$.name.search(/[^\/]+$/g));
+                                var failures = key.failure[0]._.replace(/\n/g, "###").split("###");
+                                failures.shift();
+                                failures.pop();
+                                details[filename] = failures;
+                            }
                         });
                         result.failureDetails = details;
                     }

diff --git a/test/code_quality_report_test.js b/test/code_quality_report_test.js
@@ -62,8 +62,7 @@ exports.code_quality_report = {
     },
     missingFiles: function(test) {
         test.expect(1);
-        //test.ok(!grunt.file.exists('.tmp/does/not/exist/non-existing-file.json'), 'Should not have created a file');
-        var actual = grunt.file.read('.tmp/does/not/exist/non-existing-file.json');
+        var actual = grunt.file.read('.tmp/missing-files/missing-files.json');
         var expected = grunt.file.read('test/expected/missing.json');
         test.equal(actual, expected, 'should write the result in the missing result dir.');
 
@@ -76,6 +75,15 @@ exports.code_quality_report = {
         var expected = grunt.file.read('test/expected/undefined.json');
         test.equal(actual, expected, 'should write the result in the missing result dir.');
 
+        test.done();
+    },
+    jshintNoFailures: function(test) {
+        test.expect(1);
+
+        var actual = grunt.file.read('.tmp/jshintNoFailures/results.json');
+        var expected = grunt.file.read('test/expected/jshintNoFailures.json');
+        test.equals(actual, expected, 'should write the result in the jshintNoFailures result dir');
+
         test.done();
     }
 };
diff --git a/test/expected/jshintNoFailures.json b/test/expected/jshintNoFailures.json
@@ -0,0 +1 @@
+{"jshint":{"tests":1,"failures":0,"errors":0,"consoleStatements":0,"failureDetails":{}}}
diff --git a/test/expected/missing.json b/test/expected/missing.json
@@ -1 +1 @@
-{"junit":{"tests":[],"coverage":[]},"e2e":{"tests":[],"coverage":[]}}
+{"junit":{"tests":[],"coverage":[]},"e2e":{"tests":[],"coverage":[]},"jshint":{}}
diff --git a/test/fixtures/jshint/jshint-nofailures.xml b/test/fixtures/jshint/jshint-nofailures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<testsuite name="jshint" tests="1" failures="0" errors="0">
+	<testcase name="jshint" />
+</testsuite>