archive-gh-me/shelljs
1
0
Fork 0
mirror of https://github.com/shelljs/shelljs.git synced 2026-01-25 16:07:37 +00:00
Code Issues Projects Releases Wiki Activity

fix: Object.keys(result).length --> result.length

Browse Source
This commit is contained in:
Artur Adib 2012-03-26 11:07:38 -04:00
parent 5d90b2f94b
commit d30f40afb2
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/find.js
View File

@ -37,20 +37,20 @@ var result = shell.find('resources/find');
assert.equal(shell.error(), null);
assert.equal(result.indexOf('resources/find/.hidden') > -1, true);
assert.equal(result.indexOf('resources/find/dir1/dir11/a_dir11') > -1, true);
assert.equal(Object.keys(result).length, 10);
assert.equal(result.length, 10);
// multiple paths - comma
var result = shell.find('resources/find/dir1', 'resources/find/dir2');
assert.equal(shell.error(), null);
assert.equal(result.indexOf('resources/find/dir1/dir11/a_dir11') > -1, true);
assert.equal(result.indexOf('resources/find/dir2/a_dir1') > -1, true);
assert.equal(Object.keys(result).length, 6);
assert.equal(result.length, 6);
// multiple paths - array
var result = shell.find(['resources/find/dir1', 'resources/find/dir2']);
assert.equal(shell.error(), null);
assert.equal(result.indexOf('resources/find/dir1/dir11/a_dir11') > -1, true);
assert.equal(result.indexOf('resources/find/dir2/a_dir1') > -1, true);
assert.equal(Object.keys(result).length, 6);
assert.equal(result.length, 6);
shell.exit(123);

32
test/ls.js
View File

@ -23,7 +23,7 @@ shell.mkdir('tmp')
assert.equal(fs.existsSync('/asdfasdf'), false); // sanity check
var result = shell.ls('/asdfasdf'); // no such file or dir
assert.ok(shell.error());
assert.equal(Object.keys(result).length, 0);
assert.equal(result.length, 0);
//
// Valids
@ -45,7 +45,7 @@ assert.equal(result.indexOf('file1.js') > -1, true);
assert.equal(result.indexOf('file2.js') > -1, true);
assert.equal(result.indexOf('filename(with)[chars$]^that.must+be-escaped') > -1, true);
assert.equal(result.indexOf('a_dir') > -1, true);
assert.equal(Object.keys(result).length, 6);
assert.equal(result.length, 6);
shell.cd('../..');
// simple arg
@ -57,7 +57,7 @@ assert.equal(result.indexOf('file1.js') > -1, true);
assert.equal(result.indexOf('file2.js') > -1, true);
assert.equal(result.indexOf('filename(with)[chars$]^that.must+be-escaped') > -1, true);
assert.equal(result.indexOf('a_dir') > -1, true);
assert.equal(Object.keys(result).length, 6);
assert.equal(result.length, 6);
// no args, 'all' option
shell.cd('resources/ls');
@ -71,7 +71,7 @@ assert.equal(result.indexOf('filename(with)[chars$]^that.must+be-escaped') > -1,
assert.equal(result.indexOf('a_dir') > -1, true);
assert.equal(result.indexOf('.hidden_file') > -1, true);
assert.equal(result.indexOf('.hidden_dir') > -1, true);
assert.equal(Object.keys(result).length, 8);
assert.equal(result.length, 8);
shell.cd('../..');
// wildcard, simple
@ -83,19 +83,19 @@ assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
assert.equal(result.indexOf('resources/ls/filename(with)[chars$]^that.must+be-escaped') > -1, true);
assert.equal(result.indexOf('resources/ls/a_dir') > -1, true);
assert.equal(Object.keys(result).length, 6);
assert.equal(result.length, 6);
// wildcard, hidden only
var result = shell.ls('resources/ls/.*');
assert.equal(shell.error(), null);
assert.equal(result.indexOf('resources/ls/.hidden_file') > -1, true);
assert.equal(result.indexOf('resources/ls/.hidden_dir') > -1, true);
assert.equal(Object.keys(result).length, 2);
assert.equal(result.length, 2);
// wildcard, mid-file
var result = shell.ls('resources/ls/f*le*');
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 5);
assert.equal(result.length, 5);
assert.equal(result.indexOf('resources/ls/file1') > -1, true);
assert.equal(result.indexOf('resources/ls/file2') > -1, true);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
@ -105,19 +105,19 @@ assert.equal(result.indexOf('resources/ls/filename(with)[chars$]^that.must+be-es
// wildcard, mid-file with dot (should escape dot for regex)
var result = shell.ls('resources/ls/f*le*.js');
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 2);
assert.equal(result.length, 2);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
// wildcard, should not do partial matches
var result = shell.ls('resources/ls/*.j'); // shouldn't get .js
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 0);
assert.equal(result.length, 0);
// wildcard, all files with extension
var result = shell.ls('resources/ls/*.*');
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 3);
assert.equal(result.length, 3);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
assert.equal(result.indexOf('resources/ls/filename(with)[chars$]^that.must+be-escaped') > -1, true);
@ -125,7 +125,7 @@ assert.equal(result.indexOf('resources/ls/filename(with)[chars$]^that.must+be-es
// wildcard, with additional path
var result = shell.ls('resources/ls/f*le*.js', 'resources/ls/a_dir');
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 4);
assert.equal(result.length, 4);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
assert.equal(result.indexOf('b_dir') > -1, true); // no wildcard == no path prefix
@ -134,7 +134,7 @@ assert.equal(result.indexOf('nada') > -1, true); // no wildcard == no path prefi
// wildcard for both paths
var result = shell.ls('resources/ls/f*le*.js', 'resources/ls/a_dir/*');
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 4);
assert.equal(result.length, 4);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
assert.equal(result.indexOf('resources/ls/a_dir/b_dir') > -1, true);
@ -143,7 +143,7 @@ assert.equal(result.indexOf('resources/ls/a_dir/nada') > -1, true);
// wildcard for both paths, array
var result = shell.ls(['resources/ls/f*le*.js', 'resources/ls/a_dir/*']);
assert.equal(shell.error(), null);
assert.equal(Object.keys(result).length, 4);
assert.equal(result.length, 4);
assert.equal(result.indexOf('resources/ls/file1.js') > -1, true);
assert.equal(result.indexOf('resources/ls/file2.js') > -1, true);
assert.equal(result.indexOf('resources/ls/a_dir/b_dir') > -1, true);
@ -156,7 +156,7 @@ assert.equal(shell.error(), null);
assert.equal(result.indexOf('a_dir') > -1, true);
assert.equal(result.indexOf('a_dir/b_dir') > -1, true);
assert.equal(result.indexOf('a_dir/b_dir/z') > -1, true);
assert.equal(Object.keys(result).length, 10);
assert.equal(result.length, 10);
shell.cd('../..');
// recusive, path given
@ -165,7 +165,7 @@ assert.equal(shell.error(), null);
assert.equal(result.indexOf('a_dir') > -1, true);
assert.equal(result.indexOf('a_dir/b_dir') > -1, true);
assert.equal(result.indexOf('a_dir/b_dir/z') > -1, true);
assert.equal(Object.keys(result).length, 10);
assert.equal(result.length, 10);
// recursive, wildcard
var result = shell.ls('-R', 'resources/ls/*');
@ -173,6 +173,6 @@ assert.equal(shell.error(), null);
assert.equal(result.indexOf('resources/ls/a_dir') > -1, true);
assert.equal(result.indexOf('resources/ls/a_dir/b_dir') > -1, true);
assert.equal(result.indexOf('resources/ls/a_dir/b_dir/z') > -1, true);
assert.equal(Object.keys(result).length, 10);
assert.equal(result.length, 10);
shell.exit(123);