Merge pull request #11 from binki/fix-cleanup-call

Call cleanup correctly (without arguments).
benjamingr · Jan 2, 2017 · 25e8046 · 25e8046
2 parents 2a404d8 + 04536f6
commit 25e8046
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -21,7 +21,12 @@ module.exports.withFile = function withFile(fn) {
     cleanup = o.cleanup;
     delete o.cleanup;
     return fn(o);
-  }).finally(cleanup);
+  }).finally(function () {
+    // May not pass any arguments to cleanup() or it fails.
+    if (cleanup) {
+      cleanup();
+    }
+  });
 };
 
 
@@ -44,7 +49,12 @@ module.exports.withDir = function withDir(fn) {
     cleanup = o.cleanup;
     delete o.cleanup;
     return fn(o);
-  }).finally(cleanup);
+  }).finally(function () {
+    // May not pass any arguments to cleanup() or it fails.
+    if (cleanup) {
+      cleanup();
+    }
+  });
 };