Squashed commit of work to make Jasmine a collection of isolated modules. Note now that in our test suite, "jasmine" now always refers to the build jasmine loaded from jasmine.js and "j$" always refers to the code in the src directories.

Also, dev_boot.js is now a copy of boot.js and has additional changes to load jasmine the second time, into the j$ reference.
2013-05-28 14:09:20 -07:00
parent 7516bba2b0
commit aca43bd3a3
52 changed files with 3828 additions and 3323 deletions
--- a/src/core/Clock.js
+++ b/src/core/Clock.js
@@ -1,93 +1,97 @@
-jasmine.Clock = function(global, delayedFunctionScheduler) {
-  var self = this,
-    realTimingFunctions = {
-      setTimeout: global.setTimeout,
-      clearTimeout: global.clearTimeout,
-      setInterval: global.setInterval,
-      clearInterval: global.clearInterval
-    },
-    fakeTimingFunctions = {
-      setTimeout: setTimeout,
-      clearTimeout: clearTimeout,
-      setInterval: setInterval,
-      clearInterval: clearInterval
-    },
-    timer = realTimingFunctions,
-    installed = false;
+getJasmineRequireObj().Clock = function() {
+  function Clock(global, delayedFunctionScheduler) {
+    var self = this,
+      realTimingFunctions = {
+        setTimeout: global.setTimeout,
+        clearTimeout: global.clearTimeout,
+        setInterval: global.setInterval,
+        clearInterval: global.clearInterval
+      },
+      fakeTimingFunctions = {
+        setTimeout: setTimeout,
+        clearTimeout: clearTimeout,
+        setInterval: setInterval,
+        clearInterval: clearInterval
+      },
+      timer = realTimingFunctions,
+      installed = false;

-  self.install = function() {
-    installed = true;
-    timer = fakeTimingFunctions;
-  };
+    self.install = function() {
+      installed = true;
+      timer = fakeTimingFunctions;
+    };

-  self.uninstall = function() {
-    delayedFunctionScheduler.reset();
-    installed = false;
-    timer = realTimingFunctions;
-  };
+    self.uninstall = function() {
+      delayedFunctionScheduler.reset();
+      installed = false;
+      timer = realTimingFunctions;
+    };

-  self.setTimeout = function(fn, delay, params) {
-    if (legacyIE()) {
-      if (arguments.length > 2) {
-        throw new Error("IE < 9 cannot support extra params to setTimeout without a polyfill");
+    self.setTimeout = function(fn, delay, params) {
+      if (legacyIE()) {
+        if (arguments.length > 2) {
+          throw new Error("IE < 9 cannot support extra params to setTimeout without a polyfill");
+        }
+        return timer.setTimeout(fn, delay);
      }
-      return timer.setTimeout(fn, delay);
-    }
-    return timer.setTimeout.apply(global, arguments);
-  };
+      return timer.setTimeout.apply(global, arguments);
+    };

-  self.setInterval = function(fn, delay, params) {
-    if (legacyIE()) {
-      if (arguments.length > 2) {
-        throw new Error("IE < 9 cannot support extra params to setInterval without a polyfill");
+    self.setInterval = function(fn, delay, params) {
+      if (legacyIE()) {
+        if (arguments.length > 2) {
+          throw new Error("IE < 9 cannot support extra params to setInterval without a polyfill");
+        }
+        return timer.setInterval(fn, delay);
      }
-      return timer.setInterval(fn, delay);
+      return timer.setInterval.apply(global, arguments);
+    };
+
+    self.clearTimeout = function(id) {
+      return timer.clearTimeout.call(global, id);
+    };
+
+    self.clearInterval = function(id) {
+      return timer.clearInterval.call(global, id);
+    };
+
+    self.tick = function(millis) {
+      if (installed) {
+        delayedFunctionScheduler.tick(millis);
+      } else {
+        throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+      }
+    };
+
+    return self;
+
+    function legacyIE() {
+      //if these methods are polyfilled, apply will be present
+      //TODO: it may be difficult to load the polyfill before jasmine loads
+      //(env should be new-ed inside of onload)
+      return !(global.setTimeout || global.setInterval).apply;
    }
-    return timer.setInterval.apply(global, arguments);
-  };

-  self.clearTimeout = function(id) {
-    return timer.clearTimeout.call(global, id);
-  };
-
-  self.clearInterval = function(id) {
-    return timer.clearInterval.call(global, id);
-  };
-
-  self.tick = function(millis) {
-    if (installed) {
-      delayedFunctionScheduler.tick(millis);
-    } else {
-      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+    function setTimeout(fn, delay) {
+      return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2));
    }
-  };

-  return self;
+    function clearTimeout(id) {
+      return delayedFunctionScheduler.removeFunctionWithId(id);
+    }

-  function legacyIE() {
-    //if these methods are polyfilled, apply will be present
-    //TODO: it may be difficult to load the polyfill before jasmine loads
-    //(env should be new-ed inside of onload)
-    return !(global.setTimeout || global.setInterval).apply;
+    function setInterval(fn, interval) {
+      return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true);
+    }
+
+    function clearInterval(id) {
+      return delayedFunctionScheduler.removeFunctionWithId(id);
+    }
+
+    function argSlice(argsObj, n) {
+      return Array.prototype.slice.call(argsObj, 2);
+    }
  }

-  function setTimeout(fn, delay) {
-    return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2));
-  }
-
-  function clearTimeout(id) {
-    return delayedFunctionScheduler.removeFunctionWithId(id);
-  }
-
-  function setInterval(fn, interval) {
-    return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true);
-  }
-
-  function clearInterval(id) {
-    return delayedFunctionScheduler.removeFunctionWithId(id);
-  }
-
-  function argSlice(argsObj, n) {
-    return Array.prototype.slice.call(argsObj, 2);
-  }
+  return Clock;
 };