Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/javascripts/helpers/create-pretender.js.es6
View File

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

8
vendor/assets/javascripts/development/ember.js vendored
View File

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

8
vendor/assets/javascripts/production/ember.js vendored
View File

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