Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	test/readify.js
  • Loading branch information
quazardous committed Jan 6, 2017
2 parents 0ee33e5 + 4d97dd0 commit bffb42b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/readify.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ test('readify: result', (t) => {
name,
size: '1.00kb',
date: '23.11.2016',
owner: 'bin',
/* depends on npm@nicki */
/* could be different */
/* owner: 'bin', */
mode: 'rwx rwx r-x'
}]
};
Expand All @@ -107,6 +109,7 @@ test('readify: result', (t) => {
readify('.', (error, result) => {
result.files = result.files.map(function(file) {
delete file.raw;
delete file.owner;
return file;
});
t.deepEqual(result, expected, 'should get raw values');
Expand Down

0 comments on commit bffb42b

Please sign in to comment.