Merge pull request #107 from twokul/master

fixing tests for rethrow in IE 6,7,8 as well as phantom/node

Merge pull request #107 from twokul/master
fixing tests for rethrow in IE 6,7,8 as well as phantom/node
75ae49a2 · Stefan Penner · 885fe7ab · 64c22561 · 75ae49a2 · 75ae49a2
Commit 75ae49a2 authored Aug 29, 2013 by Stefan Penner
Show whitespace changes
Inline Side-by-side

Showing with 19 additions and 16 deletions

lib/rsvp/async.js lib/rsvp/async.js +2 -1

test/index.html test/index.html +1 -1

test/tests/extension_test.js test/tests/extension_test.js +16 -14

No files found.
--- a/lib/rsvp/async.js
+++ b/lib/rsvp/async.js
 var browserGlobal = (typeof window !== 'undefined') ? window : {};
 var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 var async;
+var local = (typeof global !== 'undefined') ? global : this;
 // old node
 function useNextTick() {
@@ -51,7 +52,7 @@ function useMutationObserver() {
 function useSetTimeout() {
  return function(callback, arg) {
-    global.setTimeout(function() {
+    local.setTimeout(function() {
      callback(arg);
    }, 1);
  };

--- a/test/index.html
+++ b/test/index.html
@@ -6,7 +6,7 @@
 </head>
 <body>
  <div id="mocha"></div>
-  <script src="../dist/rsvp-2.0.1.js"></script>
+  <script src="../dist/rsvp-2.0.2.js"></script>
  <script src="vendor/assert.js"></script>
  <script src="vendor/mocha.js"></script>
  <script>mocha.setup({ ui: 'bdd', timeout: 200 }); mocha.globals(['setTimeout']);</script>

--- a/test/tests/extension_test.js
+++ b/test/tests/extension_test.js
 /*global describe, specify, it, assert */
-var local = (typeof global === "undefined") ? this : global;
+var local = (typeof global === "undefined") ? this : global,
+    oldSetTimeout, newSetTimeout;
+local.setTimeout = local.setTimeout;
+oldSetTimeout = local.setTimeout;
+newSetTimeout = function(callback) {
+  var errorWasThrown;
+  try {
+    callback.call(this, arguments);
+  } catch(e) {
+    errorWasThrown = true;
+  }
+};
 if (typeof Object.getPrototypeOf !== "function") {
  Object.getPrototypeOf = "".__proto__ === String.prototype
@@ -727,7 +738,7 @@ describe("RSVP extensions", function() {
  });
  describe("RSVP.rethrow", function() {
-    var onerror, oldSetTimeout = global.setTimeout;
+    var onerror;
    after(function() {
      global.setTimeout = oldSetTimeout;
@@ -740,19 +751,8 @@ describe("RSVP extensions", function() {
    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) {
+        done();
        assertEqual(reason, thrownError);
      }
@@ -761,6 +761,8 @@ describe("RSVP extensions", function() {
        assert(false, value);
      }
+      global.setTimeout = newSetTimeout;
      RSVP.reject(thrownError).
        fail(RSVP.rethrow).
        then(doNotExpectFulfillment, expectRejection);