1 files changed, 80 insertions, 5 deletions

diff --git a/node_modules/tmp/test/base.js b/node_modules/tmp/test/base.js
index 498d8fb3b..a77f3a566 100644
--- a/node_modules/tmp/test/base.js
+++ b/node_modules/tmp/test/base.js
@@ -1,7 +1,12 @@
 var
   assert = require('assert'),
   path   = require('path'),
-  exec   = require('child_process').exec;
+  exec   = require('child_process').exec,
+  tmp    = require('../lib/tmp');
+
+// make sure that we do not test spam the global tmp
+tmp.TMP_DIR = './tmp';
+
 
 function _spawnTestWithError(testFile, params, cb) {
   _spawnTest(true, testFile, params, cb);
@@ -13,7 +18,6 @@ function _spawnTestWithoutError(testFile, params, cb) {
 
 function _spawnTest(passError, testFile, params, cb) {
   var
-    filename,
     node_path = process.argv[0],
     command = [ node_path, path.join(__dirname, testFile) ].concat(params).join(' ');
 
@@ -37,38 +41,109 @@ function _testStat(stat, mode) {
 }
 
 function _testPrefix(prefix) {
-  return function _testPrefixGenerated(err, name, fd) {
+  return function _testPrefixGenerated(err, name) {
     assert.equal(path.basename(name).slice(0, prefix.length), prefix, 'should have the provided prefix');
   };
 }
 
+function _testPrefixSync(prefix) {
+  return function _testPrefixGeneratedSync(result) {
+    if (result instanceof Error) {
+      throw result;
+    }
+    _testPrefix(prefix)(null, result.name, result.fd);
+  };
+}
+
 function _testPostfix(postfix) {
-  return function _testPostfixGenerated(err, name, fd) {
+  return function _testPostfixGenerated(err, name) {
     assert.equal(name.slice(name.length - postfix.length, name.length), postfix, 'should have the provided postfix');
   };
 }
 
+function _testPostfixSync(postfix) {
+  return function _testPostfixGeneratedSync(result) {
+    if (result instanceof Error) {
+      throw result;
+    }
+    _testPostfix(postfix)(null, result.name, result.fd);
+  };
+}
+
 function _testKeep(type, keep, cb) {
   _spawnTestWithError('keep.js', [ type, keep ], cb);
 }
 
+function _testKeepSync(type, keep, cb) {
+  _spawnTestWithError('keep-sync.js', [ type, keep ], cb);
+}
+
 function _testGraceful(type, graceful, cb) {
   _spawnTestWithoutError('graceful.js', [ type, graceful ], cb);
 }
 
+function _testGracefulSync(type, graceful, cb) {
+  _spawnTestWithoutError('graceful-sync.js', [ type, graceful ], cb);
+}
+
 function _assertName(err, name) {
   assert.isString(name);
-  assert.isNotZero(name.length);
+  assert.isNotZero(name.length, 'an empty string is not a valid name');
+}
+
+function _assertNameSync(result) {
+  if (result instanceof Error) {
+    throw result;
+  }
+  var name = typeof(result) == 'string' ? result : result.name;
+  _assertName(null, name);
+}
+
+function _testName(expected){
+  return function _testNameGenerated(err, name) {
+    assert.equal(expected, name, 'should have the provided name');
+  };
+}
+
+function _testNameSync(expected){
+  return function _testNameGeneratedSync(result) {
+    if (result instanceof Error) {
+      throw result;
+    }
+    _testName(expected)(null, result.name, result.fd);
+  };
 }
 
 function _testUnsafeCleanup(unsafe, cb) {
   _spawnTestWithoutError('unsafe.js', [ 'dir', unsafe ], cb);
 }
 
+function _testIssue62(cb) {
+  _spawnTestWithoutError('issue62.js', [], cb);
+}
+
+function _testUnsafeCleanupSync(unsafe, cb) {
+  _spawnTestWithoutError('unsafe-sync.js', [ 'dir', unsafe ], cb);
+}
+
+function _testIssue62Sync(cb) {
+  _spawnTestWithoutError('issue62-sync.js', [], cb);
+}
+
 module.exports.testStat = _testStat;
 module.exports.testPrefix = _testPrefix;
+module.exports.testPrefixSync = _testPrefixSync;
 module.exports.testPostfix = _testPostfix;
+module.exports.testPostfixSync = _testPostfixSync;
 module.exports.testKeep = _testKeep;
+module.exports.testKeepSync = _testKeepSync;
 module.exports.testGraceful = _testGraceful;
+module.exports.testGracefulSync = _testGracefulSync;
 module.exports.assertName = _assertName;
+module.exports.assertNameSync = _assertNameSync;
+module.exports.testName = _testName;
+module.exports.testNameSync = _testNameSync;
 module.exports.testUnsafeCleanup = _testUnsafeCleanup;
+module.exports.testIssue62 = _testIssue62;
+module.exports.testUnsafeCleanupSync = _testUnsafeCleanupSync;
+module.exports.testIssue62Sync = _testIssue62Sync;