Merge pull request #103 from twokul/RSVP#rethrow

Rsvp#rethrow

Merge pull request #103 from twokul/RSVP#rethrow
Rsvp#rethrow
59a869e9 · Stefan Penner · 7f6b2674 · 2e98c2d0 · 59a869e9 · 59a869e9
Commit 59a869e9 authored Aug 25, 2013 by Stefan Penner
5 changed files
--- a/lib/rsvp.js
+++ b/lib/rsvp.js
@@ -3,6 +3,7 @@ import { Promise } from "./rsvp/promise";
 import { denodeify } from "./rsvp/node";
 import { all } from "./rsvp/all";
 import { hash } from "./rsvp/hash";
+import { rethrow } from "./rsvp/rethrow";
 import { defer } from "./rsvp/defer";
 import { config } from "./rsvp/config";
 import { resolve } from "./rsvp/resolve";
@@ -12,4 +13,4 @@ function configure(name, value) {
  config[name] = value;
 }
-export { Promise, EventTarget, all, hash, defer, denodeify, configure, resolve, reject };
+export { Promise, EventTarget, all, hash, rethrow, defer, denodeify, configure, resolve, reject };
--- a/lib/rsvp/async.js
+++ b/lib/rsvp/async.js
@@ -51,7 +51,7 @@ function useMutationObserver() {
 function useSetTimeout() {
  return function(callback, arg) {
-    setTimeout(function() {
+    global.setTimeout(function() {
      callback(arg);
    }, 1);
  };

--- a/lib/rsvp/rethrow.js
+++ b/lib/rsvp/rethrow.js
+var local = (typeof global === "undefined") ? this : global;
+function rethrow(reason) {
+  local.setTimeout(function() {
+    throw reason;
+  });
+  throw reason;
+}
+export { rethrow };
--- a/test/index.html
+++ b/test/index.html
@@ -6,15 +6,15 @@
 </head>
 <body>
  <div id="mocha"></div>
-  <script src="../dist/rsvp-2.0.0.js"></script>
+  <script src="../dist/rsvp-2.0.1.js"></script>
  <script src="vendor/assert.js"></script>
  <script src="vendor/mocha.js"></script>
-  <script>mocha.setup({ ui: 'bdd', timeout: 200 })</script>
+  <script>mocha.setup({ ui: 'bdd', timeout: 200 }); mocha.globals(['setTimeout']);</script>
  <script src="../tmp/tests-bundle.js"></script>
  <script src="tests/extension_test.js"></script>
  <script>
    if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
-    else { mocha.run(); }
+    else { mocha.globals(['setTimeout']); mocha.run(); }
  </script>
 </body>
 </html>
--- a/test/tests/extension_test.js
+++ b/test/tests/extension_test.js
 /*global describe, specify, it, assert */
+var local = (typeof global === "undefined") ? this : global;
 if (typeof Object.getPrototypeOf !== "function") {
  Object.getPrototypeOf = "".__proto__ === String.prototype
    ? function (object) {
@@ -724,6 +726,47 @@ describe("RSVP extensions", function() {
    });
  });
+  describe("RSVP.rethrow", function() {
+    var onerror, oldSetTimeout = global.setTimeout;
+    after(function() {
+      global.setTimeout = oldSetTimeout;
+    });
+    it("should exist", function() {
+      assert(RSVP.rethrow);
+    });
+    it("rethrows an error", function(done) {
+      var thrownError = new Error('I am an error.');
+      local.setTimeout = function (callback) {
+        done();
+        var errorWasThrown = false;
+        try {
+          callback.call(this, arguments);
+        } catch(e) {
+          errorWasThrown = true;
+        }
+        assert(errorWasThrown, 'expect that an error was thrown');
+      };
+      function expectRejection(reason) {
+        assertEqual(reason, thrownError);
+      }
+      function doNotExpectFulfillment(value) {
+        done();
+        assert(false, value);
+      }
+      RSVP.reject(thrownError).
+        fail(RSVP.rethrow).
+        then(doNotExpectFulfillment, expectRejection);
+    });
+  });
  describe("RSVP.resolve", function(){
    specify("it should exist", function(){
      assert(RSVP.resolve);