Merge pull request #53 from machty/ember-113

Fix microtask RSVP onerror scheduling, fixes Ember 1.13

Author: machty

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "stable"
+  - "5"
 
 sudo: required
 dist: trusty
@@ -17,17 +17,6 @@ cache:
   directories:
     - node_modules
 
-env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
-
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -42,4 +31,4 @@ install:
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  - ember try:each

addon/-task-instance.js

@@ -29,7 +29,7 @@ export function didCancel(e) {
 function forwardToInternalPromise(method) {
   return function(...args) {
     this._userWillHandlePromise = true;
-    return this._defer.promise[method](...args);
+    return this._defer.promise[method](...args).catch(deferToLastRunLoopQueue);
   };
 }
 
@@ -42,6 +42,17 @@ function spliceSlice(str, index, count, add) {
   return str.slice(0, index) + (add || "") + str.slice(index + count);
 }
 
+let run = Ember.run;
+
+// this backports the Ember 2.0+ RSVP _onError 'after' microtask behavior to Ember < 2.0
+function deferToLastRunLoopQueue(e) {
+  return new Ember.RSVP.Promise((_, reject) => {
+    run.schedule(run.queues[run.queues.length - 1], () => {
+      reject(e);
+    });
+  });
+}
+
 const SUCCESS     = "success";
 const ERROR       = "error";
 const CANCELATION = "cancel";
@@ -423,3 +434,4 @@ function normalizeObservable(value) {
 
 export default TaskInstance;
 
+

config/ember-try.js

@@ -1,44 +1,4 @@
 /*jshint node:true*/
 module.exports = {
-  scenarios: [
-    {
-      name: 'default',
-      bower: {
-        dependencies: { }
-      }
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#release'
-        },
-        resolutions: {
-          'ember': 'release'
-        }
-      }
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#beta'
-        },
-        resolutions: {
-          'ember': 'beta'
-        }
-      }
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#canary'
-        },
-        resolutions: {
-          'ember': 'canary'
-        }
-      }
-    }
-  ]
+  useVersionCompatibility: true
 };

package.json

@@ -48,7 +48,7 @@
     "ember-notify": "5.0.1",
     "ember-power-select": "0.8.6",
     "ember-resolver": "^2.0.3",
-    "ember-try": "^0.1.2",
+    "ember-try": "^0.2.2",
     "liquid-fire": "0.23.0",
     "loader.js": "^4.0.0"
   },
@@ -66,6 +66,9 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
-    "demoURL": "http://ember-concurrency.com/"
+    "demoURL": "http://ember-concurrency.com/",
+    "versionCompatibility": {
+      "ember": ">=1.13.0"
+    }
   }
 }