Build distribution for 2.0.0-rc5 and associated standalone distribution

2013-10-29 14:01:40 -07:00
parent 69549a6ff3
commit 40e3020fdc
6 changed files with 255 additions and 282 deletions
--- a/dist/jasmine-standalone-2.0.0-rc5.zip
+++ b/dist/jasmine-standalone-2.0.0-rc5.zip
--- a/lib/jasmine-core/boot.js
+++ b/lib/jasmine-core/boot.js
@@ -91,10 +91,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
      return env.spyOn(obj, methodName);
    },

-    addCustomEqualityTester: function(tester) {
-      env.addCustomEqualityTester(tester);
-    },
-
    jsApiReporter: new jasmine.JsApiReporter({
      timer: new jasmine.Timer()
    })
@@ -149,7 +145,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   */
  var htmlReporter = new jasmine.HtmlReporter({
    env: env,
-    queryString: queryString,
    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
    getContainer: function() { return document.body; },
    createElement: function() { return document.createElement.apply(document, arguments); },
@@ -197,4 +192,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    return destination;
  }

-}());
+}());
--- a/lib/jasmine-core/jasmine-html.js
+++ b/lib/jasmine-core/jasmine-html.js
@@ -26,11 +26,12 @@ jasmineRequire.html = function(j$) {
  j$.QueryString = jasmineRequire.QueryString();
  j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter();
 };
+
 jasmineRequire.HtmlReporter = function(j$) {

  var noopTimer = {
-    start: function(){},
-    elapsed: function(){ return 0; }
+    start: function() {},
+    elapsed: function() { return 0; }
  };

  function HtmlReporter(options) {
@@ -101,7 +102,8 @@ jasmineRequire.HtmlReporter = function(j$) {
      symbols.appendChild(createDom("li", {
          className: result.status,
          id: "spec_" + result.id,
-          title: result.fullName}
+          title: result.fullName
+        }
      ));

      if (result.status == "failed") {
@@ -307,6 +309,7 @@ jasmineRequire.ResultsNode = function() {

  return ResultsNode;
 };
+
 jasmineRequire.QueryString = function() {
  function QueryString(options) {

--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -142,18 +142,18 @@ getJasmineRequireObj().base = function(j$) {
  j$.createSpy = function(name, originalFn) {

    var spyStrategy = new j$.SpyStrategy({
-          name: name,
-          fn: originalFn,
-          getSpy: function() { return spy; }
-        }),
-        callTracker = new j$.CallTracker(),
-        spy = function() {
-          callTracker.track({
-            object: this,
-            args: Array.prototype.slice.apply(arguments)
-          });
-          return spyStrategy.exec.apply(this, arguments);
-        };
+        name: name,
+        fn: originalFn,
+        getSpy: function() { return spy; }
+      }),
+      callTracker = new j$.CallTracker(),
+      spy = function() {
+        callTracker.track({
+          object: this,
+          args: Array.prototype.slice.apply(arguments)
+        });
+        return spyStrategy.exec.apply(this, arguments);
+      };

    for (var prop in originalFn) {
      if (prop === 'and' || prop === 'calls') {
@@ -174,7 +174,7 @@ getJasmineRequireObj().base = function(j$) {
      return false;
    }
    return putativeSpy.and instanceof j$.SpyStrategy &&
-        putativeSpy.calls instanceof j$.CallTracker;
+      putativeSpy.calls instanceof j$.CallTracker;
  };

  j$.createSpyObj = function(baseName, methodNames) {
@@ -194,14 +194,16 @@ getJasmineRequireObj().util = function() {
  var util = {};

  util.inherit = function(childClass, parentClass) {
-    var subclass = function() {
+    var Subclass = function() {
    };
-    subclass.prototype = parentClass.prototype;
-    childClass.prototype = new subclass();
+    Subclass.prototype = parentClass.prototype;
+    childClass.prototype = new Subclass();
  };

  util.htmlEscape = function(str) {
-    if (!str) return str;
+    if (!str) {
+      return str;
+    }
    return str.replace(/&/g, '&amp;')
      .replace(/</g, '&lt;')
      .replace(/>/g, '&gt;');
@@ -209,7 +211,9 @@ getJasmineRequireObj().util = function() {

  util.argsToArray = function(args) {
    var arrayOfArgs = [];
-    for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
+    for (var i = 0; i < args.length; i++) {
+      arrayOfArgs.push(args[i]);
+    }
    return arrayOfArgs;
  };

@@ -222,7 +226,6 @@ getJasmineRequireObj().util = function() {

 getJasmineRequireObj().Spec = function(j$) {
  function Spec(attrs) {
-    this.encounteredExpectations = false;
    this.expectationFactory = attrs.expectationFactory;
    this.resultCallback = attrs.resultCallback || function() {};
    this.id = attrs.id;
@@ -248,13 +251,11 @@ getJasmineRequireObj().Spec = function(j$) {
      id: this.id,
      description: this.description,
      fullName: this.getFullName(),
-      status: this.status(),
      failedExpectations: []
    };
  }

  Spec.prototype.addExpectationResult = function(passed, data) {
-    this.encounteredExpectations = true;
    if (passed) {
      return;
    }
@@ -278,7 +279,7 @@ getJasmineRequireObj().Spec = function(j$) {
    function timeoutable(fn) {
      return function(done) {
        var timeout = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() {
-          onException(new Error('timeout'));
+          onException(new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.'));
          done();
        }, j$.DEFAULT_TIMEOUT_INTERVAL]]);

@@ -292,8 +293,8 @@ getJasmineRequireObj().Spec = function(j$) {
    }

    var befores = this.beforeFns() || [],
-        afters = this.afterFns() || [],
-        thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn;
+      afters = this.afterFns() || [],
+      thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn;
    var allFns = befores.concat(thisOne).concat(afters);

    this.queueRunner({
@@ -303,18 +304,18 @@ getJasmineRequireObj().Spec = function(j$) {
    });

    function onException(e) {
-        if (Spec.isPendingSpecException(e)) {
-          self.pend();
-          return;
-        }
+      if (Spec.isPendingSpecException(e)) {
+        self.pend();
+        return;
+      }

-        self.addExpectationResult(false, {
-          matcherName: "",
-          passed: false,
-          expected: "",
-          actual: "",
-          error: e
-        });
+      self.addExpectationResult(false, {
+        matcherName: "",
+        passed: false,
+        expected: "",
+        actual: "",
+        error: e
+      });
    }

    function complete() {
@@ -340,7 +341,7 @@ getJasmineRequireObj().Spec = function(j$) {
      return 'disabled';
    }

-    if (this.markedPending || !this.encounteredExpectations) {
+    if (this.markedPending) {
      return 'pending';
    }

@@ -375,6 +376,8 @@ getJasmineRequireObj().Env = function(j$) {
    var self = this;
    var global = options.global || j$.getGlobal();

+    var totalSpecsDefined = 0;
+
    var catchExceptions = true;

    var realSetTimeout = j$.getGlobal().setTimeout;
@@ -385,9 +388,10 @@ getJasmineRequireObj().Env = function(j$) {

    var spies = [];

-    this.currentSpec = null;
+    var currentSpec = null;
+    var currentSuite = null;

-    this.reporter = new j$.ReportDispatcher([
+    var reporter = new j$.ReportDispatcher([
      "jasmineStarted",
      "jasmineDone",
      "suiteStarted",
@@ -396,14 +400,11 @@ getJasmineRequireObj().Env = function(j$) {
      "specDone"
    ]);

-    this.lastUpdate = 0;
    this.specFilter = function() {
      return true;
    };

-    this.nextSpecId_ = 0;
-    this.nextSuiteId_ = 0;
-    this.equalityTesters_ = [];
+    var equalityTesters = [];

    var customEqualityTesters = [];
    this.addCustomEqualityTester = function(tester) {
@@ -412,6 +413,16 @@ getJasmineRequireObj().Env = function(j$) {

    j$.Expectation.addCoreMatchers(j$.matchers);

+    var nextSpecId = 0;
+    var getNextSpecId = function() {
+      return 'spec' + nextSpecId++;
+    };
+
+    var nextSuiteId = 0;
+    var getNextSuiteId = function() {
+      return 'suite' + nextSuiteId++;
+    };
+
    var expectationFactory = function(actual, spec) {
      return j$.Expectation.Factory({
        util: j$.matchersUtil,
@@ -426,32 +437,34 @@ getJasmineRequireObj().Env = function(j$) {
    };

    var specStarted = function(spec) {
-      self.currentSpec = spec;
-      self.reporter.specStarted(spec.result);
+      currentSpec = spec;
+      reporter.specStarted(spec.result);
    };

-    var beforeFns = function(currentSuite) {
+    var beforeFns = function(suite) {
      return function() {
        var befores = [];
-        for (var suite = currentSuite; suite; suite = suite.parentSuite) {
+        while(suite) {
          befores = befores.concat(suite.beforeFns);
+          suite = suite.parentSuite;
        }
        return befores.reverse();
      };
    };

-    var afterFns = function(currentSuite) {
+    var afterFns = function(suite) {
      return function() {
        var afters = [];
-        for (var suite = currentSuite; suite; suite = suite.parentSuite) {
+        while(suite) {
          afters = afters.concat(suite.afterFns);
+          suite = suite.parentSuite;
        }
        return afters;
      };
    };

-    var getSpecName = function(spec, currentSuite) {
-      return currentSuite.getFullName() + ' ' + spec.description;
+    var getSpecName = function(spec, suite) {
+      return suite.getFullName() + ' ' + spec.description;
    };

    // TODO: we may just be able to pass in the fn instead of wrapping here
@@ -474,10 +487,6 @@ getJasmineRequireObj().Env = function(j$) {
      return catchExceptions;
    };

-    this.catchException = function(e) {
-      return j$.Spec.isPendingSpecException(e) || catchExceptions;
-    };
-
    var maximumSpecCallbackDepth = 20;
    var currentSpecCallbackDepth = 0;

@@ -491,19 +500,136 @@ getJasmineRequireObj().Env = function(j$) {
      }
    }

+    var catchException = function(e) {
+      return j$.Spec.isPendingSpecException(e) || catchExceptions;
+    };
+
    var queueRunnerFactory = function(options) {
-      options.catchException = self.catchException;
+      options.catchException = catchException;
      options.clearStack = options.clearStack || clearStack;

      new j$.QueueRunner(options).execute();
    };

-    var totalSpecsDefined = 0;
-    this.specFactory = function(description, fn, suite) {
+    var topSuite = new j$.Suite({
+      env: this,
+      id: getNextSuiteId(),
+      description: 'Jasmine__TopLevel__Suite',
+      queueRunner: queueRunnerFactory,
+      resultCallback: function() {} // TODO - hook this up
+    });
+    runnableLookupTable[topSuite.id] = topSuite;
+    currentSuite = topSuite;
+
+    this.topSuite = function() {
+      return topSuite;
+    };
+
+    this.execute = function(runnablesToRun) {
+      runnablesToRun = runnablesToRun || [topSuite.id];
+
+      var allFns = [];
+      for(var i = 0; i < runnablesToRun.length; i++) {
+        var runnable = runnableLookupTable[runnablesToRun[i]];
+        allFns.push((function(runnable) { return function(done) { runnable.execute(done); }; })(runnable));
+      }
+
+      reporter.jasmineStarted({
+        totalSpecsDefined: totalSpecsDefined
+      });
+
+      queueRunnerFactory({fns: allFns, onComplete: reporter.jasmineDone});
+    };
+
+    this.addReporter = function(reporterToAdd) {
+      reporter.addReporter(reporterToAdd);
+    };
+
+    this.addMatchers = function(matchersToAdd) {
+      j$.Expectation.addMatchers(matchersToAdd);
+    };
+
+    this.spyOn = function(obj, methodName) {
+      if (j$.util.isUndefined(obj)) {
+        throw new Error("spyOn could not find an object to spy upon for " + methodName + "()");
+      }
+
+      if (j$.util.isUndefined(obj[methodName])) {
+        throw new Error(methodName + '() method does not exist');
+      }
+
+      if (obj[methodName] && j$.isSpy(obj[methodName])) {
+        //TODO?: should this return the current spy? Downside: may cause user confusion about spy state
+        throw new Error(methodName + ' has already been spied upon');
+      }
+
+      var spy = j$.createSpy(methodName, obj[methodName]);
+
+      spies.push({
+        spy: spy,
+        baseObj: obj,
+        methodName: methodName,
+        originalValue: obj[methodName]
+      });
+
+      obj[methodName] = spy;
+
+      return spy;
+    };
+
+    var suiteFactory = function(description) {
+      var suite = new j$.Suite({
+        env: self,
+        id: getNextSuiteId(),
+        description: description,
+        parentSuite: currentSuite,
+        queueRunner: queueRunnerFactory,
+        onStart: suiteStarted,
+        resultCallback: function(attrs) {
+          reporter.suiteDone(attrs);
+        }
+      });
+
+      runnableLookupTable[suite.id] = suite;
+      return suite;
+    };
+
+    this.describe = function(description, specDefinitions) {
+      var suite = suiteFactory(description);
+
+      var parentSuite = currentSuite;
+      parentSuite.addChild(suite);
+      currentSuite = suite;
+
+      var declarationError = null;
+      try {
+        specDefinitions.call(suite);
+      } catch (e) {
+        declarationError = e;
+      }
+
+      if (declarationError) {
+        this.it("encountered a declaration exception", function() {
+          throw declarationError;
+        });
+      }
+
+      currentSuite = parentSuite;
+
+      return suite;
+    };
+
+    this.xdescribe = function(description, specDefinitions) {
+      var suite = this.describe(description, specDefinitions);
+      suite.disable();
+      return suite;
+    };
+
+    var specFactory = function(description, fn, suite) {
      totalSpecsDefined++;

      var spec = new j$.Spec({
-        id: self.nextSpecId(),
+        id: getNextSpecId(),
        beforeFns: beforeFns(suite),
        afterFns: afterFns(suite),
        expectationFactory: expectationFactory,
@@ -539,193 +665,45 @@ getJasmineRequireObj().Env = function(j$) {
      function specResultCallback(result) {
        removeAllSpies();
        j$.Expectation.resetMatchers();
-        customEqualityTesters.length = 0;
-        self.clock.uninstall();
-        self.currentSpec = null;
-        self.reporter.specDone(result);
+        customEqualityTesters = [];
+        currentSpec = null;
+        reporter.specDone(result);
      }
    };

    var suiteStarted = function(suite) {
-      self.reporter.suiteStarted(suite.result);
+      reporter.suiteStarted(suite.result);
    };

-    var suiteConstructor = j$.Suite;
-
-    this.topSuite = new j$.Suite({
-      env: this,
-      id: this.nextSuiteId(),
-      description: 'Jasmine__TopLevel__Suite',
-      queueRunner: queueRunnerFactory,
-      completeCallback: function() {}, // TODO - hook this up
-      resultCallback: function() {} // TODO - hook this up
-    });
-    runnableLookupTable[this.topSuite.id] = this.topSuite;
-    this.currentSuite = this.topSuite;
-
-    this.suiteFactory = function(description) {
-      var suite = new suiteConstructor({
-        env: self,
-        id: self.nextSuiteId(),
-        description: description,
-        parentSuite: self.currentSuite,
-        queueRunner: queueRunnerFactory,
-        onStart: suiteStarted,
-        resultCallback: function(attrs) {
-          self.reporter.suiteDone(attrs);
-        }
-      });
-
-      runnableLookupTable[suite.id] = suite;
-      return suite;
+    this.it = function(description, fn) {
+      var spec = specFactory(description, fn, currentSuite);
+      currentSuite.addChild(spec);
+      return spec;
    };

-    this.execute = function(runnablesToRun) {
-      runnablesToRun = runnablesToRun || [this.topSuite.id];
-
-      var allFns = [];
-      for(var i = 0; i < runnablesToRun.length; i++) {
-        var runnable = runnableLookupTable[runnablesToRun[i]];
-        allFns.push((function(runnable) { return function(done) { runnable.execute(done); }; })(runnable));
-      }
-
-      this.reporter.jasmineStarted({
-        totalSpecsDefined: totalSpecsDefined
-      });
-
-      queueRunnerFactory({fns: allFns, onComplete: this.reporter.jasmineDone});
+    this.xit = function(description, fn) {
+      var spec = this.it(description, fn);
+      spec.pend();
+      return spec;
    };

-    this.spyOn = function(obj, methodName) {
-      if (j$.util.isUndefined(obj)) {
-        throw new Error("spyOn could not find an object to spy upon for " + methodName + "()");
-      }
+    this.expect = function(actual) {
+      return currentSpec.expect(actual);
+    };

-      if (j$.util.isUndefined(obj[methodName])) {
-        throw new Error(methodName + '() method does not exist');
-      }
+    this.beforeEach = function(beforeEachFunction) {
+      currentSuite.beforeEach(beforeEachFunction);
+    };

-      if (obj[methodName] && j$.isSpy(obj[methodName])) {
-        //TODO?: should this return the current spy? Downside: may cause user confusion about spy state
-        throw new Error(methodName + ' has already been spied upon');
-      }
+    this.afterEach = function(afterEachFunction) {
+      currentSuite.afterEach(afterEachFunction);
+    };

-      var spy = j$.createSpy(methodName, obj[methodName]);
-
-      spies.push({
-        spy: spy,
-        baseObj: obj,
-        methodName: methodName,
-        originalValue: obj[methodName]
-      });
-
-      obj[methodName] = spy;
-
-      return spy;
+    this.pending = function() {
+      throw j$.Spec.pendingSpecExceptionMessage;
    };
  }

-  Env.prototype.addMatchers = function(matchersToAdd) {
-    j$.Expectation.addMatchers(matchersToAdd);
-  };
-
-  Env.prototype.version = function() {
-    return j$.version;
-  };
-
-  Env.prototype.expect = function(actual) {
-    return this.currentSpec.expect(actual);
-  };
-
-
-  // TODO: move this to closure
-  Env.prototype.versionString = function() {
-    console.log("DEPRECATED == use j$.version");
-    return j$.version;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.nextSpecId = function() {
-    return 'spec' + this.nextSpecId_++;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.nextSuiteId = function() {
-    return 'suite' + this.nextSuiteId_++;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.addReporter = function(reporter) {
-    this.reporter.addReporter(reporter);
-  };
-
-  // TODO: move this to closure
-  Env.prototype.describe = function(description, specDefinitions) {
-    var suite = this.suiteFactory(description);
-
-    var parentSuite = this.currentSuite;
-    parentSuite.addSuite(suite);
-    this.currentSuite = suite;
-
-    var declarationError = null;
-    try {
-      specDefinitions.call(suite);
-    } catch (e) {
-      declarationError = e;
-    }
-
-    if (declarationError) {
-      this.it("encountered a declaration exception", function() {
-        throw declarationError;
-      });
-    }
-
-    this.currentSuite = parentSuite;
-
-    return suite;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.xdescribe = function(description, specDefinitions) {
-    var suite = this.describe(description, specDefinitions);
-    suite.disable();
-    return suite;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.it = function(description, fn) {
-    var spec = this.specFactory(description, fn, this.currentSuite);
-    this.currentSuite.addSpec(spec);
-    return spec;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.xit = function(description, fn) {
-    var spec = this.it(description, fn);
-    spec.pend();
-    return spec;
-  };
-
-  // TODO: move this to closure
-  Env.prototype.beforeEach = function(beforeEachFunction) {
-    this.currentSuite.beforeEach(beforeEachFunction);
-  };
-
-  // TODO: move this to closure
-  Env.prototype.afterEach = function(afterEachFunction) {
-    this.currentSuite.afterEach(afterEachFunction);
-  };
-
-  // TODO: move this to closure
-  Env.prototype.pending = function() {
-    throw j$.Spec.pendingSpecExceptionMessage;
-  };
-
-  // TODO: Still needed?
-  Env.prototype.currentRunner = function() {
-    return this.topSuite;
-  };
-
  return Env;
 };

@@ -839,6 +817,7 @@ getJasmineRequireObj().Any = function() {

  return Any;
 };
+
 getJasmineRequireObj().CallTracker = function() {

  function CallTracker() {
@@ -905,7 +884,8 @@ getJasmineRequireObj().Clock = function() {
        setInterval: setInterval,
        clearInterval: clearInterval
      },
-      installed = false;
+      installed = false,
+      timer;

    self.install = function() {
      replace(global, fakeTimingFunctions);
@@ -960,8 +940,6 @@ getJasmineRequireObj().Clock = function() {

    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 !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
    }

@@ -1163,12 +1141,21 @@ getJasmineRequireObj().Expectation = function() {

      args.unshift(this.actual);

-      var result = matcherFactory(this.util, this.customEqualityTesters).compare.apply(null, args);
+      var matcher = matcherFactory(this.util, this.customEqualityTesters),
+          matcherCompare = matcher.compare;
+
+      function defaultNegativeCompare() {
+        var result = matcher.compare.apply(null, args);
+        result.pass = !result.pass;
+        return result;
+      }

      if (this.isNot) {
-        result.pass = !result.pass;
+        matcherCompare = matcher.negativeCompare || defaultNegativeCompare;
      }

+      var result = matcherCompare.apply(null, args);
+
      if (!result.pass) {
        if (!result.message) {
          args.unshift(this.isNot);
@@ -1364,8 +1351,8 @@ getJasmineRequireObj().pp = function(j$) {

  PrettyPrinter.prototype.iterateObject = function(obj, fn) {
    for (var property in obj) {
-      if (!obj.hasOwnProperty(property)) continue;
-      if (property == '__Jasmine_been_here_before__') continue;
+      if (!obj.hasOwnProperty(property)) { continue; }
+      if (property == '__Jasmine_been_here_before__') { continue; }
      fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) &&
          obj.__lookupGetter__(property) !== null) : false);
    }
@@ -1522,11 +1509,11 @@ getJasmineRequireObj().ReportDispatcher = function() {

    for (var i = 0; i < dispatchedMethods.length; i++) {
      var method = dispatchedMethods[i];
-      this[method] = function(m) {
+      this[method] = (function(m) {
        return function() {
          dispatch(m, arguments);
        };
-      }(method);
+      }(method));
    }

    var reporters = [];
@@ -1610,7 +1597,6 @@ getJasmineRequireObj().Suite = function() {
    this.parentSuite = attrs.parentSuite;
    this.description = attrs.description;
    this.onStart = attrs.onStart || function() {};
-    this.completeCallback = attrs.completeCallback || function() {}; // TODO: this is unused
    this.resultCallback = attrs.resultCallback || function() {};
    this.clearStack = attrs.clearStack || function(fn) {fn();};

@@ -1619,9 +1605,7 @@ getJasmineRequireObj().Suite = function() {
    this.queueRunner = attrs.queueRunner || function() {};
    this.disabled = false;

-    this.children_ = []; // TODO: rename
-    this.suites = []; // TODO: needed?
-    this.specs = [];  // TODO: needed?
+    this.children = [];

    this.result = {
      id: this.id,
@@ -1653,19 +1637,8 @@ getJasmineRequireObj().Suite = function() {
    this.afterFns.unshift(fn);
  };

-  Suite.prototype.addSpec = function(spec) {
-    this.children_.push(spec);
-    this.specs.push(spec);   // TODO: needed?
-  };
-
-  Suite.prototype.addSuite = function(suite) {
-    suite.parentSuite = this;
-    this.children_.push(suite);
-    this.suites.push(suite);    // TODO: needed?
-  };
-
-  Suite.prototype.children = function() {
-    return this.children_;
+  Suite.prototype.addChild = function(child) {
+    this.children.push(child);
  };

  Suite.prototype.execute = function(onComplete) {
@@ -1675,11 +1648,10 @@ getJasmineRequireObj().Suite = function() {
      return;
    }

-    var allFns = [],
-      children = this.children_;
+    var allFns = [];

-    for (var i = 0; i < children.length; i++) {
-      allFns.push(wrapChildAsAsync(children[i]));
+    for (var i = 0; i < this.children.length; i++) {
+      allFns.push(wrapChildAsAsync(this.children[i]));
    }

    this.onStart(this);
@@ -1701,7 +1673,7 @@ getJasmineRequireObj().Suite = function() {
      return function(done) { child.execute(done); };
    }
  };
-  
+
  return Suite;
 };

@@ -1727,6 +1699,7 @@ getJasmineRequireObj().Timer = function() {

  return Timer;
 };
+
 getJasmineRequireObj().matchersUtil = function(j$) {
  // TODO: what to do about jasmine.pp not being inject? move to JSON.stringify? gut PrettyPrinter?

@@ -1766,7 +1739,9 @@ getJasmineRequireObj().matchersUtil = function(j$) {

      if (expected.length > 0) {
        for (var i = 0; i < expected.length; i++) {
-          if (i > 0) message += ",";
+          if (i > 0) {
+            message += ",";
+          }
          message += " " + j$.pp(expected[i]);
        }
      }
@@ -1814,11 +1789,11 @@ getJasmineRequireObj().matchersUtil = function(j$) {

    // Identical objects are equal. `0 === -0`, but they aren't identical.
    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    if (a === b) { return a !== 0 || 1 / a == 1 / b; }
    // A strict comparison is necessary because `null == undefined`.
-    if (a === null || b === null) return a === b;
+    if (a === null || b === null) { return a === b; }
    var className = Object.prototype.toString.call(a);
-    if (className != Object.prototype.toString.call(b)) return false;
+    if (className != Object.prototype.toString.call(b)) { return false; }
    switch (className) {
      // Strings, numbers, dates, and booleans are compared by value.
      case '[object String]':
@@ -1842,14 +1817,14 @@ getJasmineRequireObj().matchersUtil = function(j$) {
          a.multiline == b.multiline &&
          a.ignoreCase == b.ignoreCase;
    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
+    if (typeof a != 'object' || typeof b != 'object') { return false; }
    // Assume equality for cyclic structures. The algorithm for detecting cyclic
    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
    var length = aStack.length;
    while (length--) {
      // Linear search. Performance is inversely proportional to the number of
      // unique nested structures.
-      if (aStack[length] == a) return bStack[length] == b;
+      if (aStack[length] == a) { return bStack[length] == b; }
    }
    // Add the first object to the stack of traversed objects.
    aStack.push(a);
@@ -1863,7 +1838,7 @@ getJasmineRequireObj().matchersUtil = function(j$) {
      if (result) {
        // Deep compare the contents, ignoring non-numeric properties.
        while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack, customTesters))) break;
+          if (!(result = eq(a[size], b[size], aStack, bStack, customTesters))) { break; }
        }
      }
    } else {
@@ -1880,13 +1855,13 @@ getJasmineRequireObj().matchersUtil = function(j$) {
          // Count the expected number of properties.
          size++;
          // Deep compare each member.
-          if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) break;
+          if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) { break; }
        }
      }
      // Ensure that both objects contain the same number of properties.
      if (result) {
        for (key in b) {
-          if (has(b, key) && !(size--)) break;
+          if (has(b, key) && !(size--)) { break; }
        }
        result = !size;
      }
@@ -2388,5 +2363,5 @@ getJasmineRequireObj().toThrowError = function(j$) {
 };

 getJasmineRequireObj().version = function() {
-  return "2.0.0-rc3";
-};
+  return "2.0.0-rc5";
+};
--- a/lib/jasmine-core/version.rb
+++ b/lib/jasmine-core/version.rb
@@ -4,6 +4,6 @@
 #
 module Jasmine
  module Core
-    VERSION = "2.0.0.rc3"
+    VERSION = "2.0.0.rc5"
  end
 end
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jasmine-core",
  "license": "MIT",
-  "version": "2.0.0-rc3",
+  "version": "2.0.0-rc5",
  "devDependencies": {
    "grunt": "~0.4.1",
    "grunt-contrib-jshint": "~0.7.0",