nodejs
diff --git a/Collapse file
‎lib/fs.js‎
Copy file name to clipboardExpand all lines: lib/fs.js
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎lib/fs.js‎
Copy file name to clipboardExpand all lines: lib/fs.js
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎test/parallel/test-fs-mkdtemp.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-fs-mkdtemp.js
+14-7Lines changed: 14 additions & 7 deletions b/Collapse file
‎test/parallel/test-fs-mkdtemp.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-fs-mkdtemp.js
+14-7Lines changed: 14 additions & 7 deletions
@@ -1590,8 +1590,7 @@ fs.realpath = function realpath(path, options, callback) {
 };
 
 
-fs.mkdtemp = function(prefix, options, callback_) {
-  var callback = maybeCallback(callback_);
+fs.mkdtemp = function(prefix, options, callback) {
   if (!prefix || typeof prefix !== 'string')
     throw new TypeError('filename prefix is required');
 
@@ -1605,6 +1604,7 @@ fs.mkdtemp = function(prefix, options, callback_) {
   if (typeof options !== 'object')
     throw new TypeError('"options" must be a string or an object');
 
+  callback = makeCallback(callback);
   if (!nullCheck(prefix, callback)) {
     return;
   }
 
@@ -18,12 +18,19 @@ assert.equal(Buffer.byteLength(path.basename(utf8)),
              Buffer.byteLength('\u0222abc.XXXXXX'));
 assert(common.fileExists(utf8));
 
-fs.mkdtemp(
-    path.join(common.tmpDir, 'bar.'),
-    common.mustCall(function(err, folder) {
-      assert.ifError(err);
-      assert(common.fileExists(folder));
-    })
-);
+function handler(err, folder) {
+  assert.ifError(err);
+  assert(common.fileExists(folder));
+  assert.strictEqual(this, null);
+}
 
+fs.mkdtemp(path.join(common.tmpDir, 'bar.'), common.mustCall(handler));
+
+// Same test as above, but making sure that passing an options object doesn't
+// affect the way the callback function is handled.
+fs.mkdtemp(path.join(common.tmpDir, 'bar.'), {}, common.mustCall(handler));
+
+// Making sure that not passing a callback doesn't crash, as a default function
+// is passed internally.
 assert.doesNotThrow(() => fs.mkdtemp(path.join(common.tmpDir, 'bar-')));
+assert.doesNotThrow(() => fs.mkdtemp(path.join(common.tmpDir, 'bar-'), {}));