Correct the last few test failures in the 1.9.0 branch

This commit is contained in:
Robin Ward 2014-12-12 13:13:18 -05:00
parent 3e8d8bf90d
commit 331bba4b6d
3 changed files with 17 additions and 5 deletions

View file

@ -16,7 +16,7 @@ function response(code, obj) {
} }
function success() { function success() {
return response(); return response({ success: true });
} }
export default function() { export default function() {

View file

@ -49586,7 +49586,13 @@ enifed("rsvp/promise",
_guidKey: guidKey, _guidKey: guidKey,
_onerror: function (reason) { _onerror: function (reason) {
config.trigger('error', reason); config.async(function(promise) {
setTimeout(function() {
if (promise._onerror) {
config['trigger']('error', reason);
}
}, 0);
}, this);
}, },
/** /**
@ -50328,4 +50334,4 @@ enifed("rsvp/utils",
}); });
requireModule("ember"); requireModule("ember");
})(); })();

View file

@ -47682,7 +47682,13 @@ enifed("rsvp/promise",
_guidKey: guidKey, _guidKey: guidKey,
_onerror: function (reason) { _onerror: function (reason) {
config.trigger('error', reason); config.async(function(promise) {
setTimeout(function() {
if (promise._onerror) {
config['trigger']('error', reason);
}
}, 0);
}, this);
}, },
/** /**
@ -48424,4 +48430,4 @@ enifed("rsvp/utils",
}); });
requireModule("ember"); requireModule("ember");
})(); })();