test: use hook test helpers

rewardops · Jan 14, 2022 · 2d6170c · 2d6170c
1 parent c7c851f
commit 2d6170c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 32 deletions.
diff --git a/tests/unit/dom/blur-test.js b/tests/unit/dom/blur-test.js
@@ -9,6 +9,7 @@ import {
 import { buildInstrumentedElement, insertElement } from '../../helpers/events';
 import { isIE11, isEdge } from '../../helpers/browser-detect';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
+import { registerHooks, unregisterHooks } from '../../helpers/register-hooks';
 
 let focusSteps = ['focus', 'focusin'];
 let blurSteps = ['blur', 'focusout'];
@@ -62,20 +63,14 @@ module('DOM Helper: blur', function (hooks) {
 
     await focus(element);
 
-    let startHook = _registerHook('blur', 'start', () => {
-      assert.step('blur:start');
-    });
-    let endHook = _registerHook('blur', 'end', () => {
-      assert.step('blur:end');
-    });
+    const mockHooks = registerHooks(assert, 'blur');
 
     try {
       await blur(elementWithFocus);
 
       assert.verifySteps(['blur', 'focusout', 'blur:start', 'blur:end']);
     } finally {
-      startHook.unregister();
-      endHook.unregister();
+      unregisterHooks(mockHooks);
     }
   });
 

diff --git a/tests/unit/dom/focus-test.js b/tests/unit/dom/focus-test.js
@@ -12,6 +12,7 @@ import {
 } from '../../helpers/events';
 import { isIE11, isEdge } from '../../helpers/browser-detect';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
+import { registerHooks, unregisterHooks } from '../../helpers/register-hooks';
 
 let focusSteps = ['focus', 'focusin'];
 let blurSteps = ['blur', 'focusout'];
@@ -54,20 +55,14 @@ module('DOM Helper: focus', function (hooks) {
     element = document.createElement('input');
     insertElement(element);
 
-    let startHook = _registerHook('focus', 'start', () => {
-      assert.step('focus:start');
-    });
-    let endHook = _registerHook('focus', 'end', () => {
-      assert.step('focus:end');
-    });
+    const mockHooks = registerHooks(assert, 'focus');
 
     try {
       await focus(element);
 
       assert.verifySteps(['focus:start', 'focus:end']);
     } finally {
-      startHook.unregister();
-      endHook.unregister();
+      unregisterHooks(mockHooks);
     }
   });
 

diff --git a/tests/unit/dom/trigger-event-test.js b/tests/unit/dom/trigger-event-test.js
@@ -7,6 +7,7 @@ import {
 } from '@ember/test-helpers';
 import { buildInstrumentedElement, insertElement } from '../../helpers/events';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
+import { registerHooks, unregisterHooks } from '../../helpers/register-hooks';
 
 module('DOM Helper: triggerEvent', function (hooks) {
   if (!hasEmberVersion(2, 4)) {
@@ -44,20 +45,14 @@ module('DOM Helper: triggerEvent', function (hooks) {
     element = document.createElement('div');
     insertElement(element);
 
-    let startHook = _registerHook('triggerEvent', 'start', () => {
-      assert.step('triggerEvent:start');
-    });
-    let endHook = _registerHook('triggerEvent', 'end', () => {
-      assert.step('triggerEvent:end');
-    });
+    const mockHooks = registerHooks(assert, 'triggerEvent');
 
     try {
       await triggerEvent(element, 'mouseenter');
 
       assert.verifySteps(['triggerEvent:start', 'triggerEvent:end']);
     } finally {
-      startHook.unregister();
-      endHook.unregister();
+      unregisterHooks(mockHooks);
     }
   });
 

diff --git a/tests/unit/dom/trigger-key-event-test.js b/tests/unit/dom/trigger-key-event-test.js
@@ -7,6 +7,7 @@ import {
 } from '@ember/test-helpers';
 import { buildInstrumentedElement, insertElement } from '../../helpers/events';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
+import { registerHooks, unregisterHooks } from '../../helpers/register-hooks';
 
 module('DOM Helper: triggerKeyEvent', function (hooks) {
   if (!hasEmberVersion(2, 4)) {
@@ -44,20 +45,14 @@ module('DOM Helper: triggerKeyEvent', function (hooks) {
     element = document.createElement('div');
     insertElement(element);
 
-    let startHook = _registerHook('triggerKeyEvent', 'start', () => {
-      assert.step('triggerKeyEvent:start');
-    });
-    let endHook = _registerHook('triggerKeyEvent', 'end', () => {
-      assert.step('triggerKeyEvent:end');
-    });
+    const mockHooks = registerHooks(assert, 'triggerKeyEvent');
 
     try {
       await triggerKeyEvent(element, 'keypress', 13);
 
       assert.verifySteps(['triggerKeyEvent:start', 'triggerKeyEvent:end']);
     } finally {
-      startHook.unregister();
-      endHook.unregister();
+      unregisterHooks(mockHooks);
     }
   });