From e027a46d71943682e1137712a782a7fae478935c Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Tue, 22 Aug 2017 15:57:43 -0400
Subject: [PATCH 1/2] Add missing CLI help for test/test-packages
 --driver-package (#9035)

---
 tools/cli/help.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index d397e731c7b..88dd7c735e2 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -584,6 +584,10 @@ Options:
                     test app rebuild.
   --extra-packages  Run with additional packages (comma separated, for example:
                     --extra-packages "package-name1, package-name2@1.2.3")
+  --driver-package  Name of the optional test driver package to use to run
+                    tests and display results. For example:
+                    --driver-package practicalmeteor:mocha
+
 >>> test
 Test the application
 Usage: meteor test --driver-package <driver> [options]
@@ -638,6 +642,9 @@ Options:
   --verbose         Print all output from builds logs.
   --extra-packages  Run with additional packages (comma separated, for example:
                     --extra-packages "package-name1, package-name2@1.2.3")
+  --driver-package  Name of the optional test driver package to use to run
+                    tests and display results. For example:
+                    --driver-package practicalmeteor:mocha
 
 >>> self-test
 Run tests of the 'meteor' tool.

From cd5405437c3050fa05648723da7a05b2baf02699 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Tue, 22 Aug 2017 20:52:30 -0400
Subject: [PATCH 2/2] Visually notify of uncaught exceptions breaking client
 tests (#9034)

* Visually notify of uncaught exceptions breaking client tests

These changes add a global `window.onerror` event handler
to the `test-in-browser` package, to catch any previously
uncaught exceptions. When uncaught exceptions are found,
an alert box is displayed above the test results table.
This should help notify developers of hidden uncaught
exceptions that could be preventing client tests from
running.

Fixes #4979.

* Bump the test-in-browser package version
---
 packages/test-in-browser/driver.css  |  6 ++++-
 packages/test-in-browser/driver.html | 39 +++++++++++++++++++++++-----
 packages/test-in-browser/driver.js   | 13 ++++++++++
 packages/test-in-browser/package.js  |  3 ++-
 4 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/packages/test-in-browser/driver.css b/packages/test-in-browser/driver.css
index 1530170097a..0251f37d4fb 100644
--- a/packages/test-in-browser/driver.css
+++ b/packages/test-in-browser/driver.css
@@ -151,4 +151,8 @@ body {
 #current-client-test {
   color: #ccc;
   margin-right: 15px;
-}
\ No newline at end of file
+}
+
+.failedTests {
+  color: #900; /* red */
+}
diff --git a/packages/test-in-browser/driver.html b/packages/test-in-browser/driver.html
index 5e4b272e0c1..fbd3ec10e1d 100644
--- a/packages/test-in-browser/driver.html
+++ b/packages/test-in-browser/driver.html
@@ -1,6 +1,7 @@
 <template name="testInBrowserBody">
   <div class="container-fluid">
   {{> navBars}}
+  {{> uncaughtErrors}}
   {{> failedTests}}
   {{> testTable}}
   </div>
@@ -71,14 +72,38 @@
   </div>
 </template>
 
+<template name="uncaughtErrors">
+  {{#if uncaughtErrors}}
+    <div class="row-fluid">
+      <div class="span12">
+        <div class="alert alert-danger">
+          <p>
+            <strong>WARNING:</strong> The following uncaught errors might be
+            preventing some client tests from running.
+          </p>
+          <ul>
+            {{#each uncaughtErrors}}
+              <li>{{this}}</li>
+            {{/each}}
+          </ul>
+        </div>
+      </div>
+    </div>
+  {{/if}}
+</template>
+
 <template name="failedTests">
-  <div class="row-fluid"><div class="span12">
-  <ul class="failedTests">
-    {{#each failedTests}}
-      <li>{{this}}</li>
-    {{/each}}
-  </ul>
-  </div></div>
+  {{#if failedTests}}
+    <div class="row-fluid">
+      <div class="span12">
+        <ul class="failedTests">
+          {{#each failedTests}}
+            <li>{{this}}</li>
+          {{/each}}
+        </ul>
+      </div>
+    </div>
+  {{/if}}
 </template>
 
 <template name="testTable">
diff --git a/packages/test-in-browser/driver.js b/packages/test-in-browser/driver.js
index 2602f569231..7600362060d 100644
--- a/packages/test-in-browser/driver.js
+++ b/packages/test-in-browser/driver.js
@@ -35,6 +35,12 @@ var topLevelGroupsDep = new Tracker.Dependency;
 // - dep: Tracker.Dependency object for this test. fires when the test completes.
 var resultTree = [];
 
+Session.set("uncaughtErrors", []);
+window.onerror = (message, source, line) => {
+  const uncaughtErrors = new Set(Session.get("uncaughtErrors"));
+  uncaughtErrors.add(message);
+  Session.set("uncaughtErrors", Array.from(uncaughtErrors));
+};
 
 Session.setDefault("groupPath", ["tinytest"]);
 Session.set("rerunScheduled", false);
@@ -359,6 +365,13 @@ Template.groupNav.onRendered(function () {
   };
 });
 
+//// Template - uncaughtErrors
+
+Template.uncaughtErrors.helpers({
+  uncaughtErrors() {
+    return Session.get("uncaughtErrors");
+  }
+});
 
 //// Template - failedTests
 
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 36cba98c44e..6c5e80b7c8d 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,10 +1,11 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13',
+  version: '1.0.14',
   documentation: null
 });
 
 Package.onUse(function (api) {
+  api.use('ecmascript');
   // XXX this should go away, and there should be a clean interface
   // that tinytest and the driver both implement?
   api.use('tinytest');