Merge branch 'master' of github.com:hapijs/lab

Merge
hapijs · Aug 15, 2016 · 8e4bdba · 8e4bdba
2 parents c37b43b + 362fc39
commit 8e4bdba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/coverage.js b/lib/coverage.js
@@ -109,7 +109,11 @@ internals.instrument = function (filename) {
 
         // Coverage status
 
-        if (bypass[node.range[0]] && bypass[node.range[1]]) {
+        const bypassTests = [];
+        for (let i = node.range[0]; i <= node.range[1]; ++i) {
+            bypassTests.push(bypass[i]);
+        }
+        if (bypassTests.every((test) => test)) {
             return;
         }
 

diff --git a/test/coverage.js b/test/coverage.js
@@ -147,9 +147,9 @@ describe('Coverage', () => {
 
         const cov = Lab.coverage.analyze({ coveragePath: Path.join(__dirname, 'coverage/bypass-misses') });
         expect(Math.floor(cov.percent)).to.equal(93);
-        expect(cov.sloc).to.equal(15);
+        expect(cov.sloc).to.equal(16);
         expect(cov.misses).to.equal(1);
-        expect(cov.hits).to.equal(14);
+        expect(cov.hits).to.equal(15);
         done();
     });
 

diff --git a/test/coverage/bypass-misses.js b/test/coverage/bypass-misses.js
@@ -19,8 +19,9 @@ const /*$lab:coverage:on$*/FiveMath = function () {
     this.subtractFive = function (value) {
 
       return value - 5;
-    };
+    };/*$lab:coverage:off$*/
 };
+/*$lab:coverage:on$*/
 
 const fiveMath = new FiveMath();