GPII-2773: Update coverage client and test fixtures to address incons…

…istent test reporting.

package.json

@@ -20,7 +20,10 @@
     "main": "./src/module/fluid.js",
     "scripts": {
         "prepublish": "npm run buildDists && npm run buildStylus",
-        "pretest": "node node_modules/rimraf/bin.js reports/* coverage/*",
+        "pretest": "npm run pretest:cleanup && npm run pretest:instrument && npm run pretest:postInstrument",
+        "pretest:cleanup": "node node_modules/rimraf/bin.js reports/* coverage/* instrumented/*",
+        "pretest:instrument": "node node_modules/istanbul/lib/cli.js instrument --complete-copy src --output instrumented/src",
+        "pretest:postInstrument": "node node_modules/.bin/rimraf instrumented/src/lib && node node_modules/.bin/ncp src/lib instrumented/src/lib",
         "test": "npm run test:browser && npm run test:node",
         "test:browser": "node node_modules/testem/testem.js ci --file tests/testem.js",
         "test:node": "node node_modules/istanbul/lib/cli.js cover tests/node-tests/basic-node-tests.js --report none --print none",
@@ -40,7 +43,7 @@
     "devDependencies": {
         "eslint-config-fluid": "1.2.0",
         "fluid-grunt-eslint": "18.1.2",
-        "gpii-testem": "1.0.2-dev.20171120T141143Z.86d40cd",
+        "gpii-testem": "1.0.3-dev.20171215T151816Z.7d9350d",
         "grunt": "1.0.1",
         "grunt-contrib-clean": "1.1.0",
         "grunt-contrib-compress": "1.4.3",
@@ -54,6 +57,7 @@
         "grunt-shell": "2.1.0",
         "istanbul": "git://github.com/the-t-in-rtf/istanbul#828eb930add7bd663ca20649a917f3f3829e48c5",
         "lodash": "4.17.4",
+        "ncp": "2.0.0",
         "rimraf": "2.6.2",
         "testem": "1.18.4"
     }

tests/all-tests.html

@@ -13,64 +13,63 @@
     <link rel="stylesheet" href="lib/qunit/addons/composite/qunit-composite.css">
     <script src="lib/qunit/js/qunit.js"></script>
 
-    <script src="lib/qunit/addons/composite/qunit-composite.js"></script>
-
-    <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
     <script src="/testem.js"></script>
-    <script src="/coverage/client/coverageSender.js"></script>
+
+    <script src="lib/qunit/addons/composite/qunit-composite.js"></script>
 
     <!--
         command line search:
-        find . -name "*-test.html" | awk '{print "\""$1"\","}'
+        find . -name "*-test.html" | awk '{print "\""$1"\","}' | sort
     -->
     <script>
     QUnit.testSuites("Framework Tests", [
+        "./framework-tests/core/html/Caching-test.html",
+        "./framework-tests/core/html/DataBinding-test.html",
+        "./framework-tests/core/html/FluidDebugging-test.html",
+        "./framework-tests/core/html/FluidDocument-test.html",
+        "./framework-tests/core/html/FluidIoC-test.html",
+        "./framework-tests/core/html/FluidIoCStandalone-test.html",
+        "./framework-tests/core/html/FluidIoCView-test.html",
         "./framework-tests/core/html/FluidJS-test.html",
         "./framework-tests/core/html/FluidJSStandalone-test.html",
-        "./framework-tests/core/html/FluidDebugging-test.html",
         "./framework-tests/core/html/FluidPromises-test.html",
-        "./framework-tests/core/html/FluidDocument-test.html",
+        "./framework-tests/core/html/FluidRequests-test.html",
+        "./framework-tests/core/html/FluidView-test.html",
         "./framework-tests/core/html/Keyboard-a11y-test.html",
         "./framework-tests/core/html/ModelTransformation-test.html",
-        "./framework-tests/core/html/DataBinding-test.html",
-        "./framework-tests/core/html/FluidView-test.html",
-        "./framework-tests/core/html/Caching-test.html",
-        "./framework-tests/core/html/FluidRequests-test.html",
         "./framework-tests/core/html/ResourceLoader-test.html",
-        "./framework-tests/renderer/html/Renderer-test.html",
-        "./framework-tests/core/html/FluidIoC-test.html",
-        "./framework-tests/core/html/FluidIoCStandalone-test.html",
-        "./framework-tests/core/html/FluidIoCView-test.html",
         "./framework-tests/core/html/WebWorker-test.html",
         "./framework-tests/enhancement/html/ContextAwareness-test.html",
-        "./framework-tests/renderer/html/RendererUtilities-test.html",
         "./framework-tests/preferences/html/AuxBuilder-test.html",
         "./framework-tests/preferences/html/Builder-test.html",
         "./framework-tests/preferences/html/Enactors-test.html",
-        "./framework-tests/preferences/html/SelfVoicingEnactor-test.html",
-        "./framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html",
-        "./framework-tests/preferences/html/SeparatedPanelPrefsEditorResponsive-test.html",
         "./framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html",
         "./framework-tests/preferences/html/FullPreviewPrefsEditor-test.html",
         "./framework-tests/preferences/html/PageEnhancer-test.html",
         "./framework-tests/preferences/html/Panels-test.html",
-        "./framework-tests/preferences/html/SelfVoicingPanel-test.html",
+        "./framework-tests/preferences/html/PrefsEditor-test.html",
         "./framework-tests/preferences/html/PrimaryBuilder-test.html",
+        "./framework-tests/preferences/html/SelfVoicingEnactor-test.html",
+        "./framework-tests/preferences/html/SelfVoicingPanel-test.html",
+        "./framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html",
+        "./framework-tests/preferences/html/SeparatedPanelPrefsEditorResponsive-test.html",
         "./framework-tests/preferences/html/Store-test.html",
         "./framework-tests/preferences/html/UIEnhancer-test.html",
-        "./framework-tests/preferences/html/PrefsEditor-test.html",
-        "./framework-tests/preferences/html/URLUtilities-test.html"
+        "./framework-tests/preferences/html/URLUtilities-test.html",
+        "./framework-tests/renderer/html/Renderer-test.html",
+        "./framework-tests/renderer/html/RendererUtilities-test.html"
     ]);
     QUnit.testSuites("Testing Framework Tests", [
-        "./test-core/testTests/html/jqUnit-test.html",
+        "./test-core/testTests/html/ConditionalTestUtils-test.html",
         "./test-core/testTests/html/IoCTesting-test.html",
         "./test-core/testTests/html/IoCTestingView-test.html",
-        "./test-core/testTests/html/ConditionalTestUtils-test.html"
+        "./test-core/testTests/html/jqUnit-test.html"
     ]);
     QUnit.testSuites("Component Tests", [
         "./component-tests/inlineEdit/html/InlineEdit-test.html",
-        "./component-tests/pager/html/Pager-test.html",
+        "./component-tests/overviewPanel/html/OverviewPanel-test.html",
         "./component-tests/pager/html/PagedTable-test.html",
+        "./component-tests/pager/html/Pager-test.html",
         "./component-tests/progress/html/Progress-test.html",
         "./component-tests/reorderer/html/AriaLabeller-test.html",
         "./component-tests/reorderer/html/GeometricManager-test.html",
@@ -79,14 +78,14 @@
         "./component-tests/reorderer/html/NestedReorderer-test.html",
         "./component-tests/reorderer/html/ReorderList-test.html",
         "./component-tests/reorderer/html/Scheduler-test.html",
-        "./component-tests/tableOfContents/html/TableOfContents-test.html",
         "./component-tests/slidingPanel/html/SlidingPanel-test.html",
         "./component-tests/switch/html/Switch-test.html",
+        "./component-tests/tableOfContents/html/TableOfContents-test.html",
+        "./component-tests/tabs/html/Tabs-test.html",
+        "./component-tests/textToSpeech/html/TextToSpeech-test.html",
         "./component-tests/textfieldControl/html/Textfield-test.html",
         "./component-tests/textfieldControl/html/TextfieldSlider-test.html",
         "./component-tests/textfieldControl/html/TextfieldStepper-test.html",
-        "./component-tests/textToSpeech/html/TextToSpeech-test.html",
-        "./component-tests/tabs/html/Tabs-test.html",
         "./component-tests/tooltip/html/Tooltip-test.html",
         "./component-tests/uiOptions/html/UIOptions-test.html",
         "./component-tests/uploader/html/DemoUploadManager-test.html",
@@ -95,8 +94,7 @@
         "./component-tests/uploader/html/FileQueueView-test.html",
         "./component-tests/uploader/html/HTML5UploaderSupport-test.html",
         "./component-tests/uploader/html/Uploader-test.html",
-        "./component-tests/uploader/html/UploaderCompatibility-test.html",
-        "./component-tests/overviewPanel/html/OverviewPanel-test.html"
+        "./component-tests/uploader/html/UploaderCompatibility-test.html"
     ]);
     </script>
 </head>

tests/component-tests/inlineEdit/html/InlineEdit-test.html

@@ -34,7 +34,6 @@
         <script src="../../../lib/jquery-ui/js/jquery.simulate.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/overviewPanel/html/OverviewPanel-test.html

@@ -28,7 +28,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/pager/html/PagedTable-test.html

@@ -36,7 +36,6 @@
     <script src="../../../test-core/utils/js/IoCTestUtils.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are used for tests that have been written using this page as data -->

tests/component-tests/pager/html/Pager-test.html

@@ -31,7 +31,6 @@
     <script src="../../../lib/jquery-ui/js/jquery.simulate.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are used for tests that have been written using this page as data -->

tests/component-tests/progress/html/Progress-test.html

@@ -22,7 +22,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/reorderer/html/AriaLabeller-test.html

@@ -32,7 +32,6 @@
         <script src="../../../component-tests/reorderer/js/ReordererTestUtils.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <script src="../js/AriaLabellerTests.js"></script>

tests/component-tests/reorderer/html/GeometricManager-test.html

@@ -21,7 +21,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are tests that have been written using this page as data -->

tests/component-tests/reorderer/html/ImageReorderer-test.html

@@ -40,7 +40,6 @@
     <script src="../js/ReordererTestUtils.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are the tests -->

tests/component-tests/reorderer/html/LayoutReorderer-test.html

@@ -29,7 +29,6 @@
     <script src="../../../lib/jquery-ui/js/jquery.simulate.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are used for tests that have been written using this page as data -->

tests/component-tests/reorderer/html/NestedReorderer-test.html

@@ -28,7 +28,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are used for tests that have been written using this page as data -->

tests/component-tests/reorderer/html/ReorderList-test.html

@@ -28,7 +28,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <!--  These are used for tests that have been written using this page as data -->

tests/component-tests/reorderer/html/Scheduler-test.html

@@ -26,8 +26,7 @@
       <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
       <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-      <script src="/testem.js"></script>
-      <script src="/coverage/client/coverageSender.js"></script>
+        <script src="/coverage/client/coverageSender.js"></script>
 
       <!--  These are used for tests that have been written using this page as sample data. -->
       <script src="../js/SchedulerTests.js"></script>

tests/component-tests/slidingPanel/html/SlidingPanel-test.html

@@ -26,7 +26,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/switch/html/Switch-test.html

@@ -22,7 +22,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/tableOfContents/html/TableOfContents-test.html

@@ -28,7 +28,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/tabs/html/Tabs-test.html

@@ -23,7 +23,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/textToSpeech/html/TextToSpeech-test.html

@@ -32,7 +32,6 @@
         <script src="../../../test-core/utils/js/ConditionalTestUtils.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/textfieldControl/html/Textfield-test.html

@@ -27,7 +27,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/textfieldControl/html/TextfieldSlider-test.html

@@ -28,7 +28,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/textfieldControl/html/TextfieldStepper-test.html

@@ -32,7 +32,6 @@
         <script src="../../../test-core/utils/js/IoCTestUtils.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data -->

tests/component-tests/tooltip/html/Tooltip-test.html

@@ -26,7 +26,6 @@
         <script src="../../../test-core/utils/js/IoCTestUtils.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/uiOptions/html/UIOptions-test.html

@@ -51,7 +51,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <!--  These are tests that have been written using this page as data and test supports -->

tests/component-tests/uploader/all-tests.html

@@ -9,7 +9,6 @@
     <script src="../../lib/qunit/js/qunit.js"></script>
     <script src="../../lib/qunit/addons/composite/qunit-composite.js"></script>
 
-    <script src="/testem.js"></script>
 
     <!--
         command line search:

tests/component-tests/uploader/html/DemoUploadManager-test.html

@@ -31,7 +31,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <script src="../js/DemoUploadManagerTests.js"></script>

tests/component-tests/uploader/html/ErrorPanel-test.html

@@ -23,7 +23,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <script src="../js/ErrorPanelTests.js"></script>

tests/component-tests/uploader/html/FileQueue-test.html

@@ -22,7 +22,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <script src="../js/FileQueueTests.js"></script>

tests/component-tests/uploader/html/FileQueueView-test.html

@@ -33,7 +33,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <script src="../js/FileQueueViewTests.js"></script>

tests/component-tests/uploader/html/HTML5UploaderSupport-test.html

@@ -32,7 +32,6 @@
     <script src="../../../test-core/utils/js/IoCTestUtils.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <script src="../js/UploaderTestUtilities.js"></script>

tests/component-tests/uploader/html/Uploader-test.html

@@ -33,7 +33,6 @@
         <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
         <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-        <script src="/testem.js"></script>
         <script src="/coverage/client/coverageSender.js"></script>
 
         <script src="../js/UploaderTestUtilities.js"></script>

tests/component-tests/uploader/html/UploaderCompatibility-test.html

@@ -36,7 +36,6 @@
     <script src="../../../test-core/jqUnit/js/jqUnit.js"></script>
 
     <!-- Required to ensure we sent coverage data at the end of the test run on this page -->
-    <script src="/testem.js"></script>
     <script src="/coverage/client/coverageSender.js"></script>
 
     <script src="../js/UploaderCompatibilityTests.js"></script>