Fix nightwatchjs#574 should run afterEach with testcase cli option

Author: Stephanie Madison

lib/runner/testsuite.js

@@ -107,18 +107,22 @@ TestSuite.prototype.initAfterEachHook = function() {
   var key = 'afterEach';
   var hookFn;
   var index = self.testResults.steps.indexOf(key);
-  if (index === -1) {
+
+  if (!module[key]) {
     // backwards compatibility
     key = 'tearDown';
     index = self.testResults.steps.indexOf(key);
   }
 
-  if (index === -1) {
-    hookFn = function() {};
-  } else {
+  if (module[key]) {
     hookFn = module[key];
-    self.testResults.steps.splice(index, 1);
-    self.module.removeKey(key);
+    if (index > -1) {
+      // not running with --testcase
+      self.testResults.steps.splice(index, 1);
+      self.module.removeKey(key);
+    }
+  } else {
+    hookFn = function() {};
   }
 
   var expectedArgs = hookFn.length;

tests/src/runner/testRunner.js

@@ -605,6 +605,32 @@ module.exports = {
     });
   },
 
+  testRunTestCaseWithBeforeAndAfter : function(test) {
+    var testsPath = path.join(process.cwd(), '/sampletests/before-after/syncBeforeAndAfter.js');
+    test.expect(11);
+    this.Runner.run([testsPath], {
+      seleniumPort : 10195,
+      silent : true,
+      output : false,
+      globals : {
+        test : test
+      }
+    }, {
+      output_folder : false,
+      start_session : true,
+      testcase : 'demoTestSyncOne'
+    }, function(err, results) {
+      test.equals(err, null);
+      var result = results.modules.syncBeforeAndAfter.completed;
+      test.ok('demoTestSyncOne' in result);
+      test.ok(!('beforeEach' in result));
+      test.ok(!('before' in result));
+      test.ok(!('afterEach' in result));
+      test.ok(!('after' in result));
+      test.done();
+    });
+  },
+
   testRunTestcaseInvalid : function(test) {
     var testsPath = path.join(process.cwd(), '/sampletests/before-after/syncBeforeAndAfter.js');