Merge pull request #15871 from rwjblue/revert-14898

[BUGFIX lts] Refactor / fix error handling scenarios.
emberjs · Nov 28, 2017 · c099fb0 · c099fb0
2 parents 87efb0a + 0f3f49c
commit c099fb0
Show file tree

Hide file tree

Showing 7 changed files with 475 additions and 68 deletions.
diff --git a/packages/ember-metal/lib/error_handler.js b/packages/ember-metal/lib/error_handler.js
@@ -1,22 +1,10 @@
 import Logger from 'ember-console';
 import { isTesting } from 'ember-debug';
 
-// To maintain stacktrace consistency across browsers
-let getStack = error => {
-  let stack = error.stack;
-  let message = error.message;
-
-  if (stack && stack.indexOf(message) === -1) {
-    stack = `${message}\n${stack}`;
-  }
-
-  return stack;
-};
-
 let onerror;
 export const onErrorTarget = {
   get onerror() {
-    return dispatchOverride || onerror;
+    return onerror;
   }
 };
 
@@ -30,14 +18,6 @@ export function setOnerror(handler) {
 }
 
 let dispatchOverride;
-// dispatch error
-export function dispatchError(error) {
-  if (dispatchOverride) {
-    dispatchOverride(error);
-  } else {
-    defaultDispatch(error);
-  }
-}
 
 // allows testing adapter to override dispatch
 export function getDispatchOverride() {
@@ -46,14 +26,3 @@ export function getDispatchOverride() {
 export function setDispatchOverride(handler) {
   dispatchOverride = handler;
 }
-
-function defaultDispatch(error) {
-  if (isTesting()) {
-    throw error;
-  }
-  if (onerror) {
-    onerror(error);
-  } else {
-    Logger.error(getStack(error));
-  }
-}
diff --git a/packages/ember-metal/lib/index.js b/packages/ember-metal/lib/index.js
@@ -19,7 +19,6 @@ export {
 export {
   getOnerror,
   setOnerror,
-  dispatchError,
   setDispatchOverride,
   getDispatchOverride
 } from './error_handler';

diff --git a/packages/ember-runtime/lib/ext/rsvp.js b/packages/ember-runtime/lib/ext/rsvp.js
@@ -1,7 +1,7 @@
 import * as RSVP from 'rsvp';
 import {
   run,
-  dispatchError
+  getDispatchOverride
 } from 'ember-metal';
 import { assert } from 'ember-debug';
 
@@ -21,7 +21,12 @@ RSVP.on('error', onerrorDefault);
 export function onerrorDefault(reason) {
   let error = errorFor(reason);
   if (error) {
-    dispatchError(error);
+    let overrideDispatch = getDispatchOverride();
+    if (overrideDispatch) {
+      overrideDispatch(error);
+    } else {
+      throw error;
+    }
   }
 }
 

diff --git a/packages/ember-runtime/tests/ext/rsvp_test.js b/packages/ember-runtime/tests/ext/rsvp_test.js
@@ -46,12 +46,10 @@ QUnit.test('Can reject with non-Error object', function(assert) {
   try {
     run(RSVP, 'reject', 'foo');
   } catch (e) {
-    ok(false, 'should not throw');
+    equal(e, 'foo', 'should throw with rejection message');
   } finally {
     setTesting(wasEmberTesting);
   }
-
-  ok(true);
 });
 
 QUnit.test('Can reject with no arguments', function(assert) {

diff --git a/packages/ember-testing/lib/test/adapter.js b/packages/ember-testing/lib/test/adapter.js
@@ -8,7 +8,7 @@ export function getAdapter() {
 
 export function setAdapter(value) {
   adapter = value;
-  if (value) {
+  if (value && typeof value.exception === 'function') {
     setDispatchOverride(adapterDispatch);
   } else {
     setDispatchOverride(null);

diff --git a/packages/ember-testing/tests/adapters_test.js b/packages/ember-testing/tests/adapters_test.js
@@ -4,12 +4,13 @@ import Adapter from '../adapters/adapter';
 import QUnitAdapter from '../adapters/qunit';
 import { Application as EmberApplication } from 'ember-application';
 
-var App, originalAdapter, originalQUnit;
+var App, originalAdapter, originalQUnit, originalWindowOnerror;
 
 QUnit.module('ember-testing Adapters', {
   setup() {
     originalAdapter = Test.adapter;
     originalQUnit = window.QUnit;
+    originalWindowOnerror = window.onerror;
   },
   teardown() {
     if (App) {
@@ -20,6 +21,7 @@ QUnit.module('ember-testing Adapters', {
 
     Test.adapter = originalAdapter;
     window.QUnit = originalQUnit;
+    window.onerror = originalWindowOnerror;
   }
 });
 
@@ -71,17 +73,22 @@ QUnit.test('Adapter is used by default (if QUnit is not available)', function()
   ok(!(Test.adapter instanceof QUnitAdapter));
 });
 
-QUnit.test('With Ember.Test.adapter set, errors in Ember.run are caught', function () {
+QUnit.test('With Ember.Test.adapter set, errors in synchronous Ember.run are bubbled out', function (assert) {
   let thrown = new Error('Boom!');
 
-  let caught;
+  let caughtInAdapter, caughtInCatch;
   Test.adapter = QUnitAdapter.create({
     exception(error) {
-      caught = error;
+      caughtInAdapter = error;
     }
   });
 
-  run(() => { throw thrown; });
+  try {
+    run(() => { throw thrown; });
+  } catch(e) {
+    caughtInCatch = e;
+  }
 
-  deepEqual(caught, thrown);
+  assert.equal(caughtInAdapter, undefined, 'test adapter should never receive synchronous errors');
+  assert.equal(caughtInCatch, thrown, 'a "normal" try/catch should catch errors in sync run');
 });