Update: Reach 100% code coverage

Author: phated

mkdirp.js

@@ -4,6 +4,7 @@ var path = require('path');
 
 var fs = require('graceful-fs');
 
+var MASK_MODE = parseInt('7777', 8);
 var DEFAULT_DIR_MODE = parseInt('0777', 8);
 
 function mkdirp(dirpath, customMode, callback) {
@@ -45,7 +46,8 @@ function mkdirp(dirpath, customMode, callback) {
         return callback(mkdirErr);
       }
 
-      if (stats.mode === mode) {
+      // TODO: Is it proper to mask like this?
+      if ((stats.mode & MASK_MODE) === mode) {
         return callback();
       }
 

test/index.js

@@ -165,4 +165,27 @@ describe('mkdirpStream', function() {
     ], done);
   });
 
+  it('bubbles mkdir errors', function(done) {
+
+    expect.spyOn(fs, 'mkdir').andCall(function(dirpath, mode, cb) {
+      cb(new Error('boom'));
+    });
+
+    function notExists() {
+      statMode(outputDirpath);
+    }
+
+    function assert(err) {
+      expect(err).toExist();
+      expect(notExists).toThrow();
+      done();
+    }
+
+    pipe([
+      from(['test']),
+      mkdirpStream(outputDirpath),
+      concat(),
+    ], assert);
+  });
+
 });

test/mkdirp.js

@@ -262,4 +262,57 @@ describe('mkdirp', function() {
       });
     });
   });
+
+  it('surfaces mkdir errors that happening during recursion', function(done) {
+
+    var ogMkdir = fs.mkdir;
+
+    var spy = expect.spyOn(fs, 'mkdir').andCall(function(dirpath, mode, cb) {
+      if (spy.calls.length === 1) {
+        return ogMkdir(dirpath, mode, cb);
+      }
+      cb(new Error('boom'));
+    });
+
+    mkdirp(outputNestedDirpath, function(err) {
+      expect(err).toExist();
+
+      done();
+    });
+  });
+
+  it('surfaces fs.stat errors', function(done) {
+
+    expect.spyOn(fs, 'stat').andCall(function(dirpath, cb) {
+      cb(new Error('boom'));
+    });
+
+    mkdirp(outputDirpath, function(err) {
+      expect(err).toExist();
+
+      done();
+    });
+  });
+
+  it('does not attempt fs.chmod if custom mode matches mode on disk', function(done) {
+    if (isWindows) {
+      this.skip();
+      return;
+    }
+
+    var mode = applyUmask('700');
+
+    mkdirp(outputDirpath, mode, function(err) {
+      expect(err).toNotExist();
+
+      var spy = expect.spyOn(fs, 'chmod').andCallThrough();
+
+      mkdirp(outputDirpath, mode, function(err) {
+        expect(err).toNotExist();
+        expect(spy.calls.length).toEqual(0);
+
+        done();
+      });
+    });
+  });
 });