[Issue #5] Fix skipped cases effect to total count

mhalitk · Jan 6, 2017 · 366dbc6 · 366dbc6
1 parent 6afe3c4
commit 366dbc6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/src/index.js b/src/index.js
@@ -306,6 +306,7 @@ function success(testCase) {
 }
 
 function skip(testOrCase) {
+  totalCount++;
   skipCount++;
   skipNextEnabled = false;
   /**

diff --git a/test/eventtest.js b/test/eventtest.js
@@ -1,3 +1,4 @@
+/** globals salep */
 var testResult = true;
 
 require("../src/index.js");
@@ -82,11 +83,11 @@ shouldTestStartEventCount++;
 
 var result = salep.stop();
 
-if (caseStartEventCount !== shouldCaseStartEventCount ||
-    failEventCount !== shouldFailEventCount ||
-    skipEventCount !== shouldSkipEventCount ||
-    successEventCount !== shouldSuccessEventCount ||
-    testStartEventCount !== shouldTestStartEventCount ||
+if (caseStartEventCount   !== shouldCaseStartEventCount ||
+    failEventCount        !== shouldFailEventCount ||
+    skipEventCount        !== shouldSkipEventCount ||
+    successEventCount     !== shouldSuccessEventCount ||
+    testStartEventCount   !== shouldTestStartEventCount ||
     disabledCallbackCount !== shouldDisabledCallbackCount) {
   testResult = false;
 }

diff --git a/test/failtest.js b/test/failtest.js
@@ -1,8 +1,10 @@
+/** globals salep */
 require("../src/index.js");
 
 var shouldFailCount = 0;
 var shouldSkipCount = 0;
 var shouldSuccessCount = 0;
+var shouldTotalCount = 0;
 
 salep.test("A test without any case", function() {
 
@@ -13,33 +15,39 @@ salep.test("A test with failing cases", function() {
     throw "Fail 1";
   });
   shouldFailCount++;
+  shouldTotalCount++;
 
   this.case("Fail case 2", function() {
     throw "Fail 2";
   });
   shouldFailCount++;
+  shouldTotalCount++;
 
   this.case("Success cases shouldn't increment fail count", function() {
     // empty means success
   });
   shouldSuccessCount++;
+  shouldTotalCount++;
 });
 
 salep.case("A salep case to fail", function() {
   throw "Fail 3";
 });
 shouldFailCount++;
+shouldTotalCount++;
 
 salep.case("A successful salep case", function() {
   // empty
 });
 shouldSuccessCount++;
+shouldTotalCount++;
 
 var result = salep.stop();
 
-if (result.skip === 0 &&
-  result.fail === shouldFailCount &&
-  result.success === shouldSuccessCount) {
+if (result.skip     === shouldSkipCount     &&
+    result.fail     === shouldFailCount     &&
+    result.success  === shouldSuccessCount  &&
+    result.total    === shouldTotalCount) {
   exports.success = true;
 } else {
   exports.success = false;

diff --git a/test/skiptest.js b/test/skiptest.js
@@ -1,9 +1,10 @@
+/** globals salep */
 require("../src/index.js");
 
 var shouldSkipCount = 0;
 var shouldFailCount = 0;
 var shouldSuccessCount = 0;
-var totalCount = 0;
+var shouldTotalCount = 0;
 
 // Skipping salep 
 salep.skipNext();
@@ -21,24 +22,28 @@ salep.test("should skip this test", function() {
   });
 });
 shouldSkipCount++;
+shouldTotalCount++
 
 // Skipping salep cases
 salep.skipNext();
 salep.case("should skip this case and count it as skipped", function() {
   throw "This exception shouldn't affect skip status";
 });
 shouldSkipCount++;
+shouldTotalCount++;
 
 salep.case("this shouldn't skip", function() {
   // empty
 });
 shouldSuccessCount++;
+shouldTotalCount++;
 
 var result = salep.getResults();
 
-if (result.skip === shouldSkipCount &&
-  result.fail === shouldFailCount &&
-  result.success === shouldSuccessCount) {
+if (result.skip     === shouldSkipCount &&
+    result.fail     === shouldFailCount &&
+    result.success  === shouldSuccessCount &&
+    result.total    === shouldTotalCount) {
   exports.success = true;
 } else {
   exports.success = false;