fix: remove reason from unparsable file error and add to messages

mochajs · Nov 19, 2020 · fcc005c · fcc005c
1 parent b4dcc6c
commit fcc005c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/lib/cli/config.js b/lib/cli/config.js
@@ -83,7 +83,10 @@ exports.loadConfig = filepath => {
       config = parsers.json(filepath);
     }
   } catch (err) {
-    throw createUnparsableFileError(err, filepath);
+    throw createUnparsableFileError(
+      `Unable to read/parse ${filepath}: ${err}`,
+      filepath
+    );
   }
   return config;
 };

diff --git a/lib/cli/options.js b/lib/cli/options.js
@@ -190,7 +190,10 @@ const loadPkgRc = (args = {}) => {
       }
     } catch (err) {
       if (args.package) {
-        throw createUnparsableFileError(err, filepath);
+        throw createUnparsableFileError(
+          `Unable to read/parse ${filepath}: ${err}`,
+          filepath
+        );
       }
       debug('failed to read default package.json at %s; ignoring', filepath);
     }

diff --git a/lib/errors.js b/lib/errors.js
@@ -508,14 +508,11 @@ function createTimeoutError(msg, timeout, file) {
  * @static
  * @param {string} message - Error message to be displayed.
  * @param {string} filename - File name
- * @param {string} [reason] - Why the filename is unparsable.
  * @returns {Error} Error with code {@link constants.UNPARSABLE_FILE}
  */
-function createUnparsableFileError(message, filename, reason) {
+function createUnparsableFileError(message, filename) {
   var err = new Error(message);
   err.code = constants.UNPARSABLE_FILE;
-  err.reason =
-    typeof reason !== 'undefined' ? reason : `${filename} is unparsable`;
   return err;
 }
 

diff --git a/test/node-unit/cli/config.spec.js b/test/node-unit/cli/config.spec.js
@@ -116,7 +116,7 @@ describe('cli/config', function() {
         expect(
           () => loadConfig('goo.yaml'),
           'to throw',
-          'goo.yaml is unparsable'
+          'Unable to read/parse goo.yaml: goo.yaml is unparsable'
         );
       });
     });

diff --git a/test/node-unit/cli/options.spec.js b/test/node-unit/cli/options.spec.js
@@ -150,7 +150,7 @@ describe('options', function() {
                 loadOptions('--package /something/wherever --require butts');
               },
               'to throw',
-              'bad file message'
+              'Unable to read/parse /something/wherever: bad file message'
             );
           });
         });

diff --git a/test/unit/errors.spec.js b/test/unit/errors.spec.js
@@ -76,8 +76,7 @@ describe('Errors', function() {
         'to satisfy',
         {
           message: message,
-          code: 'ERR_MOCHA_UNPARSABLE_FILE',
-          reason: 'badFilePath is unparsable'
+          code: 'ERR_MOCHA_UNPARSABLE_FILE'
         }
       );
     });