|
@@ -23,121 +23,108 @@ describe('asar package', function() {
|
|
|
});
|
|
|
|
|
|
it('reads a normal file', function() {
|
|
|
- var file1, file2, file3;
|
|
|
- file1 = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
+ var file1 = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
assert.equal(fs.readFileSync(file1).toString().trim(), 'file1');
|
|
|
- file2 = path.join(fixtures, 'asar', 'a.asar', 'file2');
|
|
|
+ var file2 = path.join(fixtures, 'asar', 'a.asar', 'file2');
|
|
|
assert.equal(fs.readFileSync(file2).toString().trim(), 'file2');
|
|
|
- file3 = path.join(fixtures, 'asar', 'a.asar', 'file3');
|
|
|
- return assert.equal(fs.readFileSync(file3).toString().trim(), 'file3');
|
|
|
+ var file3 = path.join(fixtures, 'asar', 'a.asar', 'file3');
|
|
|
+ assert.equal(fs.readFileSync(file3).toString().trim(), 'file3');
|
|
|
});
|
|
|
|
|
|
it('reads from a empty file', function() {
|
|
|
- var buffer, file;
|
|
|
- file = path.join(fixtures, 'asar', 'empty.asar', 'file1');
|
|
|
- buffer = fs.readFileSync(file);
|
|
|
+ var file = path.join(fixtures, 'asar', 'empty.asar', 'file1');
|
|
|
+ var buffer = fs.readFileSync(file);
|
|
|
assert.equal(buffer.length, 0);
|
|
|
- return assert.equal(buffer.toString(), '');
|
|
|
+ assert.equal(buffer.toString(), '');
|
|
|
});
|
|
|
|
|
|
it('reads a linked file', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
- return assert.equal(fs.readFileSync(p).toString().trim(), 'file1');
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
+ assert.equal(fs.readFileSync(p).toString().trim(), 'file1');
|
|
|
});
|
|
|
|
|
|
it('reads a file from linked directory', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'file1');
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'file1');
|
|
|
assert.equal(fs.readFileSync(p).toString().trim(), 'file1');
|
|
|
p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
- return assert.equal(fs.readFileSync(p).toString().trim(), 'file1');
|
|
|
+ assert.equal(fs.readFileSync(p).toString().trim(), 'file1');
|
|
|
});
|
|
|
|
|
|
it('throws ENOENT error when can not find file', function() {
|
|
|
- var p, throws;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- throws = function() {
|
|
|
- return fs.readFileSync(p);
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
+ var throws = function() {
|
|
|
+ fs.readFileSync(p);
|
|
|
};
|
|
|
- return assert.throws(throws, /ENOENT/);
|
|
|
+ assert.throws(throws, /ENOENT/);
|
|
|
});
|
|
|
|
|
|
it('passes ENOENT error to callback when can not find file', function() {
|
|
|
- var async, p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- async = false;
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
+ var async = false;
|
|
|
fs.readFile(p, function(e) {
|
|
|
assert(async);
|
|
|
- return assert(/ENOENT/.test(e));
|
|
|
+ assert(/ENOENT/.test(e));
|
|
|
});
|
|
|
- return async = true;
|
|
|
+ async = true;
|
|
|
});
|
|
|
|
|
|
- return it('reads a normal file with unpacked files', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'unpack.asar', 'a.txt');
|
|
|
- return assert.equal(fs.readFileSync(p).toString().trim(), 'a');
|
|
|
+ it('reads a normal file with unpacked files', function() {
|
|
|
+ var p = path.join(fixtures, 'asar', 'unpack.asar', 'a.txt');
|
|
|
+ assert.equal(fs.readFileSync(p).toString().trim(), 'a');
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.readFile', function() {
|
|
|
it('reads a normal file', function(done) {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
- return fs.readFile(p, function(err, content) {
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
+ fs.readFile(p, function(err, content) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(String(content).trim(), 'file1');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('reads from a empty file', function(done) {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'empty.asar', 'file1');
|
|
|
- return fs.readFile(p, function(err, content) {
|
|
|
+ var p = path.join(fixtures, 'asar', 'empty.asar', 'file1');
|
|
|
+ fs.readFile(p, function(err, content) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(String(content), '');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('reads a linked file', function(done) {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
- return fs.readFile(p, function(err, content) {
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
+ fs.readFile(p, function(err, content) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(String(content).trim(), 'file1');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('reads a file from linked directory', function(done) {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
- return fs.readFile(p, function(err, content) {
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
+ fs.readFile(p, function(err, content) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(String(content).trim(), 'file1');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function(done) {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return fs.readFile(p, function(err) {
|
|
|
+ it('throws ENOENT error when can not find file', function(done) {
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
+ fs.readFile(p, function(err) {
|
|
|
assert.equal(err.code, 'ENOENT');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.lstatSync', function() {
|
|
|
it('handles path with trailing slash correctly', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
fs.lstatSync(p);
|
|
|
- return fs.lstatSync(p + '/');
|
|
|
+ fs.lstatSync(p + '/');
|
|
|
});
|
|
|
|
|
|
it('returns information of root', function() {
|
|
@@ -147,7 +134,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isFile(), false);
|
|
|
assert.equal(stats.isDirectory(), true);
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
- return assert.equal(stats.size, 0);
|
|
|
+ assert.equal(stats.size, 0);
|
|
|
});
|
|
|
|
|
|
it('returns information of a normal file', function() {
|
|
@@ -163,7 +150,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
results.push(assert.equal(stats.size, 6));
|
|
|
}
|
|
|
- return results;
|
|
|
+ results;
|
|
|
});
|
|
|
|
|
|
it('returns information of a normal directory', function() {
|
|
@@ -179,7 +166,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
results.push(assert.equal(stats.size, 0));
|
|
|
}
|
|
|
- return results;
|
|
|
+ results;
|
|
|
});
|
|
|
|
|
|
it('returns information of a linked file', function() {
|
|
@@ -195,7 +182,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isSymbolicLink(), true);
|
|
|
results.push(assert.equal(stats.size, 0));
|
|
|
}
|
|
|
- return results;
|
|
|
+ results;
|
|
|
});
|
|
|
|
|
|
it('returns information of a linked directory', function() {
|
|
@@ -211,29 +198,27 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isSymbolicLink(), true);
|
|
|
results.push(assert.equal(stats.size, 0));
|
|
|
}
|
|
|
- return results;
|
|
|
+ results;
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function() {
|
|
|
- var file, j, len, p, ref2, results, throws;
|
|
|
+ it('throws ENOENT error when can not find file', function() {
|
|
|
+ var file, j, len, p, ref2, throws;
|
|
|
ref2 = ['file4', 'file5', path.join('dir1', 'file4')];
|
|
|
- results = [];
|
|
|
for (j = 0, len = ref2.length; j < len; j++) {
|
|
|
file = ref2[j];
|
|
|
p = path.join(fixtures, 'asar', 'a.asar', file);
|
|
|
throws = function() {
|
|
|
- return fs.lstatSync(p);
|
|
|
+ fs.lstatSync(p);
|
|
|
};
|
|
|
- results.push(assert.throws(throws, /ENOENT/));
|
|
|
+ assert.throws(throws, /ENOENT/);
|
|
|
}
|
|
|
- return results;
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.lstat', function() {
|
|
|
it('handles path with trailing slash correctly', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2', 'file1');
|
|
|
- return fs.lstat(p + '/', done);
|
|
|
+ fs.lstat(p + '/', done);
|
|
|
});
|
|
|
|
|
|
it('returns information of root', function(done) {
|
|
@@ -244,7 +229,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isDirectory(), true);
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
assert.equal(stats.size, 0);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -256,7 +241,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isDirectory(), false);
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
assert.equal(stats.size, 6);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -268,7 +253,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isDirectory(), true);
|
|
|
assert.equal(stats.isSymbolicLink(), false);
|
|
|
assert.equal(stats.size, 0);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -280,7 +265,7 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isDirectory(), false);
|
|
|
assert.equal(stats.isSymbolicLink(), true);
|
|
|
assert.equal(stats.size, 0);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -292,15 +277,15 @@ describe('asar package', function() {
|
|
|
assert.equal(stats.isDirectory(), false);
|
|
|
assert.equal(stats.isSymbolicLink(), true);
|
|
|
assert.equal(stats.size, 0);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function(done) {
|
|
|
+ it('throws ENOENT error when can not find file', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'file4');
|
|
|
fs.lstat(p, function(err) {
|
|
|
assert.equal(err.code, 'ENOENT');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
@@ -310,44 +295,44 @@ describe('asar package', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = 'a.asar';
|
|
|
var r = fs.realpathSync(path.join(parent, p));
|
|
|
- return assert.equal(r, path.join(parent, p));
|
|
|
+ assert.equal(r, path.join(parent, p));
|
|
|
});
|
|
|
|
|
|
it('returns real path of a normal file', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'file1');
|
|
|
var r = fs.realpathSync(path.join(parent, p));
|
|
|
- return assert.equal(r, path.join(parent, p));
|
|
|
+ assert.equal(r, path.join(parent, p));
|
|
|
});
|
|
|
|
|
|
it('returns real path of a normal directory', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'dir1');
|
|
|
var r = fs.realpathSync(path.join(parent, p));
|
|
|
- return assert.equal(r, path.join(parent, p));
|
|
|
+ assert.equal(r, path.join(parent, p));
|
|
|
});
|
|
|
|
|
|
it('returns real path of a linked file', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'link2', 'link1');
|
|
|
var r = fs.realpathSync(path.join(parent, p));
|
|
|
- return assert.equal(r, path.join(parent, 'a.asar', 'file1'));
|
|
|
+ assert.equal(r, path.join(parent, 'a.asar', 'file1'));
|
|
|
});
|
|
|
|
|
|
it('returns real path of a linked directory', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'link2', 'link2');
|
|
|
var r = fs.realpathSync(path.join(parent, p));
|
|
|
- return assert.equal(r, path.join(parent, 'a.asar', 'dir1'));
|
|
|
+ assert.equal(r, path.join(parent, 'a.asar', 'dir1'));
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function() {
|
|
|
+ it('throws ENOENT error when can not find file', function() {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'not-exist');
|
|
|
var throws = function() {
|
|
|
- return fs.realpathSync(path.join(parent, p));
|
|
|
+ fs.realpathSync(path.join(parent, p));
|
|
|
};
|
|
|
- return assert.throws(throws, /ENOENT/);
|
|
|
+ assert.throws(throws, /ENOENT/);
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -355,58 +340,58 @@ describe('asar package', function() {
|
|
|
it('returns real path root', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = 'a.asar';
|
|
|
- return fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(r, path.join(parent, p));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('returns real path of a normal file', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'file1');
|
|
|
- return fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(r, path.join(parent, p));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('returns real path of a normal directory', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'dir1');
|
|
|
- return fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(r, path.join(parent, p));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('returns real path of a linked file', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'link2', 'link1');
|
|
|
- return fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(r, path.join(parent, 'a.asar', 'file1'));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('returns real path of a linked directory', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'link2', 'link2');
|
|
|
- return fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err, r) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(r, path.join(parent, 'a.asar', 'dir1'));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
- return it('throws ENOENT error when can not find file', function(done) {
|
|
|
+ it('throws ENOENT error when can not find file', function(done) {
|
|
|
var parent = fs.realpathSync(path.join(fixtures, 'asar'));
|
|
|
var p = path.join('a.asar', 'not-exist');
|
|
|
- return fs.realpath(path.join(parent, p), function(err) {
|
|
|
+ fs.realpath(path.join(parent, p), function(err) {
|
|
|
assert.equal(err.code, 'ENOENT');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
@@ -414,27 +399,27 @@ describe('asar package', function() {
|
|
|
it('reads dirs from root', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar');
|
|
|
var dirs = fs.readdirSync(p);
|
|
|
- return assert.deepEqual(dirs, ['dir1', 'dir2', 'dir3', 'file1', 'file2', 'file3', 'link1', 'link2', 'ping.js']);
|
|
|
+ assert.deepEqual(dirs, ['dir1', 'dir2', 'dir3', 'file1', 'file2', 'file3', 'link1', 'link2', 'ping.js']);
|
|
|
});
|
|
|
|
|
|
it('reads dirs from a normal dir', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'dir1');
|
|
|
var dirs = fs.readdirSync(p);
|
|
|
- return assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
+ assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
});
|
|
|
|
|
|
it('reads dirs from a linked dir', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'link2', 'link2');
|
|
|
var dirs = fs.readdirSync(p);
|
|
|
- return assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
+ assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function() {
|
|
|
+ it('throws ENOENT error when can not find file', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
var throws = function() {
|
|
|
- return fs.readdirSync(p);
|
|
|
+ fs.readdirSync(p);
|
|
|
};
|
|
|
- return assert.throws(throws, /ENOENT/);
|
|
|
+ assert.throws(throws, /ENOENT/);
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -444,7 +429,7 @@ describe('asar package', function() {
|
|
|
fs.readdir(p, function(err, dirs) {
|
|
|
assert.equal(err, null);
|
|
|
assert.deepEqual(dirs, ['dir1', 'dir2', 'dir3', 'file1', 'file2', 'file3', 'link1', 'link2', 'ping.js']);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -453,7 +438,7 @@ describe('asar package', function() {
|
|
|
fs.readdir(p, function(err, dirs) {
|
|
|
assert.equal(err, null);
|
|
|
assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
it('reads dirs from a linked dir', function(done) {
|
|
@@ -461,15 +446,15 @@ describe('asar package', function() {
|
|
|
fs.readdir(p, function(err, dirs) {
|
|
|
assert.equal(err, null);
|
|
|
assert.deepEqual(dirs, ['file1', 'file2', 'file3', 'link1', 'link2']);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function(done) {
|
|
|
+ it('throws ENOENT error when can not find file', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return fs.readdir(p, function(err) {
|
|
|
+ fs.readdir(p, function(err) {
|
|
|
assert.equal(err.code, 'ENOENT');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
@@ -478,7 +463,6 @@ describe('asar package', function() {
|
|
|
it('opens a normal/linked/under-linked-directory file', function() {
|
|
|
var buffer, fd, file, j, len, p, ref2, results;
|
|
|
ref2 = ['file1', 'link1', path.join('link2', 'file1')];
|
|
|
- results = [];
|
|
|
for (j = 0, len = ref2.length; j < len; j++) {
|
|
|
file = ref2[j];
|
|
|
p = path.join(fixtures, 'asar', 'a.asar', file);
|
|
@@ -486,59 +470,57 @@ describe('asar package', function() {
|
|
|
buffer = new Buffer(6);
|
|
|
fs.readSync(fd, buffer, 0, 6, 0);
|
|
|
assert.equal(String(buffer).trim(), 'file1');
|
|
|
- results.push(fs.closeSync(fd));
|
|
|
+ fs.closeSync(fd);
|
|
|
}
|
|
|
- return results;
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function() {
|
|
|
+ it('throws ENOENT error when can not find file', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
var throws = function() {
|
|
|
- return fs.openSync(p);
|
|
|
+ fs.openSync(p);
|
|
|
};
|
|
|
- return assert.throws(throws, /ENOENT/);
|
|
|
+ assert.throws(throws, /ENOENT/);
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.open', function() {
|
|
|
it('opens a normal file', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
- return fs.open(p, 'r', function(err, fd) {
|
|
|
- var buffer;
|
|
|
+ fs.open(p, 'r', function(err, fd) {
|
|
|
assert.equal(err, null);
|
|
|
- buffer = new Buffer(6);
|
|
|
- return fs.read(fd, buffer, 0, 6, 0, function(err) {
|
|
|
+ var buffer = new Buffer(6);
|
|
|
+ fs.read(fd, buffer, 0, 6, 0, function(err) {
|
|
|
assert.equal(err, null);
|
|
|
assert.equal(String(buffer).trim(), 'file1');
|
|
|
- return fs.close(fd, done);
|
|
|
+ fs.close(fd, done);
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('throws ENOENT error when can not find file', function(done) {
|
|
|
+ it('throws ENOENT error when can not find file', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return fs.open(p, 'r', function(err) {
|
|
|
+ fs.open(p, 'r', function(err) {
|
|
|
assert.equal(err.code, 'ENOENT');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.mkdir', function() {
|
|
|
- return it('throws error when calling inside asar archive', function(done) {
|
|
|
+ it('throws error when calling inside asar archive', function(done) {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return fs.mkdir(p, function(err) {
|
|
|
+ fs.mkdir(p, function(err) {
|
|
|
assert.equal(err.code, 'ENOTDIR');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('fs.mkdirSync', function() {
|
|
|
- return it('throws error when calling inside asar archive', function() {
|
|
|
+ it('throws error when calling inside asar archive', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return assert.throws((function() {
|
|
|
- return fs.mkdirSync(p);
|
|
|
+ assert.throws((function() {
|
|
|
+ fs.mkdirSync(p);
|
|
|
}), new RegExp('ENOTDIR'));
|
|
|
});
|
|
|
});
|
|
@@ -548,19 +530,19 @@ describe('asar package', function() {
|
|
|
var child = child_process.fork(path.join(fixtures, 'asar', 'a.asar', 'ping.js'));
|
|
|
child.on('message', function(msg) {
|
|
|
assert.equal(msg, 'message');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
- return child.send('message');
|
|
|
+ child.send('message');
|
|
|
});
|
|
|
|
|
|
- return it('supports asar in the forked js', function(done) {
|
|
|
+ it('supports asar in the forked js', function(done) {
|
|
|
var file = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
var child = child_process.fork(path.join(fixtures, 'module', 'asar.js'));
|
|
|
child.on('message', function(content) {
|
|
|
assert.equal(content, fs.readFileSync(file).toString());
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
- return child.send(file);
|
|
|
+ child.send(file);
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -576,14 +558,13 @@ describe('asar package', function() {
|
|
|
execFile(echo, ['test'], function(error, stdout) {
|
|
|
assert.equal(error, null);
|
|
|
assert.equal(stdout, 'test\n');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return xit('execFileSync executes binaries', function() {
|
|
|
- var output;
|
|
|
- output = execFileSync(echo, ['test']);
|
|
|
- return assert.equal(String(output), 'test\n');
|
|
|
+ xit('execFileSync executes binaries', function() {
|
|
|
+ var output = execFileSync(echo, ['test']);
|
|
|
+ assert.equal(String(output), 'test\n');
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -591,47 +572,45 @@ describe('asar package', function() {
|
|
|
var internalModuleReadFile = process.binding('fs').internalModuleReadFile;
|
|
|
|
|
|
it('read a normal file', function() {
|
|
|
- var file1, file2, file3;
|
|
|
- file1 = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
+ var file1 = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
assert.equal(internalModuleReadFile(file1).toString().trim(), 'file1');
|
|
|
- file2 = path.join(fixtures, 'asar', 'a.asar', 'file2');
|
|
|
+ var file2 = path.join(fixtures, 'asar', 'a.asar', 'file2');
|
|
|
assert.equal(internalModuleReadFile(file2).toString().trim(), 'file2');
|
|
|
- file3 = path.join(fixtures, 'asar', 'a.asar', 'file3');
|
|
|
- return assert.equal(internalModuleReadFile(file3).toString().trim(), 'file3');
|
|
|
+ var file3 = path.join(fixtures, 'asar', 'a.asar', 'file3');
|
|
|
+ assert.equal(internalModuleReadFile(file3).toString().trim(), 'file3');
|
|
|
});
|
|
|
|
|
|
- return it('reads a normal file with unpacked files', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'unpack.asar', 'a.txt');
|
|
|
- return assert.equal(internalModuleReadFile(p).toString().trim(), 'a');
|
|
|
+ it('reads a normal file with unpacked files', function() {
|
|
|
+ var p = path.join(fixtures, 'asar', 'unpack.asar', 'a.txt');
|
|
|
+ assert.equal(internalModuleReadFile(p).toString().trim(), 'a');
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return describe('process.noAsar', function() {
|
|
|
+ describe('process.noAsar', function() {
|
|
|
var errorName = process.platform === 'win32' ? 'ENOENT' : 'ENOTDIR';
|
|
|
|
|
|
beforeEach(function() {
|
|
|
- return process.noAsar = true;
|
|
|
+ process.noAsar = true;
|
|
|
});
|
|
|
|
|
|
afterEach(function() {
|
|
|
- return process.noAsar = false;
|
|
|
+ process.noAsar = false;
|
|
|
});
|
|
|
|
|
|
it('disables asar support in sync API', function() {
|
|
|
var file = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
var dir = path.join(fixtures, 'asar', 'a.asar', 'dir1');
|
|
|
assert.throws((function() {
|
|
|
- return fs.readFileSync(file);
|
|
|
+ fs.readFileSync(file);
|
|
|
}), new RegExp(errorName));
|
|
|
assert.throws((function() {
|
|
|
- return fs.lstatSync(file);
|
|
|
+ fs.lstatSync(file);
|
|
|
}), new RegExp(errorName));
|
|
|
assert.throws((function() {
|
|
|
- return fs.realpathSync(file);
|
|
|
+ fs.realpathSync(file);
|
|
|
}), new RegExp(errorName));
|
|
|
- return assert.throws((function() {
|
|
|
- return fs.readdirSync(dir);
|
|
|
+ assert.throws((function() {
|
|
|
+ fs.readdirSync(dir);
|
|
|
}), new RegExp(errorName));
|
|
|
});
|
|
|
|
|
@@ -639,30 +618,29 @@ describe('asar package', function() {
|
|
|
var dir, file;
|
|
|
file = path.join(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
dir = path.join(fixtures, 'asar', 'a.asar', 'dir1');
|
|
|
- return fs.readFile(file, function(error) {
|
|
|
+ fs.readFile(file, function(error) {
|
|
|
assert.equal(error.code, errorName);
|
|
|
- return fs.lstat(file, function(error) {
|
|
|
+ fs.lstat(file, function(error) {
|
|
|
assert.equal(error.code, errorName);
|
|
|
- return fs.realpath(file, function(error) {
|
|
|
+ fs.realpath(file, function(error) {
|
|
|
assert.equal(error.code, errorName);
|
|
|
- return fs.readdir(dir, function(error) {
|
|
|
+ fs.readdir(dir, function(error) {
|
|
|
assert.equal(error.code, errorName);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('treats *.asar as normal file', function() {
|
|
|
- var asar, content1, content2, originalFs;
|
|
|
- originalFs = require('original-fs');
|
|
|
- asar = path.join(fixtures, 'asar', 'a.asar');
|
|
|
- content1 = fs.readFileSync(asar);
|
|
|
- content2 = originalFs.readFileSync(asar);
|
|
|
+ it('treats *.asar as normal file', function() {
|
|
|
+ var originalFs = require('original-fs');
|
|
|
+ var asar = path.join(fixtures, 'asar', 'a.asar');
|
|
|
+ var content1 = fs.readFileSync(asar);
|
|
|
+ var content2 = originalFs.readFileSync(asar);
|
|
|
assert.equal(content1.compare(content2), 0);
|
|
|
- return assert.throws((function() {
|
|
|
- return fs.readdirSync(asar);
|
|
|
+ assert.throws((function() {
|
|
|
+ fs.readdirSync(asar);
|
|
|
}), /ENOTDIR/);
|
|
|
});
|
|
|
});
|
|
@@ -673,43 +651,43 @@ describe('asar package', function() {
|
|
|
|
|
|
it('can request a file in package', function(done) {
|
|
|
var p = path.resolve(fixtures, 'asar', 'a.asar', 'file1');
|
|
|
- return $.get("file://" + p, function(data) {
|
|
|
+ $.get("file://" + p, function(data) {
|
|
|
assert.equal(data.trim(), 'file1');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('can request a file in package with unpacked files', function(done) {
|
|
|
var p = path.resolve(fixtures, 'asar', 'unpack.asar', 'a.txt');
|
|
|
- return $.get("file://" + p, function(data) {
|
|
|
+ $.get("file://" + p, function(data) {
|
|
|
assert.equal(data.trim(), 'a');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('can request a linked file in package', function(done) {
|
|
|
var p = path.resolve(fixtures, 'asar', 'a.asar', 'link2', 'link1');
|
|
|
- return $.get("file://" + p, function(data) {
|
|
|
+ $.get("file://" + p, function(data) {
|
|
|
assert.equal(data.trim(), 'file1');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('can request a file in filesystem', function(done) {
|
|
|
var p = path.resolve(fixtures, 'asar', 'file');
|
|
|
- return $.get("file://" + p, function(data) {
|
|
|
+ $.get("file://" + p, function(data) {
|
|
|
assert.equal(data.trim(), 'file');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
|
|
|
it('gets 404 when file is not found', function(done) {
|
|
|
var p = path.resolve(fixtures, 'asar', 'a.asar', 'no-exist');
|
|
|
- return $.ajax({
|
|
|
+ $.ajax({
|
|
|
url: "file://" + p,
|
|
|
error: function(err) {
|
|
|
assert.equal(err.status, 404);
|
|
|
- return done();
|
|
|
+ done();
|
|
|
}
|
|
|
});
|
|
|
});
|
|
@@ -717,7 +695,7 @@ describe('asar package', function() {
|
|
|
it('sets __dirname correctly', function(done) {
|
|
|
after(function() {
|
|
|
w.destroy();
|
|
|
- return ipcMain.removeAllListeners('dirname');
|
|
|
+ ipcMain.removeAllListeners('dirname');
|
|
|
});
|
|
|
|
|
|
var w = new BrowserWindow({
|
|
@@ -733,15 +711,15 @@ describe('asar package', function() {
|
|
|
});
|
|
|
ipcMain.once('dirname', function(event, dirname) {
|
|
|
assert.equal(dirname, path.dirname(p));
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
- return w.loadURL(u);
|
|
|
+ w.loadURL(u);
|
|
|
});
|
|
|
|
|
|
- return it('loads script tag in html', function(done) {
|
|
|
+ it('loads script tag in html', function(done) {
|
|
|
after(function() {
|
|
|
w.destroy();
|
|
|
- return ipcMain.removeAllListeners('ping');
|
|
|
+ ipcMain.removeAllListeners('ping');
|
|
|
});
|
|
|
|
|
|
var w = new BrowserWindow({
|
|
@@ -756,9 +734,9 @@ describe('asar package', function() {
|
|
|
pathname: p
|
|
|
});
|
|
|
w.loadURL(u);
|
|
|
- return ipcMain.once('ping', function(event, message) {
|
|
|
+ ipcMain.once('ping', function(event, message) {
|
|
|
assert.equal(message, 'pong');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
});
|
|
|
});
|
|
@@ -770,17 +748,17 @@ describe('asar package', function() {
|
|
|
var file, stats;
|
|
|
file = path.join(fixtures, 'asar', 'a.asar');
|
|
|
stats = originalFs.statSync(file);
|
|
|
- return assert(stats.isFile());
|
|
|
+ assert(stats.isFile());
|
|
|
});
|
|
|
|
|
|
- return it('is available in forked scripts', function(done) {
|
|
|
+ it('is available in forked scripts', function(done) {
|
|
|
var child;
|
|
|
child = child_process.fork(path.join(fixtures, 'module', 'original-fs.js'));
|
|
|
child.on('message', function(msg) {
|
|
|
assert.equal(msg, 'object');
|
|
|
- return done();
|
|
|
+ done();
|
|
|
});
|
|
|
- return child.send('message');
|
|
|
+ child.send('message');
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -788,41 +766,39 @@ describe('asar package', function() {
|
|
|
var gfs = require('graceful-fs');
|
|
|
|
|
|
it('recognize asar archvies', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
- return assert.equal(gfs.readFileSync(p).toString().trim(), 'file1');
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'link1');
|
|
|
+ assert.equal(gfs.readFileSync(p).toString().trim(), 'file1');
|
|
|
});
|
|
|
- return it('does not touch global fs object', function() {
|
|
|
- return assert.notEqual(fs.readdir, gfs.readdir);
|
|
|
+ it('does not touch global fs object', function() {
|
|
|
+ assert.notEqual(fs.readdir, gfs.readdir);
|
|
|
});
|
|
|
});
|
|
|
|
|
|
describe('mkdirp module', function() {
|
|
|
var mkdirp = require('mkdirp');
|
|
|
|
|
|
- return it('throws error when calling inside asar archive', function() {
|
|
|
- var p;
|
|
|
- p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
- return assert.throws((function() {
|
|
|
- return mkdirp.sync(p);
|
|
|
+ it('throws error when calling inside asar archive', function() {
|
|
|
+ var p = path.join(fixtures, 'asar', 'a.asar', 'not-exist');
|
|
|
+ assert.throws((function() {
|
|
|
+ mkdirp.sync(p);
|
|
|
}), new RegExp('ENOTDIR'));
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return describe('native-image', function() {
|
|
|
+ describe('native-image', function() {
|
|
|
it('reads image from asar archive', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'logo.asar', 'logo.png');
|
|
|
var logo = nativeImage.createFromPath(p);
|
|
|
- return assert.deepEqual(logo.getSize(), {
|
|
|
+ assert.deepEqual(logo.getSize(), {
|
|
|
width: 55,
|
|
|
height: 55
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- return it('reads image from asar archive with unpacked files', function() {
|
|
|
+ it('reads image from asar archive with unpacked files', function() {
|
|
|
var p = path.join(fixtures, 'asar', 'unpack.asar', 'atom.png');
|
|
|
var logo = nativeImage.createFromPath(p);
|
|
|
- return assert.deepEqual(logo.getSize(), {
|
|
|
+ assert.deepEqual(logo.getSize(), {
|
|
|
width: 1024,
|
|
|
height: 1024
|
|
|
});
|