From 73063b9d730ff5037835857256474618982e19fe Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Fri, 16 Mar 2018 13:56:30 -0700
Subject: [PATCH 1/2] Update `qunit` to v2.5.1

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 46ca12acf..c62a88c87 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "lerna-changelog": "^0.7.0",
     "loader.js": "^4.2.3",
     "prettier": "^1.7.4",
-    "qunit": "^2.5.0"
+    "qunit": "^2.5.1"
   },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"
diff --git a/yarn.lock b/yarn.lock
index 02f250161..cf29257b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6516,9 +6516,9 @@ quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quic
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.5.0.tgz#64cbe30a1193ef02edc5b278efcdf1d0bae96b22"
+qunit@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.5.1.tgz#739b0ea9595bbf508b0600d5af04dcb2ba2a74e5"
   dependencies:
     chokidar "1.7.0"
     commander "2.12.2"

From 568039febd201a8fbdcebd6c43a948f17befbd43 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Fri, 16 Mar 2018 14:10:18 -0700
Subject: [PATCH 2/2] tests/helpers/events: Use `data-skip-steps` attribute to
 temporarily disable instrumentation

---
 tests/helpers/events.js                  | 4 +++-
 tests/unit/dom/blur-test.js              | 4 ++++
 tests/unit/dom/click-test.js             | 2 ++
 tests/unit/dom/fill-in-test.js           | 2 ++
 tests/unit/dom/focus-test.js             | 2 ++
 tests/unit/dom/tap-test.js               | 2 ++
 tests/unit/dom/trigger-event-test.js     | 2 ++
 tests/unit/dom/trigger-key-event-test.js | 2 ++
 8 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/helpers/events.js b/tests/helpers/events.js
index 441b1d826..84de2fc46 100644
--- a/tests/helpers/events.js
+++ b/tests/helpers/events.js
@@ -185,7 +185,9 @@ export function instrumentElement(element) {
 
   KNOWN_EVENTS.forEach(type => {
     element.addEventListener(type, e => {
-      assert.step(type);
+      if (!element.hasAttribute('data-skip-steps')) {
+        assert.step(type);
+      }
       assert.ok(e instanceof Event, `${type} listener should receive a native event`);
     });
   });
diff --git a/tests/unit/dom/blur-test.js b/tests/unit/dom/blur-test.js
index 9efa4d87a..0e86b0f1a 100644
--- a/tests/unit/dom/blur-test.js
+++ b/tests/unit/dom/blur-test.js
@@ -55,6 +55,8 @@ module('DOM Helper: blur', function(hooks) {
   });
 
   test('rejects if selector is not found', async function(assert) {
+    elementWithFocus.setAttribute('data-skip-steps', true);
+
     await setupContext(context);
 
     assert.rejects(
@@ -72,6 +74,8 @@ module('DOM Helper: blur', function(hooks) {
   });
 
   test('bluring via selector without context set', function(assert) {
+    elementWithFocus.setAttribute('data-skip-steps', true);
+
     assert.rejects(
       blur(`#${elementWithFocus.id}`),
       /Must setup rendering context before attempting to interact with elements/
diff --git a/tests/unit/dom/click-test.js b/tests/unit/dom/click-test.js
index 28de804fb..25f25717c 100644
--- a/tests/unit/dom/click-test.js
+++ b/tests/unit/dom/click-test.js
@@ -16,6 +16,8 @@ module('DOM Helper: click', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }
diff --git a/tests/unit/dom/fill-in-test.js b/tests/unit/dom/fill-in-test.js
index d249a7d69..77163f8d9 100644
--- a/tests/unit/dom/fill-in-test.js
+++ b/tests/unit/dom/fill-in-test.js
@@ -22,6 +22,8 @@ module('DOM Helper: fillIn', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }
diff --git a/tests/unit/dom/focus-test.js b/tests/unit/dom/focus-test.js
index bae696694..317215ca0 100644
--- a/tests/unit/dom/focus-test.js
+++ b/tests/unit/dom/focus-test.js
@@ -22,6 +22,8 @@ module('DOM Helper: focus', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }
diff --git a/tests/unit/dom/tap-test.js b/tests/unit/dom/tap-test.js
index 3d31fab8d..b9e0cb16e 100644
--- a/tests/unit/dom/tap-test.js
+++ b/tests/unit/dom/tap-test.js
@@ -20,6 +20,8 @@ module('DOM Helper: tap', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }
diff --git a/tests/unit/dom/trigger-event-test.js b/tests/unit/dom/trigger-event-test.js
index aba02cfc2..50b8f5b69 100644
--- a/tests/unit/dom/trigger-event-test.js
+++ b/tests/unit/dom/trigger-event-test.js
@@ -19,6 +19,8 @@ module('DOM Helper: triggerEvent', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }
diff --git a/tests/unit/dom/trigger-key-event-test.js b/tests/unit/dom/trigger-key-event-test.js
index 707a3c234..3051bcfc7 100644
--- a/tests/unit/dom/trigger-key-event-test.js
+++ b/tests/unit/dom/trigger-key-event-test.js
@@ -19,6 +19,8 @@ module('DOM Helper: triggerKeyEvent', function(hooks) {
   });
 
   hooks.afterEach(async function() {
+    element.setAttribute('data-skip-steps', true);
+
     if (element) {
       element.parentNode.removeChild(element);
     }