From 331bba4b6d2264236ff74cae8d798edfd26ce139 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 12 Dec 2014 13:13:18 -0500
Subject: [PATCH] Correct the last few test failures in the 1.9.0 branch

---
 test/javascripts/helpers/create-pretender.js.es6 |  2 +-
 vendor/assets/javascripts/development/ember.js   | 10 ++++++++--
 vendor/assets/javascripts/production/ember.js    | 10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index a3716d62956..7cc2ff88645 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -16,7 +16,7 @@ function response(code, obj) {
 }
 
 function success() {
-  return response();
+  return response({ success: true });
 }
 
 export default function() {
diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js
index 3ec5c65c122..0b4deefa8d5 100644
--- a/vendor/assets/javascripts/development/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -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);
       },
 
     /**
@@ -50328,4 +50334,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
\ No newline at end of file
+})();
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index f695ceeeb44..e5e33c4e7e9 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -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);
       },
 
     /**
@@ -48424,4 +48430,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
\ No newline at end of file
+})();