LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few fixes

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-08-18 19:21:35 -04:00
parent ee9ea82cfb
commit 851d863652
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/errors.js
View File

@ -73,15 +73,15 @@ var errors = {};
'1002:ENOATTR:attribute does not exist' '1002:ENOATTR:attribute does not exist'
].forEach(function(e) { ].forEach(function(e) {
e = e.split(':'); e = e.split(':');
var errno = e[0]|0, var errno = +e[0];
err = e[1], var errName = e[1];
message = e[2]; var defaultMessage = e[2];
function FilerError(msg, path) { function FilerError(msg, path) {
this.name = err; this.name = errName;
this.code = err; this.code = errName;
this.errno = errno; this.errno = errno;
this.message = msg || message; this.message = msg || defaultMessage;
if(path) { if(path) {
this.path = path; this.path = path;
} }
@ -90,11 +90,11 @@ var errors = {};
FilerError.prototype.constructor = FilerError; FilerError.prototype.constructor = FilerError;
FilerError.prototype.toString = function() { FilerError.prototype.toString = function() {
var pathInfo = this.path ? (', \'' + this.path + '\'') : ''; var pathInfo = this.path ? (', \'' + this.path + '\'') : '';
return this.name + ': ' + message + pathInfo; return this.name + ': ' + this.message + pathInfo;
}; };
// We expose the error as both Errors.EINVAL and Errors[18] // We expose the error as both Errors.EINVAL and Errors[18]
errors[err] = errors[errno] = FilerError; errors[errName] = errors[errno] = FilerError;
}); });
module.exports = errors; module.exports = errors;

4
tests/spec/errors.spec.js
View File

@ -165,11 +165,11 @@ describe("Filer.Errors", function() {
it('should not include path in toString() when not provided', function() { it('should not include path in toString() when not provided', function() {
var err = new Filer.Errors.ENOENT('This is the message'); var err = new Filer.Errors.ENOENT('This is the message');
expect(err.toString()).to.equal("ENOENT: no such file or directory"); expect(err.toString()).to.equal("ENOENT: This is the message");
}); });
it('should include path in toString() when provided', function() { it('should include path in toString() when provided', function() {
var err = new Filer.Errors.ENOENT('This is the message', '/this/is/the/path'); var err = new Filer.Errors.ENOENT(null, '/this/is/the/path');
expect(err.toString()).to.equal("ENOENT: no such file or directory, '/this/is/the/path'"); expect(err.toString()).to.equal("ENOENT: no such file or directory, '/this/is/the/path'");
}); });