Changing logic to determine if to enable setupOnerror or not

emberjs · Jan 25, 2019 · e133b7f · e133b7f
1 parent 0df2c18
commit e133b7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/addon-test-support/@ember/test-helpers/setup-context.ts b/addon-test-support/@ember/test-helpers/setup-context.ts
@@ -3,7 +3,6 @@ import { set, setProperties, get, getProperties } from '@ember/object';
 import { guidFor } from '@ember/object/internals';
 import Resolver from '@ember/application/resolver';
 
-import hasEmberVersion from './has-ember-version';
 import buildOwner, { Owner } from './build-owner';
 import { _setupAJAXHooks } from './settled';
 import Ember from 'ember';
@@ -143,9 +142,13 @@ const ORIGINAL_EMBER_ONERROR: (error: Error) => void | undefined = Ember.onerror
   @param {Function} onError the onError function to be set on Ember.onerror
 */
 export function setupOnerror(onError: (error: Error) => void): void {
-  if (!hasEmberVersion(2, 4)) {
+  let context = getContext();
+  let contextGuid = guidFor(context);
+  let contextCleanup = CLEANUP[contextGuid];
+
+  if (!Array.isArray(contextCleanup)) {
     throw new Error(
-      'The `setupOnerror` function requires that you be on a minimum version of Ember 2.4.'
+      'You must use `setupContext` / `setupRenderingContext` / `setupApplicationContext` in order to use `setupOnerror`'
     );
   }
 

diff --git a/tests/unit/setup-ember-onerror-test.js b/tests/unit/setup-ember-onerror-test.js
@@ -21,18 +21,21 @@ module('setupOnerror', function() {
       assert.equal(Ember.onerror, undefined);
     });
 
-    test('Ember.onerror is set correctly when using setupOnerror', function(assert) {
+    test('Ember.onerror is set correctly when using setupOnerror', async function(assert) {
       assert.expect(2);
 
+      let context = {};
       let onerror = err => err;
 
       assert.equal(Ember.onerror, undefined);
 
+      await setupContext(context);
+
       setupOnerror(onerror);
 
       assert.equal(Ember.onerror, onerror);
 
-      Ember.onerror = undefined;
+      await teardownContext(context);
     });
 
     test('Ember.onerror is reset correctly when teardownContext is invoked', async function(assert) {