Merge pull request #225 from rvagg/cleanup-guards

guards for no `this.*` properties in cleanup
workshopper · Feb 18, 2015 · fe1c2b0 · fe1c2b0
2 parents 89deb38 + 351b011
commit fe1c2b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/exercises/http_client/exercise.js b/exercises/http_client/exercise.js
@@ -49,6 +49,9 @@ exercise.addSetup(function (mode, callback) {
 exercise.addCleanup(function (mode, passed, callback) {
   // mode == 'run' || 'verify'
 
+  if (!this.server)
+    return process.nextTick(callback)
+
   this.server.close(callback)
 })
 

diff --git a/exercises/juggling_async/exercise.js b/exercises/juggling_async/exercise.js
@@ -82,6 +82,9 @@ exercise.addSetup(function (mode, callback) {
 exercise.addCleanup(function (mode, passed, callback) {
   // mode == 'run' || 'verify'
 
+  if (!this.servers)
+    return process.nextTick(callback)
+
   // close all 3 servers
   var done = after(3, callback)
   this.servers.forEach(function (s) {