Made import statement more generic, barebones coverage statistics aft…

…er experimenting with merging multiple runs using puppeteer-to-istanbul, nyc merge and jest

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.nyc_output
 node_modules
 coverage
 test/screenshots

.npmignore

@@ -4,4 +4,5 @@ src
 .travis.yml
 test
 coverage
-.map
+.map
+.nyc_output

jest.config.js

@@ -3,6 +3,7 @@
 module.exports = {
 
   "coveragePathIgnorePatterns": [
+    "<rootDir>/lib",
     "<rootDir>/test"
   ],
 

package.json

@@ -8,7 +8,7 @@
     "build:docs": "documentation build src/*.js --format md > API.md",
     "build": "npm run build:src && npm run build:docs",
     "start": "rollup --config --watch",
-    "coverage": "clear-folder coverage test/screenshots && jest --coverage",
+    "coverage": "clear-folder .nyc_output coverage test/screenshots && jest --coverage",
     "test": "clear-folder test/screenshots && jest"
   },
   "repository": {

test/e2e/_interaction.js → test/_spec_helper.js

@@ -1,3 +1,4 @@
+const chalk = require('chalk')
 
 let triggerEvent = async (page) => {
   await page.evaluate(_ => {
@@ -19,3 +20,15 @@ exports.scrollSecondInView = async (page) => {
   await page.$eval('.example:nth-child(2n)', elm => elm.scrollIntoView())
   triggerEvent(page)
 }
+
+exports.outputCoverageScores = (jsCoverage) => {
+  let coverageScore = []
+  for (const entry of jsCoverage) {
+	let entryBytes = 0
+	for (const range of entry.ranges) {
+	  entryBytes += range.end - range.start - 1
+	}
+	coverageScore.push(`Spec coverage for ${entry.url.split('/').pop()}: ${Math.round(entryBytes / entry.text.length * 10000)/100}%`)
+  }
+  console.log(chalk.blue.bold(coverageScore.join('\n')))
+}

test/e2e/classes.test.js → test/spec/classes.test.js

@@ -1,14 +1,18 @@
 const server = require('../../lib/static-server')
-const interaction = require('./_interaction')
+const interaction = require('../_spec_helper.js')
 const triggerEvent = interaction.triggerEvent
 const scrollDown = interaction.scrollDown
 const scrollSecondInView = interaction.scrollSecondInView
+const outputCoverageScores = interaction.outputCoverageScores
 
 describe(
   'Basic relations between classes',
   () => {
     beforeAll(async () => {
       await server.start()
+      await Promise.all([
+        page.coverage.startJSCoverage(),
+      ])
       await page.goto(`http://localhost:${server.port}/test/basic.html`)
       await page.waitForSelector('footer')
     })
@@ -17,8 +21,12 @@ describe(
       await page.click('button#reset')
     })
 
-    afterAll(() => {
-      server.stop()
+    afterAll(async () => {
+      await server.stop()
+      const [jsCoverage] = await Promise.all([
+        page.coverage.stopJSCoverage(),
+      ])
+      outputCoverageScores(jsCoverage)
     })
 
 

test/e2e/collection.test.js → test/spec/collection.test.js

@@ -1,11 +1,16 @@
 const server = require('../../lib/static-server')
-const triggerEvent = require('./_interaction').triggerEvent
+const interaction = require('../_spec_helper.js')
+const triggerEvent = interaction.triggerEvent
+const outputCoverageScores = interaction.outputCoverageScores
 
 describe(
   'Basic collection methods',
   () => {
     beforeAll(async () => {
       await server.start()
+      await Promise.all([
+        page.coverage.startJSCoverage(),
+      ])
       await page.goto(`http://localhost:${server.port}/test/basic.html`)
       await page.waitForSelector('footer')
     })
@@ -14,8 +19,12 @@ describe(
       await page.click('button#reset')
     })
 
-    afterAll(() => {
-      server.stop()
+    afterAll(async () => {
+      await server.stop()
+      const [jsCoverage] = await Promise.all([
+        page.coverage.stopJSCoverage(),
+      ])
+      outputCoverageScores(jsCoverage)
     })
 
 

test/unit/api.test.js

@@ -5,7 +5,7 @@
 import {
   onScreenness,
   onScreenTest
-} from '../../src/onScreenness';
+} from '../../src/onScreenness.js';
 
 
 describe('The API manages queryLists', function () {

test/unit/calculate.test.js

@@ -5,7 +5,7 @@
 import {
   onScreenness,
   onScreenTest
-} from '../../src/onScreenness';
+} from '../../src/onScreenness.js';
 
 
 describe('calculatePresence calculates presence by a bounding rectangle', function () {

test/unit/core.test.js

@@ -5,7 +5,7 @@
 import {
   onScreenness,
   onScreenTest
-} from '../../src/onScreenness';
+} from '../../src/onScreenness.js';
 
 
 describe('The eventHandlers deal with live nodeLists', function () {

test/unit/utilities.test.js

@@ -6,7 +6,7 @@ import {
   commaSeperatedListToArray,
   queryToArray,
   roundAt
-} from '../../src/utilities';
+} from '../../src/utilities.js';
 
 
 test('roundAt rounds 1.005 to 1.01', () => {