-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleanup Ember.Test, Ember.testing, Ember.onerror
- Loading branch information
1 parent
8a94054
commit d9f57e8
Showing
49 changed files
with
1,374 additions
and
1,155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import Logger from 'ember-console'; | ||
import { isTesting } from './testing'; | ||
|
||
let onerror; | ||
// Ember.onerror getter | ||
export function getOnerror() { | ||
return onerror; | ||
} | ||
// Ember.onerror setter | ||
export function setOnerror(handler) { | ||
onerror = handler; | ||
} | ||
|
||
let dispatchOverride; | ||
// dispatch error | ||
export function dispatchError(error) { | ||
if (dispatchOverride) { | ||
dispatchOverride(error); | ||
} else { | ||
defaultDispatch(error); | ||
} | ||
} | ||
|
||
// allows testing adapter to override dispatch | ||
export function setDispatchOverride(handler) { | ||
dispatchOverride = handler; | ||
} | ||
|
||
function defaultDispatch(error) { | ||
if (isTesting()) { | ||
throw error; | ||
} | ||
if (onerror) { | ||
onerror(error); | ||
} else { | ||
Logger.error(error.stack); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
let testing = false; | ||
|
||
export function isTesting() { | ||
return testing; | ||
} | ||
|
||
export function setTesting(value) { | ||
testing = !!value; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,36 @@ | ||
import Ember from 'ember-metal'; // Ember.onerror | ||
import run from 'ember-metal/run_loop'; | ||
import { setOnerror, getOnerror } from 'ember-metal/error_handler'; | ||
|
||
QUnit.module('system/run_loop/onerror_test'); | ||
|
||
QUnit.test('With Ember.onerror undefined, errors in Ember.run are thrown', function () { | ||
var thrown = new Error('Boom!'); | ||
var caught; | ||
let thrown = new Error('Boom!'); | ||
let original = getOnerror(); | ||
|
||
let caught; | ||
setOnerror(undefined); | ||
try { | ||
run(function() { throw thrown; }); | ||
run(() => { throw thrown; }); | ||
} catch (error) { | ||
caught = error; | ||
} finally { | ||
setOnerror(original); | ||
} | ||
|
||
deepEqual(caught, thrown); | ||
}); | ||
|
||
QUnit.test('With Ember.onerror set, errors in Ember.run are caught', function () { | ||
var thrown = new Error('Boom!'); | ||
var caught; | ||
let thrown = new Error('Boom!'); | ||
let original = getOnerror(); | ||
|
||
Ember.onerror = function(error) { caught = error; }; | ||
|
||
run(function() { throw thrown; }); | ||
let caught; | ||
setOnerror(error => { caught = error; }); | ||
try { | ||
run(() => { throw thrown; }); | ||
} finally { | ||
setOnerror(original); | ||
} | ||
|
||
deepEqual(caught, thrown); | ||
|
||
Ember.onerror = undefined; | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.