Skip to content

Commit a7bea3c

Browse files
phatedphated
committed
Merge pull request #102 from OnkelTem/strict_tests
Update tests to 'strict mode'
2 parents 812c696 + 85c1286 commit a7bea3c

File tree

4 files changed

+76
-68
lines changed

4 files changed

+76
-68
lines changed

‎test/dest.js

+42-40
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
var spies = require('./spy');
24
var chmodSpy = spies.chmodSpy;
35
var statSpy = spies.statSpy;
@@ -30,7 +32,7 @@ var dataWrap = function(fn) {
3032
};
3133

3234
var realMode = function(n) {
33-
return n & 07777;
35+
return n & parseInt('7777', 8);
3436
};
3537

3638
describe('dest stream', function() {
@@ -78,7 +80,7 @@ describe('dest stream', function() {
7880
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
7981

8082
var buffered = [];
81-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
83+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
8284
stream.pipe(bufferStream);
8385
stream.write(expectedFile);
8486
stream.end();
@@ -103,7 +105,7 @@ describe('dest stream', function() {
103105
var stream = vfs.dest(path.join(__dirname, './out-fixtures/'));
104106

105107
var buffered = [];
106-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
108+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
107109
stream.pipe(bufferStream);
108110
stream.write(expectedFile);
109111
stream.end();
@@ -136,7 +138,7 @@ describe('dest stream', function() {
136138
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
137139

138140
var buffered = [];
139-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
141+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
140142
stream.pipe(bufferStream);
141143
stream.write(expectedFile);
142144
stream.end();
@@ -171,7 +173,7 @@ describe('dest stream', function() {
171173
var stream = vfs.dest('./out-fixtures/', {cwd: path.relative(process.cwd(), __dirname)});
172174

173175
var buffered = [];
174-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
176+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
175177
stream.pipe(bufferStream);
176178
stream.write(expectedFile);
177179
stream.end();
@@ -210,7 +212,7 @@ describe('dest stream', function() {
210212
}, {cwd: path.relative(process.cwd(), __dirname)});
211213

212214
var buffered = [];
213-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
215+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
214216
stream.pipe(bufferStream);
215217
stream.write(expectedFile);
216218
stream.end();
@@ -223,7 +225,7 @@ describe('dest stream', function() {
223225
var expectedContents = fs.readFileSync(inputPath);
224226
var expectedCwd = __dirname;
225227
var expectedBase = path.join(__dirname, './out-fixtures');
226-
var expectedMode = 0655;
228+
var expectedMode = parseInt('655', 8);
227229

228230
var expectedFile = new File({
229231
base: inputBase,
@@ -250,7 +252,7 @@ describe('dest stream', function() {
250252
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
251253

252254
var buffered = [];
253-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
255+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
254256
stream.pipe(bufferStream);
255257
stream.write(expectedFile);
256258
stream.end();
@@ -263,7 +265,7 @@ describe('dest stream', function() {
263265
var expectedContents = fs.readFileSync(inputPath);
264266
var expectedCwd = __dirname;
265267
var expectedBase = path.join(__dirname, './out-fixtures');
266-
var expectedMode = 0655;
268+
var expectedMode = parseInt('655', 8);
267269

268270
var contentStream = through.obj();
269271
var expectedFile = new File({
@@ -291,7 +293,7 @@ describe('dest stream', function() {
291293
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
292294

293295
var buffered = [];
294-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
296+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
295297
stream.pipe(bufferStream);
296298
stream.write(expectedFile);
297299
setTimeout(function(){
@@ -307,7 +309,7 @@ describe('dest stream', function() {
307309
var expectedPath = path.join(__dirname, './out-fixtures/test');
308310
var expectedCwd = __dirname;
309311
var expectedBase = path.join(__dirname, './out-fixtures');
310-
var expectedMode = 0655;
312+
var expectedMode = parseInt('655', 8);
311313

312314
var expectedFile = new File({
313315
base: inputBase,
@@ -337,7 +339,7 @@ describe('dest stream', function() {
337339
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
338340

339341
var buffered = [];
340-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
342+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
341343
stream.pipe(bufferStream);
342344
stream.write(expectedFile);
343345
stream.end();
@@ -388,7 +390,7 @@ describe('dest stream', function() {
388390
var expectedContents = fs.readFileSync(inputPath);
389391
var expectedCwd = __dirname;
390392
var expectedBase = path.join(__dirname, './out-fixtures');
391-
var expectedMode = 0666 & (~process.umask());
393+
var expectedMode = parseInt('666', 8) & (~process.umask());
392394

393395
var expectedFile = new File({
394396
base: inputBase,
@@ -409,7 +411,7 @@ describe('dest stream', function() {
409411
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
410412

411413
var buffered = [];
412-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
414+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
413415

414416
stream.pipe(bufferStream);
415417
stream.write(expectedFile);
@@ -423,7 +425,7 @@ describe('dest stream', function() {
423425
var expectedContents = fs.readFileSync(inputPath);
424426
var expectedCwd = __dirname;
425427
var expectedBase = path.join(__dirname, './out-fixtures');
426-
var expectedMode = 0744;
428+
var expectedMode = parseInt('744', 8);
427429

428430
var expectedFile = new File({
429431
base: inputBase,
@@ -444,7 +446,7 @@ describe('dest stream', function() {
444446
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname, mode:expectedMode});
445447

446448
var buffered = [];
447-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
449+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
448450

449451
stream.pipe(bufferStream);
450452
stream.write(expectedFile);
@@ -458,8 +460,8 @@ describe('dest stream', function() {
458460
var expectedContents = fs.readFileSync(inputPath);
459461
var expectedCwd = __dirname;
460462
var expectedBase = path.join(__dirname, './out-fixtures');
461-
var startMode = 0655;
462-
var expectedMode = 0722;
463+
var startMode = parseInt('0655', 8);
464+
var expectedMode = parseInt('0722', 8);
463465

464466
var expectedFile = new File({
465467
base: inputBase,
@@ -488,7 +490,7 @@ describe('dest stream', function() {
488490
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
489491

490492
var buffered = [];
491-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
493+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
492494

493495
stream.pipe(bufferStream);
494496
stream.write(expectedFile);
@@ -509,10 +511,10 @@ describe('dest stream', function() {
509511
stat: fs.statSync(inputPath)
510512
});
511513
var startMode = firstFile.stat.mode;
512-
var expectedMode = 0727;
514+
var expectedMode = parseInt('727', 8);
513515

514516
var expectedFile = new File(firstFile);
515-
expectedFile.stat.mode = (startMode & ~07777) | expectedMode;
517+
expectedFile.stat.mode = (startMode & ~parseInt('7777', 8)) | expectedMode;
516518

517519
var onEnd = function(){
518520
buffered.length.should.equal(2);
@@ -530,7 +532,7 @@ describe('dest stream', function() {
530532
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
531533

532534
var buffered = [];
533-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
535+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
534536

535537
stream.pipe(bufferStream);
536538
stream.write(firstFile);
@@ -542,8 +544,8 @@ describe('dest stream', function() {
542544
var inputBase = path.join(__dirname, './fixtures');
543545
var inputPath = path.join(__dirname, './fixtures/wow/suchempty');
544546
var expectedBase = path.join(__dirname, './out-fixtures/wow');
545-
var expectedDirMode = 0755;
546-
var expectedFileMode = 0655;
547+
var expectedDirMode = parseInt('755', 8);
548+
var expectedFileMode = parseInt('655', 8);
547549

548550
var firstFile = new File({
549551
base: inputBase,
@@ -565,7 +567,7 @@ describe('dest stream', function() {
565567
});
566568

567569
var buffered = [];
568-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
570+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
569571

570572
stream.pipe(bufferStream);
571573
stream.write(firstFile);
@@ -593,7 +595,7 @@ describe('dest stream', function() {
593595
});
594596

595597
var buffered = [];
596-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
598+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
597599

598600
stream.pipe(bufferStream);
599601
stream.write(firstFile);
@@ -625,7 +627,7 @@ describe('dest stream', function() {
625627
});
626628

627629
var buffered = [];
628-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
630+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
629631

630632
stream.pipe(bufferStream);
631633
stream.write(firstFile);
@@ -639,7 +641,7 @@ describe('dest stream', function() {
639641
var expectedContents = fs.readFileSync(inputPath);
640642
var expectedCwd = __dirname;
641643
var expectedBase = path.join(__dirname, './out-fixtures');
642-
var expectedMode = 0722;
644+
var expectedMode = parseInt('722', 8);
643645

644646
var expectedFile = new File({
645647
base: inputBase,
@@ -670,7 +672,7 @@ describe('dest stream', function() {
670672
var expectedContents = fs.readFileSync(inputPath);
671673
var expectedCwd = __dirname;
672674
var expectedBase = path.join(__dirname, './out-fixtures');
673-
var expectedMode = 0722;
675+
var expectedMode = parseInt('722', 8);
674676

675677
var expectedFile = new File({
676678
base: inputBase,
@@ -706,7 +708,7 @@ describe('dest stream', function() {
706708
var expectedContents = fs.readFileSync(inputPath);
707709
var expectedCwd = __dirname;
708710
var expectedBase = path.join(__dirname, './out-fixtures');
709-
var expectedMode = 0722;
711+
var expectedMode = parseInt('722', 8);
710712

711713
var expectedFile = new File({
712714
base: inputBase,
@@ -742,7 +744,7 @@ describe('dest stream', function() {
742744
var expectedContents = fs.readFileSync(inputPath);
743745
var expectedCwd = __dirname;
744746
var expectedBase = path.join(__dirname, './out-fixtures');
745-
var expectedMode = 0722;
747+
var expectedMode = parseInt('722', 8);
746748

747749
var expectedFile = new File({
748750
base: inputBase,
@@ -777,7 +779,7 @@ describe('dest stream', function() {
777779
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
778780

779781
var buffered = [];
780-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
782+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
781783

782784
stream.pipe(bufferStream);
783785
stream.write(expectedFile);
@@ -791,8 +793,8 @@ describe('dest stream', function() {
791793
var expectedContents = fs.readFileSync(inputPath);
792794
var expectedCwd = __dirname;
793795
var expectedBase = path.join(__dirname, './out-fixtures');
794-
var expectedMode = 03722;
795-
var normalMode = 0722;
796+
var expectedMode = parseInt('3722', 8);
797+
var normalMode = parseInt('722', 8);
796798

797799
var expectedFile = new File({
798800
base: inputBase,
@@ -826,7 +828,7 @@ describe('dest stream', function() {
826828
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
827829

828830
var buffered = [];
829-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
831+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
830832

831833
stream.pipe(bufferStream);
832834
stream.write(expectedFile);
@@ -862,7 +864,7 @@ describe('dest stream', function() {
862864
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname, overwrite: false});
863865

864866
var buffered = [];
865-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
867+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
866868
stream.pipe(bufferStream);
867869
stream.write(inputFile);
868870
stream.end();
@@ -897,7 +899,7 @@ describe('dest stream', function() {
897899
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname, overwrite: true});
898900

899901
var buffered = [];
900-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
902+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
901903
stream.pipe(bufferStream);
902904
stream.write(inputFile);
903905
stream.end();
@@ -932,7 +934,7 @@ describe('dest stream', function() {
932934
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname, overwrite: function() { return false; }});
933935

934936
var buffered = [];
935-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
937+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
936938
stream.pipe(bufferStream);
937939
stream.write(inputFile);
938940
stream.end();
@@ -967,7 +969,7 @@ describe('dest stream', function() {
967969
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname, overwrite: function() { return true; }});
968970

969971
var buffered = [];
970-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
972+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
971973
stream.pipe(bufferStream);
972974
stream.write(inputFile);
973975
stream.end();
@@ -1001,7 +1003,7 @@ describe('dest stream', function() {
10011003
var stream = vfs.dest('./out-fixtures/', {cwd: __dirname});
10021004

10031005
var buffered = [];
1004-
bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
1006+
var bufferStream = through.obj(dataWrap(buffered.push.bind(buffered)), onEnd);
10051007
stream.pipe(bufferStream);
10061008
stream.write(inputFile);
10071009
stream.end();

‎test/spy.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
var fs = require('fs');
24
var sinon = require('sinon');
35

0 commit comments

Comments
 (0)