Finished setting up new test structure

Author: mrodrig

lib/constants.json

@@ -17,5 +17,16 @@
       "noDataRetrieveHeading": "No data provided to retrieve heading."
     }
 
+  },
+
+  "DefaultOptions" : {
+    "DELIMITER" : {
+      "FIELD" : ",",
+      "ARRAY" : ";",
+      "WRAP" : ""
+    },
+    "EOL" : "\n",
+    "PARSE_CSV_NUMBERS" : false,
+    "KEYS" : null
   }
 }

lib/converter.js

@@ -8,16 +8,7 @@ var json2Csv = require('./json-2-csv'), // Require our json-2-csv code
 /**
  * Default options
  */
-var defaultOptions = {
-    DELIMITER         : {
-        FIELD  :  ',',
-        ARRAY  :  ';',
-        WRAP   :  ''
-    },
-    EOL               : '\n',
-    PARSE_CSV_NUMBERS : false,
-    KEYS              : null
-};
+var defaultOptions = constants.DefaultOptions;
 
 /**
  * Build the options to be passed to the appropriate function
@@ -31,7 +22,7 @@ var buildOptions = function (opts, cb) {
     // If the delimiter fields are the same, report an error to the caller
     if (opts.DELIMITER.FIELD === opts.DELIMITER.ARRAY) { return cb(new Error(constants.Errors.delimitersMustDiffer)); }
     // Otherwise, send the options back
-    else { return cb(null, opts); }
+    return cb(null, opts);
 };
 
 // Export the following functions that will be client accessible

lib/csv-2-json.js

@@ -99,11 +99,11 @@ module.exports = {
     // Takes options as a document, data as a CSV string, and a callback that will be used to report the results
     csv2json: function (opts, data, callback) {
         if (!callback) { throw new Error(constants.Errors.callbackRequired); } // If a callback wasn't provided, throw an error
-        if (!opts) { callback(new Error(constants.Errors.optionsRequired)); return null; } // Shouldn't happen, but just in case
+        if (!opts) { return callback(new Error(constants.Errors.optionsRequired)); return null; } // Shouldn't happen, but just in case
         else { options = opts; } // Options were passed, set the global options value
-        if (!data) { callback(new Error(constants.Errors.csv2json.cannotCallCsv2JsonOn + data + '.')); return null; } // If we don't receive data, report an error
+        if (!data) { return callback(new Error(constants.Errors.csv2json.cannotCallCsv2JsonOn + data + '.')); return null; } // If we don't receive data, report an error
         if (!_.isString(data)) { // The data is not a string
-            callback(new Error(constants.Errors.csv2json.csvNotString)); // Report an error back to the caller
+            return callback(new Error(constants.Errors.csv2json.csvNotString)); // Report an error back to the caller
         }
         var lines = data.split(options.EOL); // Split the CSV into lines using the specified EOL option
         var json = convertCSV(lines, callback); // Retrieve the JSON document array

package.json

@@ -9,7 +9,8 @@
     },
     "main": "./lib/converter.js",
     "scripts": {
-        "test": "./node_modules/.bin/mocha --reporter spec"
+        "test": "./node_modules/.bin/mocha test/tests.js",
+        "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- -R spec"
     },
     "keywords": [
         "json",
@@ -28,6 +29,7 @@
     },
     "devDependencies": {
         "mocha": "~2.2.4",
+        "istanbul": "~0.3.13",
         "should": "~5.2.0",
         "async": "~0.9.0"
     },