From 941f801d3a914e22351a742b2018cf12306e3673 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 4 Dec 2020 12:57:18 -0500
Subject: [PATCH] Fixup linting issues.

---
 .../@ember/test-helpers/-internal/helper-hooks.ts    |  4 ++--
 addon-test-support/@ember/test-helpers/-utils.ts     | 12 +++++++-----
 .../@ember/test-helpers/setup-rendering-context.ts   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addon-test-support/@ember/test-helpers/-internal/helper-hooks.ts b/addon-test-support/@ember/test-helpers/-internal/helper-hooks.ts
index c41b5940a..f8e832406 100644
--- a/addon-test-support/@ember/test-helpers/-internal/helper-hooks.ts
+++ b/addon-test-support/@ember/test-helpers/-internal/helper-hooks.ts
@@ -14,7 +14,7 @@ const registeredHooks = new Map<string, Set<Hook>>();
  * @param {string} label A label to help identify the hook.
  * @returns {string} The compound key for the helper.
  */
-function getHelperKey(helperName: string, label: string) {
+function getHelperKey(helperName: string, label: string): string {
   return `${helperName}:${label}`;
 }
 
@@ -59,7 +59,7 @@ export function registerHook(helperName: string, label: HookLabel, hook: Hook):
  */
 export function runHooks(helperName: string, label: HookLabel, ...args: any[]): Promise<void> {
   let hooks = registeredHooks.get(getHelperKey(helperName, label)) || new Set<Hook>();
-  let promises = [];
+  let promises: Array<void | Promise<void>> = [];
 
   hooks.forEach(hook => {
     let hookResult = hook(...args);
diff --git a/addon-test-support/@ember/test-helpers/-utils.ts b/addon-test-support/@ember/test-helpers/-utils.ts
index 42e5a86d6..ca66e1efa 100644
--- a/addon-test-support/@ember/test-helpers/-utils.ts
+++ b/addon-test-support/@ember/test-helpers/-utils.ts
@@ -1,13 +1,15 @@
 /* globals Promise */
 
-const HAS_PROMISE = typeof Promise === 'function';
-
 import RSVP from 'rsvp';
-import { run } from '@ember/runloop';
+
+const HAS_PROMISE =
+  typeof Promise === 'function' &&
+  // @ts-ignore this is checking if someone has explicitly done `window.Promise = window.Promise || Ember.RSVP.Promise
+  Promise !== RSVP.Promise;
+
 import { Promise as PromisePolyfill } from 'es6-promise';
 
-const _Promise: typeof Promise =
-  HAS_PROMISE && Promise !== RSVP.Promise ? Promise : (PromisePolyfill as typeof Promise);
+const _Promise: typeof Promise = HAS_PROMISE ? Promise : (PromisePolyfill as typeof Promise);
 
 export { _Promise as Promise };
 
diff --git a/addon-test-support/@ember/test-helpers/setup-rendering-context.ts b/addon-test-support/@ember/test-helpers/setup-rendering-context.ts
index 6d39e32d6..76dbb0c65 100644
--- a/addon-test-support/@ember/test-helpers/setup-rendering-context.ts
+++ b/addon-test-support/@ember/test-helpers/setup-rendering-context.ts
@@ -3,7 +3,7 @@ import { run } from '@ember/runloop';
 import Ember from 'ember';
 import global from './global';
 import { BaseContext, TestContext, isTestContext, getContext } from './setup-context';
-import { ensureRenderingScheduled, Promise } from './-utils';
+import { Promise } from './-utils';
 import settled from './settled';
 import { hbs, TemplateFactory } from 'ember-cli-htmlbars';
 import getRootElement from './dom/get-root-element';