Merge pull request #417 from SetCodesToFire/issue-392

Bug fix for when only two columns are there in valid events.tsv as well as test for it

Author: chrisgorgo

tests/tsv.spec.js

@@ -42,29 +42,37 @@ describe('TSV', function(){
     };
 
     it('should require events files to have "onset" as first header', function () {
-        var tsv = 'header-one\tduration\t4eader-three\n' +
+        var tsv = 'header-one\tduration\theader-three\n' +
                   'value-one\tvalue-two\tvalue-three';
         validate.TSV.TSV(eventsFile, tsv, [], function (issues) {
             assert(issues.length === 1 && issues[0].code === 20);
         });
     });
 
     it('should require events files to have "duration" as second header', function () {
-        var tsv = 'onset\theader-two\t4eader-three\n' +
+        var tsv = 'onset\theader-two\theader-three\n' +
                   'value-one\tvalue-two\tvalue-three';
         validate.TSV.TSV(eventsFile, tsv, [], function (issues) {
             assert(issues.length === 1 && issues[0].code === 21);
         });
     });
 
     it('should not throw issues for a valid events file', function () {
-        var tsv = 'onset\tduration\t4eader-three\n' +
+        var tsv = 'onset\tduration\theader-three\n' +
                   'value-one\tvalue-two\tvalue-three';
         validate.TSV.TSV(eventsFile, tsv, [], function (issues) {
             assert.deepEqual(issues, []);
         });
     });
 
+    it('should not throw issues for a valid events file with only two columns', function () {
+        var tsv = 'onset\tduration\n' +
+                  'value-one\tvalue-two';
+        validate.TSV.TSV(eventsFile, tsv, [], function (issues) {
+            assert.deepEqual(issues, []);
+        });
+    });
+
     it('should check for the presence of any stimulus files declared', function () {
         var tsv = 'onset\tduration\tstim_file\n' +
                   'value-one\tvalue-two\timages/red-square.jpg';
@@ -87,15 +95,15 @@ describe('TSV', function(){
     };
 
     it("should not allow participants.tsv files without participant_id columns", function () {
-        var tsv = 'subject_id\theader-two\t4eader-three\n' +
+        var tsv = 'subject_id\theader-two\theader-three\n' +
                   'value-one\tvalue-two\tvalue-three';
         validate.TSV.TSV(participantsFile, tsv, [], function (issues) {
             assert(issues.length === 1 && issues[0].code === 48);
         });
     });
 
     it("should allow a valid participants.tsv file", function () {
-        var tsv = 'participant_id\theader-two\t4eader-three\n' +
+        var tsv = 'participant_id\theader-two\theader-three\n' +
                   'value-one\tvalue-two\tvalue-three';
         validate.TSV.TSV(participantsFile, tsv, [], function (issues) {
             assert.deepEqual(issues, []);

validators/tsv.js

@@ -85,7 +85,7 @@ var TSV = function TSV (file, contents, fileList, callback) {
                 code: 20
             }));
         }
-        if (headers[1] !== "duration"){
+        if (headers[1].trim() !== "duration"){
             issues.push(new Issue({
                 file: file,
                 evidence: headers,