Skip to content

Commit ba54c11

Browse files
segayuusegayuu
committedAug 15, 2019
Refactor test
·
v5.0.02.0.0
1 parent bca03f3 commit ba54c11

File tree

1 file changed

+61
-95
lines changed

1 file changed

+61
-95
lines changed
 

‎test/index.js

+61-95
Original file line numberDiff line numberDiff line change
@@ -281,30 +281,23 @@ describe('fs', () => {
281281
const src = pathFn.join(tmpDir, 'a');
282282
const dest = pathFn.join(tmpDir, 'b');
283283

284+
const filenames = [
285+
pathFn.join('.hidden', 'a.txt'),
286+
pathFn.join('.hidden', 'b.js'),
287+
pathFn.join('.hidden', 'c', 'd'),
288+
'e.txt',
289+
'f.js',
290+
'.g',
291+
pathFn.join('folder', 'h.txt'),
292+
pathFn.join('folder', 'i.js'),
293+
pathFn.join('folder', '.j')
294+
];
295+
284296
return createDummyFolder(src)
285297
.then(() => fs.copyDir(src, dest, {ignoreHidden: false}))
286-
.should.eventually.have.members([
287-
pathFn.join('.hidden', 'a.txt'),
288-
pathFn.join('.hidden', 'b.js'),
289-
pathFn.join('.hidden', 'c', 'd'),
290-
'e.txt',
291-
'f.js',
292-
'.g',
293-
pathFn.join('folder', 'h.txt'),
294-
pathFn.join('folder', 'i.js'),
295-
pathFn.join('folder', '.j')
296-
])
297-
.then(() => Promise.all([
298-
fs.readFile(pathFn.join(dest, '.hidden', 'a.txt')),
299-
fs.readFile(pathFn.join(dest, '.hidden', 'b.js')),
300-
fs.readFile(pathFn.join(dest, '.hidden', 'c', 'd')),
301-
fs.readFile(pathFn.join(dest, 'e.txt')),
302-
fs.readFile(pathFn.join(dest, 'f.js')),
303-
fs.readFile(pathFn.join(dest, '.g')),
304-
fs.readFile(pathFn.join(dest, 'folder', 'h.txt')),
305-
fs.readFile(pathFn.join(dest, 'folder', 'i.js')),
306-
fs.readFile(pathFn.join(dest, 'folder', '.j'))
307-
]))
298+
.then(files => files.should.have.members(filenames))
299+
.return(filenames)
300+
.map(path => fs.readFile(pathFn.join(dest, path)))
308301
.should.become(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i', 'j'])
309302
.then(() => Promise.all([fs.rmdir(src), fs.rmdir(dest)]));
310303
});
@@ -313,13 +306,13 @@ describe('fs', () => {
313306
const src = pathFn.join(tmpDir, 'a');
314307
const dest = pathFn.join(tmpDir, 'b');
315308

309+
const filenames = ['e.txt', pathFn.join('folder', 'h.txt')];
310+
316311
return createDummyFolder(src)
317312
.then(() => fs.copyDir(src, dest, {ignorePattern: /\.js/}))
318-
.should.eventually.have.members(['e.txt', pathFn.join('folder', 'h.txt')])
319-
.then(() => Promise.all([
320-
fs.readFile(pathFn.join(dest, 'e.txt')),
321-
fs.readFile(pathFn.join(dest, 'folder', 'h.txt'))
322-
]))
313+
.then(files => files.should.have.members(filenames))
314+
.return(filenames)
315+
.map(path => fs.readFile(pathFn.join(dest, path)))
323316
.should.become(['e', 'h'])
324317
.then(() => Promise.all([fs.rmdir(src), fs.rmdir(dest)]));
325318
});
@@ -523,14 +516,10 @@ describe('fs', () => {
523516

524517
return fs.writeFile(target, '')
525518
.then(() => fs.exists(target))
526-
.then(exist => {
527-
exist.should.eql(true);
528-
return fs.unlink(target);
529-
})
519+
.should.become(true)
520+
.then(() => fs.unlink(target))
530521
.then(() => fs.exists(target))
531-
.then(exist => {
532-
exist.should.eql(false);
533-
});
522+
.should.become(false);
534523
});
535524

536525
it('emptyDir()', () => {
@@ -600,34 +589,23 @@ describe('fs', () => {
600589
it('emptyDir() - ignoreHidden off', () => {
601590
const target = pathFn.join(tmpDir, 'test');
602591

592+
const filenames = [
593+
pathFn.join('.hidden', 'a.txt'),
594+
pathFn.join('.hidden', 'b.js'),
595+
pathFn.join('.hidden', 'c', 'd'),
596+
'e.txt',
597+
'f.js',
598+
'.g',
599+
pathFn.join('folder', 'h.txt'),
600+
pathFn.join('folder', 'i.js'),
601+
pathFn.join('folder', '.j')
602+
];
603+
603604
return createDummyFolder(target)
604605
.then(() => fs.emptyDir(target, {ignoreHidden: false}))
605-
.then(files => {
606-
files.should.have.members([
607-
pathFn.join('.hidden', 'a.txt'),
608-
pathFn.join('.hidden', 'b.js'),
609-
pathFn.join('.hidden', 'c', 'd'),
610-
'e.txt',
611-
'f.js',
612-
'.g',
613-
pathFn.join('folder', 'h.txt'),
614-
pathFn.join('folder', 'i.js'),
615-
pathFn.join('folder', '.j')
616-
]);
617-
618-
return [
619-
pathFn.join(target, '.hidden', 'a.txt'),
620-
pathFn.join(target, '.hidden', 'b.js'),
621-
pathFn.join(target, '.hidden', 'c', 'd'),
622-
pathFn.join(target, 'e.txt'),
623-
pathFn.join(target, 'f.js'),
624-
pathFn.join(target, '.g'),
625-
pathFn.join(target, 'folder', 'h.txt'),
626-
pathFn.join(target, 'folder', 'i.js'),
627-
pathFn.join(target, 'folder', '.j')
628-
];
629-
})
630-
.map(data => fs.exists(data).should.become(false))
606+
.then(files => files.should.have.members(filenames))
607+
.return(filenames)
608+
.map(path => fs.exists(pathFn.join(target, path)).should.become(false))
631609
.then(() => fs.rmdir(target));
632610
});
633611

@@ -636,8 +614,8 @@ describe('fs', () => {
636614

637615
return createDummyFolder(target)
638616
.then(() => fs.emptyDir(target, {ignorePattern: /\.js/}))
639-
.should.eventually.have.members(['e.txt', pathFn.join('folder', 'h.txt')])
640-
.then(() => [
617+
.then(files => files.should.have.members(['e.txt', pathFn.join('folder', 'h.txt')]))
618+
.thenReturn([
641619
[pathFn.join(target, '.hidden', 'a.txt'), true],
642620
[pathFn.join(target, '.hidden', 'b.js'), true],
643621
[pathFn.join(target, '.hidden', 'c', 'd'), true],
@@ -648,7 +626,7 @@ describe('fs', () => {
648626
[pathFn.join(target, 'folder', 'i.js'), true],
649627
[pathFn.join(target, 'folder', '.j'), true]
650628
])
651-
.map(data => fs.exists(data[0]).then(exist => { exist.should.eql(data[1]); }))
629+
.map(data => fs.exists(data[0]).should.become(data[1]))
652630
.then(() => fs.rmdir(target));
653631
});
654632

@@ -669,7 +647,7 @@ describe('fs', () => {
669647
[pathFn.join(target, 'folder', 'i.js'), true],
670648
[pathFn.join(target, 'folder', '.j'), true]
671649
])
672-
.map(data => fs.exists(data[0]).then(exist => { exist.should.eql(data[1]); }))
650+
.map(data => fs.exists(data[0]).should.become(data[1]))
673651
.then(() => fs.rmdir(target));
674652
});
675653

@@ -698,7 +676,7 @@ describe('fs', () => {
698676
[pathFn.join(target, 'folder', '.j'), true]
699677
];
700678
})
701-
.map(data => fs.exists(data[0]).then(exist => { exist.should.eql(data[1]); }))
679+
.map(data => fs.exists(data[0]).should.become(data[1]))
702680
.then(() => fs.rmdir(target));
703681
});
704682

@@ -709,34 +687,25 @@ describe('fs', () => {
709687
it('emptyDirSync() - ignoreHidden off', () => {
710688
const target = pathFn.join(tmpDir, 'test');
711689

690+
const filenames = [
691+
pathFn.join('.hidden', 'a.txt'),
692+
pathFn.join('.hidden', 'b.js'),
693+
pathFn.join('.hidden', 'c', 'd'),
694+
'e.txt',
695+
'f.js',
696+
'.g',
697+
pathFn.join('folder', 'h.txt'),
698+
pathFn.join('folder', 'i.js'),
699+
pathFn.join('folder', '.j')
700+
];
701+
712702
return createDummyFolder(target)
713703
.then(() => {
714704
const files = fs.emptyDirSync(target, {ignoreHidden: false});
715-
files.should.have.members([
716-
pathFn.join('.hidden', 'a.txt'),
717-
pathFn.join('.hidden', 'b.js'),
718-
pathFn.join('.hidden', 'c', 'd'),
719-
'e.txt',
720-
'f.js',
721-
'.g',
722-
pathFn.join('folder', 'h.txt'),
723-
pathFn.join('folder', 'i.js'),
724-
pathFn.join('folder', '.j')
725-
]);
726-
727-
return [
728-
pathFn.join(target, '.hidden', 'a.txt'),
729-
pathFn.join(target, '.hidden', 'b.js'),
730-
pathFn.join(target, '.hidden', 'c', 'd'),
731-
pathFn.join(target, 'e.txt'),
732-
pathFn.join(target, 'f.js'),
733-
pathFn.join(target, '.g'),
734-
pathFn.join(target, 'folder', 'h.txt'),
735-
pathFn.join(target, 'folder', 'i.js'),
736-
pathFn.join(target, 'folder', '.j')
737-
];
705+
files.should.have.members(filenames);
706+
return filenames;
738707
})
739-
.map(data => fs.exists(data).should.become(false))
708+
.map(path => fs.exists(pathFn.join(target, path)).should.become(false))
740709
.then(() => fs.rmdir(target));
741710
});
742711

@@ -862,12 +831,9 @@ describe('fs', () => {
862831
it('ensurePath() - file exists', () => {
863832
const target = pathFn.join(tmpDir, 'test');
864833

865-
return Promise.all([
866-
fs.writeFile(pathFn.join(target, 'foo.txt')),
867-
fs.writeFile(pathFn.join(target, 'foo-1.txt')),
868-
fs.writeFile(pathFn.join(target, 'foo-2.md')),
869-
fs.writeFile(pathFn.join(target, 'bar.txt'))
870-
]).then(() => fs.ensurePath(pathFn.join(target, 'foo.txt')))
834+
return Promise
835+
.map(['foo.txt', 'foo-1.txt', 'foo-2.md', 'bar.txt'], path => fs.writeFile(pathFn.join(target, path)))
836+
.then(() => fs.ensurePath(pathFn.join(target, 'foo.txt')))
871837
.should.become(pathFn.join(target, 'foo-2.txt'))
872838
.then(() => fs.rmdir(target));
873839
});

0 commit comments

Comments
 (0)
Please sign in to comment.