Fix cp command for release documentation

version bump to 2.3.0
Merge pull request #827 from davetron5000/patch-1
2015-04-28 11:27:03 -07:00 · 2015-04-28 10:13:42 -07:00 · 2015-04-19 10:03:19 -07:00 · 2015-04-19 12:22:33 -04:00 · 2015-04-09 15:38:24 -07:00 · 2015-04-05 21:56:59 -07:00
48 changed files with 2537 additions and 773 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby

 sudo: false

-rvm: 1.9.3
+rvm: 2.2.0

 script: $TEST_COMMAND

@@ -22,6 +22,14 @@ matrix:
    - env:
      - USE_SAUCE=false
      - TEST_COMMAND="bash travis-node-script.sh"
+    - env:
+      - JASMINE_BROWSER="safari"
+      - SAUCE_OS="OS X 10.10"
+      - SAUCE_BROWSER_VERSION=8
+    - env:
+      - JASMINE_BROWSER="safari"
+      - SAUCE_OS="OS X 10.9"
+      - SAUCE_BROWSER_VERSION=7
    - env:
      - JASMINE_BROWSER="safari"
      - SAUCE_OS="OS X 10.8"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,23 +1,28 @@
 # Developing for Jasmine Core

-We welcome your contributions - Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists (the main group - [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js) and the developer's list - [http://groups.google.com/group/jasmine-js-dev](http://groups.google.com/group/jasmine-js-dev)) before starting work - what you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
+We welcome your contributions! Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists before starting work.  What you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
+
+## Links
+
+- [Jasmine Google Group](http://groups.google.com/group/jasmine-js)
+- [Jasmine-dev Google Group](http://groups.google.com/group/jasmine-js-dev)
+- [Jasmine on PivotalTracker](https://www.pivotaltracker.com/n/projects/10606)

 ## General Workflow

 Please submit pull requests via feature branches using the semi-standard workflow of:

-1. Fork it
-1. Clone your fork: (`git clone git@github.com:yourUserName/jasmine.git`)                                                                                                                         
-1. Change directory: (`cd jasmine`)                                                                                                                                                               
-1. Assign original repository to a remote named 'upstream': (`git remote add                                                                                                                       
-upstream https://github.com/jasmine/jasmine.git`)                                                                                                                                                 
-1. Pull in changes not present in your local repository: (`git fetch upstream`)
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
+```bash
+git clone git@github.com:yourUserName/jasmine.git              # Clone your fork
+cd jasmine                                                     # Change directory
+git remote add upstream https://github.com/jasmine/jasmine.git # Assign original repository to a remote named 'upstream'
+git fetch upstream                                             # Pull in changes not present in your local repository
+git checkout -b my-new-feature                                 # Create your feature branch
+git commit -am 'Add some feature'                              # Commit your changes
+git push origin my-new-feature                                 # Push to the branch
+```

-We favor pull requests with very small, single commits with a single purpose.
+Once you've pushed a feature branch to your forked repo, you're ready to open a pull request. We favor pull requests with very small, single commits with a single purpose.

 ## Background

@@ -118,8 +123,8 @@ Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to

 ## Submitting a Pull Request
 1. Revert your changes to `jasmine.js` and `jasmine-html.js`
-  * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches.
-1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master.
+  * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches
+1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master

 Note that we use Travis for Continuous Integration. We only accept green pull requests.

--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,6 @@ module.exports = function(grunt) {
  grunt.registerTask('default', ['jshint:all']);

  var version = require('./grunt/tasks/version.js');
-  var standaloneBuilder = require('./grunt/tasks/build_standalone.js');

  grunt.registerTask('build:copyVersionToGem',
    "Propagates the version from package.json to version.rb",
@@ -43,10 +42,8 @@ module.exports = function(grunt) {
          jasmine = new Jasmine({jasmineCore: jasmineCore});

      jasmine.loadConfigFile('./spec/support/jasmine.json');
-      jasmine.configureDefaultReporter({
-        onComplete: function(passed) {
-          done(passed);
-        }
+      jasmine.onComplete(function(passed) {
+        done(passed);
      });

      jasmine.execute();
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<a name="README">[<img src="https://rawgithub.com/jasmine/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> 
+<a name="README">[<img src="https://rawgithub.com/jasmine/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a>

 [![Build Status](https://travis-ci.org/jasmine/jasmine.png?branch=master)](https://travis-ci.org/jasmine/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine)

@@ -39,7 +39,7 @@ To install Jasmine on your local box:
 Add the following to your HTML file:

    <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-2.0.0/jasmine_favicon.png">
-    <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-2.0.0/jasmine.css"> 
+    <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-2.0.0/jasmine.css">

    <script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/jasmine.js"></script>
    <script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/jasmine-html.js"></script>
@@ -68,4 +68,4 @@ Jasmine tests itself across many browsers (Safari, Chrome, Firefox, PhantomJS, a
 * [Christian Williams](mailto:antixian666@gmail.com), Cloud Foundry
 * Sheel Choksi

-Copyright (c) 2008-2014 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2015 Pivotal Labs. This software is licensed under the MIT License.
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -37,8 +37,6 @@ When ready to release - specs are all green and the stories are done:
 ### Build standalone distribution

 1. Build the standalone distribution with `grunt buildStandaloneDist`
-1. Make sure you add the new ZIP file to git
- 1. Should we still do this? Given we want to use github releases...

 ### Release the Python egg

@@ -61,7 +59,7 @@ When ready to release - specs are all green and the stories are done:

 Probably only need to do this when releasing a minor version, and not a patch version.

-1. `cp edge ${version}` to copy the current edge docs to the new version
+1. `cp -R edge ${version}` to copy the current edge docs to the new version
 1. Add a link to the new version in `index.html`

 ### Finally
--- a/bower.json
+++ b/bower.json
@@ -1,17 +1,20 @@
 {
  "name": "jasmine-core",
-  "version": "2.2.0",
+  "version": "2.3.0",
  "homepage": "http://jasmine.github.io",
  "authors": [
    "slackersoft <gregg@slackersoft.net>"
  ],
  "description": "Official packaging of Jasmine's core files",
  "keywords": [
+    "test",
    "jasmine",
+    "tdd",
    "bdd"
  ],
  "license": "MIT",
  "moduleType": "globals",
+  "main": "lib/jasmine-core.js",
  "ignore": [
    "**/.*",
    "dist",
@@ -27,7 +30,7 @@
    "jasmine-core.gemspec",
    "*.sh",
    "*.py",
-    "Gruntfile.js"
+    "Gruntfile.js",
    "lib/jasmine-core.rb",
    "lib/jasmine-core/boot/",
    "lib/jasmine-core/spec",
--- a/lib/jasmine-core/boot.js
+++ b/lib/jasmine-core/boot.js
@@ -57,13 +57,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  var jasmineInterface = jasmineRequire.interface(jasmine, env);

  /**
-   * Add all of the Jasmine global/public interface to the proper global, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
+   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
   */
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
+  extend(window, jasmineInterface);

  /**
   * ## Runner Parameters
@@ -78,6 +74,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  var catchingExceptions = queryString.getParam("catch");
  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);

+  var throwingExpectationFailures = queryString.getParam("throwFailures");
+  env.throwOnExpectationFailure(throwingExpectationFailures);
+
  /**
   * ## Reporters
   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
@@ -85,6 +84,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  var htmlReporter = new jasmine.HtmlReporter({
    env: env,
    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
    getContainer: function() { return document.body; },
    createElement: function() { return document.createElement.apply(document, arguments); },
--- a/lib/jasmine-core/boot/boot.js
+++ b/lib/jasmine-core/boot/boot.js
@@ -35,13 +35,9 @@
  var jasmineInterface = jasmineRequire.interface(jasmine, env);

  /**
-   * Add all of the Jasmine global/public interface to the proper global, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
+   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
   */
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
+  extend(window, jasmineInterface);

  /**
   * ## Runner Parameters
@@ -56,6 +52,9 @@
  var catchingExceptions = queryString.getParam("catch");
  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);

+  var throwingExpectationFailures = queryString.getParam("throwFailures");
+  env.throwOnExpectationFailure(throwingExpectationFailures);
+
  /**
   * ## Reporters
   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
@@ -63,6 +62,7 @@
  var htmlReporter = new jasmine.HtmlReporter({
    env: env,
    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
    getContainer: function() { return document.body; },
    createElement: function() { return document.createElement.apply(document, arguments); },
--- a/lib/jasmine-core/example/spec/SpecHelper.js
+++ b/lib/jasmine-core/example/spec/SpecHelper.js
@@ -7,7 +7,7 @@ beforeEach(function () {

          return {
            pass: player.currentlyPlayingSong === expected && player.isPlaying
-          }
+          };
        }
      };
    }
--- a/lib/jasmine-core/jasmine-html.js
+++ b/lib/jasmine-core/jasmine-html.js
@@ -40,6 +40,7 @@ jasmineRequire.HtmlReporter = function(j$) {
      createElement = options.createElement,
      createTextNode = options.createTextNode,
      onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {},
+      onThrowExpectationsClick = options.onThrowExpectationsClick || function() {},
      addToExistingQueryString = options.addToExistingQueryString || defaultQueryString,
      timer = options.timer || noopTimer,
      results = [],
@@ -145,22 +146,51 @@ jasmineRequire.HtmlReporter = function(j$) {

    this.jasmineDone = function() {
      var banner = find('.banner');
-      banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));
-
      var alert = find('.alert');
+      alert.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));

-      alert.appendChild(createDom('span', { className: 'exceptions' },
-        createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'),
-        createDom('input', {
-          className: 'raise',
-          id: 'raise-exceptions',
-          type: 'checkbox'
-        })
-      ));
-      var checkbox = find('#raise-exceptions');
+      banner.appendChild(
+        createDom('div', { className: 'run-options' },
+          createDom('span', { className: 'trigger' }, 'Options'),
+          createDom('div', { className: 'payload' },
+            createDom('div', { className: 'exceptions' },
+              createDom('input', {
+                className: 'raise',
+                id: 'raise-exceptions',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions')),
+            createDom('div', { className: 'throw-failures' },
+              createDom('input', {
+                className: 'throw',
+                id: 'throw-failures',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'label', 'for': 'throw-failures' }, 'stop spec on expectation failure'))
+          )
+        ));

-      checkbox.checked = !env.catchingExceptions();
-      checkbox.onclick = onRaiseExceptionsClick;
+      var raiseCheckbox = find('#raise-exceptions');
+
+      raiseCheckbox.checked = !env.catchingExceptions();
+      raiseCheckbox.onclick = onRaiseExceptionsClick;
+
+      var throwCheckbox = find('#throw-failures');
+      throwCheckbox.checked = env.throwingExpectationFailures();
+      throwCheckbox.onclick = onThrowExpectationsClick;
+
+      var optionsMenu = find('.run-options'),
+          optionsTrigger = optionsMenu.querySelector('.trigger'),
+          optionsPayload = optionsMenu.querySelector('.payload'),
+          isOpen = /\bopen\b/;
+
+      optionsTrigger.onclick = function() {
+        if (isOpen.test(optionsPayload.className)) {
+          optionsPayload.className = optionsPayload.className.replace(isOpen, '');
+        } else {
+          optionsPayload.className += ' open';
+        }
+      };

      if (specsExecuted < totalSpecsDefined) {
        var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
--- a/lib/jasmine-core/jasmine.css
+++ b/lib/jasmine-core/jasmine.css
--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -42,7 +42,8 @@ var getJasmineRequireObj = (function (jasmineGlobal) {

    jRequire.base(j$, jasmineGlobal);
    j$.util = jRequire.util();
-    j$.Any = jRequire.Any();
+    j$.errors = jRequire.errors();
+    j$.Any = jRequire.Any(j$);
    j$.Anything = jRequire.Anything(j$);
    j$.CallTracker = jRequire.CallTracker();
    j$.MockDate = jRequire.MockDate();
@@ -63,8 +64,9 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.SpyRegistry = jRequire.SpyRegistry(j$);
    j$.SpyStrategy = jRequire.SpyStrategy();
    j$.StringMatching = jRequire.StringMatching(j$);
-    j$.Suite = jRequire.Suite();
+    j$.Suite = jRequire.Suite(j$);
    j$.Timer = jRequire.Timer();
+    j$.TreeProcessor = jRequire.TreeProcessor();
    j$.version = jRequire.version();

    j$.matchers = jRequire.requireMatchers(jRequire, j$);
@@ -302,6 +304,7 @@ getJasmineRequireObj().Spec = function(j$) {
    this.expectationResultFactory = attrs.expectationResultFactory || function() { };
    this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
    this.catchingExceptions = attrs.catchingExceptions || function() { return true; };
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;

    if (!this.queueableFn.fn) {
      this.pend();
@@ -317,12 +320,16 @@ getJasmineRequireObj().Spec = function(j$) {
    };
  }

-  Spec.prototype.addExpectationResult = function(passed, data) {
+  Spec.prototype.addExpectationResult = function(passed, data, isError) {
    var expectationResult = this.expectationResultFactory(data);
    if (passed) {
      this.result.passedExpectations.push(expectationResult);
    } else {
      this.result.failedExpectations.push(expectationResult);
+
+      if (this.throwOnExpectationFailure && !isError) {
+        throw new j$.errors.ExpectationFailed();
+      }
    }
  };

@@ -330,13 +337,13 @@ getJasmineRequireObj().Spec = function(j$) {
    return this.expectationFactory(actual, this);
  };

-  Spec.prototype.execute = function(onComplete) {
+  Spec.prototype.execute = function(onComplete, enabled) {
    var self = this;

    this.onStart(this);

-    if (this.markedPending || this.disabled) {
-      complete();
+    if (!this.isExecutable() || enabled === false) {
+      complete(enabled);
      return;
    }

@@ -350,8 +357,8 @@ getJasmineRequireObj().Spec = function(j$) {
      userContext: this.userContext()
    });

-    function complete() {
-      self.result.status = self.status();
+    function complete(enabledAgain) {
+      self.result.status = self.status(enabledAgain);
      self.resultCallback(self.result);

      if (onComplete) {
@@ -366,13 +373,17 @@ getJasmineRequireObj().Spec = function(j$) {
      return;
    }

+    if (e instanceof j$.errors.ExpectationFailed) {
+      return;
+    }
+
    this.addExpectationResult(false, {
      matcherName: '',
      passed: false,
      expected: '',
      actual: '',
      error: e
-    });
+    }, true);
  };

  Spec.prototype.disable = function() {
@@ -386,8 +397,13 @@ getJasmineRequireObj().Spec = function(j$) {
    }
  };

-  Spec.prototype.status = function() {
-    if (this.disabled) {
+  Spec.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
+  };
+
+  Spec.prototype.status = function(enabled) {
+    if (this.disabled || enabled === false) {
      return 'disabled';
    }

@@ -444,7 +460,7 @@ getJasmineRequireObj().Env = function(j$) {

    var realSetTimeout = j$.getGlobal().setTimeout;
    var realClearTimeout = j$.getGlobal().clearTimeout;
-    this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler(), new j$.MockDate(global));
+    this.clock = new j$.Clock(global, function () { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));

    var runnableLookupTable = {};
    var runnableResources = {};
@@ -452,6 +468,7 @@ getJasmineRequireObj().Env = function(j$) {
    var currentSpec = null;
    var currentlyExecutingSuites = [];
    var currentDeclarationSuite = null;
+    var throwOnExpectationFailure = false;

    var currentSuite = function() {
      return currentlyExecutingSuites[currentlyExecutingSuites.length - 1];
@@ -533,27 +550,21 @@ getJasmineRequireObj().Env = function(j$) {
        delete runnableResources[id];
    };

-    var beforeAndAfterFns = function(suite, runnablesExplictlySet) {
+    var beforeAndAfterFns = function(suite) {
      return function() {
        var befores = [],
-          afters = [],
-          beforeAlls = [],
-          afterAlls = [];
+          afters = [];

        while(suite) {
          befores = befores.concat(suite.beforeFns);
          afters = afters.concat(suite.afterFns);

-          if (runnablesExplictlySet()) {
-            beforeAlls = beforeAlls.concat(suite.beforeAllFns);
-            afterAlls = afterAlls.concat(suite.afterAllFns);
-          }
-
          suite = suite.parentSuite;
        }
+
        return {
-          befores: beforeAlls.reverse().concat(befores.reverse()),
-          afters: afters.concat(afterAlls)
+          befores: befores.reverse(),
+          afters: afters
        };
      };
    };
@@ -599,10 +610,18 @@ getJasmineRequireObj().Env = function(j$) {
      return j$.Spec.isPendingSpecException(e) || catchExceptions;
    };

+    this.throwOnExpectationFailure = function(value) {
+      throwOnExpectationFailure = !!value;
+    };
+
+    this.throwingExpectationFailures = function() {
+      return throwOnExpectationFailure;
+    };
+
    var queueRunnerFactory = function(options) {
      options.catchException = catchException;
      options.clearStack = options.clearStack || clearStack;
-      options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
+      options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
      options.fail = self.fail;

      new j$.QueueRunner(options).execute();
@@ -623,26 +642,40 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.execute = function(runnablesToRun) {
-      if(runnablesToRun) {
-        runnablesExplictlySet = true;
-      } else if (focusedRunnables.length) {
-        runnablesExplictlySet = true;
-        runnablesToRun = focusedRunnables;
-      } else {
-        runnablesToRun = [topSuite.id];
+      if(!runnablesToRun) {
+        if (focusedRunnables.length) {
+          runnablesToRun = focusedRunnables;
+        } else {
+          runnablesToRun = [topSuite.id];
+        }
      }
+      var processor = new j$.TreeProcessor({
+        tree: topSuite,
+        runnableIds: runnablesToRun,
+        queueRunnerFactory: queueRunnerFactory,
+        nodeStart: function(suite) {
+          currentlyExecutingSuites.push(suite);
+          defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
+          reporter.suiteStarted(suite.result);
+        },
+        nodeComplete: function(suite, result) {
+          if (!suite.disabled) {
+            clearResourcesForRunnable(suite.id);
+          }
+          currentlyExecutingSuites.pop();
+          reporter.suiteDone(result);
+        }
+      });

-      var allFns = [];
-      for(var i = 0; i < runnablesToRun.length; i++) {
-        var runnable = runnableLookupTable[runnablesToRun[i]];
-        allFns.push((function(runnable) { return { fn: function(done) { runnable.execute(done); } }; })(runnable));
+      if(!processor.processTree().valid) {
+        throw new Error('Invalid order: would cause a beforeAll or afterAll to be run multiple times');
      }

      reporter.jasmineStarted({
        totalSpecsDefined: totalSpecsDefined
      });

-      queueRunnerFactory({queueableFns: allFns, onComplete: reporter.jasmineDone});
+      processor.execute(reporter.jasmineDone);
    };

    this.addReporter = function(reporterToAdd) {
@@ -666,28 +699,13 @@ getJasmineRequireObj().Env = function(j$) {
        id: getNextSuiteId(),
        description: description,
        parentSuite: currentDeclarationSuite,
-        queueRunner: queueRunnerFactory,
-        onStart: suiteStarted,
        expectationFactory: expectationFactory,
        expectationResultFactory: expectationResultFactory,
-        runnablesExplictlySetGetter: runnablesExplictlySetGetter,
-        resultCallback: function(attrs) {
-          if (!suite.disabled) {
-            clearResourcesForRunnable(suite.id);
-          }
-          currentlyExecutingSuites.pop();
-          reporter.suiteDone(attrs);
-        }
+        throwOnExpectationFailure: throwOnExpectationFailure
      });

      runnableLookupTable[suite.id] = suite;
      return suite;
-
-      function suiteStarted(suite) {
-        currentlyExecutingSuites.push(suite);
-        defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
-        reporter.suiteStarted(suite.result);
-      }
    };

    this.describe = function(description, specDefinitions) {
@@ -759,17 +777,11 @@ getJasmineRequireObj().Env = function(j$) {
      }
    }

-    var runnablesExplictlySet = false;
-
-    var runnablesExplictlySetGetter = function(){
-      return runnablesExplictlySet;
-    };
-
    var specFactory = function(description, fn, suite, timeout) {
      totalSpecsDefined++;
      var spec = new j$.Spec({
        id: getNextSpecId(),
-        beforeAndAfterFns: beforeAndAfterFns(suite, runnablesExplictlySetGetter),
+        beforeAndAfterFns: beforeAndAfterFns(suite),
        expectationFactory: expectationFactory,
        resultCallback: specResultCallback,
        getSpecName: function(spec) {
@@ -783,7 +795,8 @@ getJasmineRequireObj().Env = function(j$) {
        queueableFn: {
          fn: fn,
          timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
-        }
+        },
+        throwOnExpectationFailure: throwOnExpectationFailure
      });

      runnableLookupTable[spec.id] = spec;
@@ -1023,7 +1036,7 @@ getJasmineRequireObj().CallTracker = function() {
 };

 getJasmineRequireObj().Clock = function() {
-  function Clock(global, delayedFunctionScheduler, mockDate) {
+  function Clock(global, delayedFunctionSchedulerFactory, mockDate) {
    var self = this,
      realTimingFunctions = {
        setTimeout: global.setTimeout,
@@ -1038,19 +1051,24 @@ getJasmineRequireObj().Clock = function() {
        clearInterval: clearInterval
      },
      installed = false,
+      delayedFunctionScheduler,
      timer;


    self.install = function() {
+      if(!originalTimingFunctionsIntact()) {
+        throw new Error('Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?');
+      }
      replace(global, fakeTimingFunctions);
      timer = fakeTimingFunctions;
+      delayedFunctionScheduler = delayedFunctionSchedulerFactory();
      installed = true;

      return self;
    };

    self.uninstall = function() {
-      delayedFunctionScheduler.reset();
+      delayedFunctionScheduler = null;
      mockDate.uninstall();
      replace(global, realTimingFunctions);

@@ -1058,6 +1076,15 @@ getJasmineRequireObj().Clock = function() {
      installed = false;
    };

+    self.withMock = function(closure) {
+      this.install();
+      try {
+        closure();
+      } finally {
+        this.uninstall();
+      }
+    };
+
    self.mockDate = function(initialDate) {
      mockDate.install(initialDate);
    };
@@ -1101,6 +1128,13 @@ getJasmineRequireObj().Clock = function() {

    return self;

+    function originalTimingFunctionsIntact() {
+      return global.setTimeout === realTimingFunctions.setTimeout &&
+        global.clearTimeout === realTimingFunctions.clearTimeout &&
+        global.setInterval === realTimingFunctions.setInterval &&
+        global.clearInterval === realTimingFunctions.clearInterval;
+    }
+
    function legacyIE() {
      //if these methods are polyfilled, apply will be present
      return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
@@ -1210,13 +1244,6 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
      }
    };

-    self.reset = function() {
-      currentTime = 0;
-      scheduledLookup = [];
-      scheduledFunctions = {};
-      delayedFnCount = 0;
-    };
-
    return self;

    function indexOfFirstToPass(array, testFn) {
@@ -1642,6 +1669,23 @@ getJasmineRequireObj().pp = function(j$) {
    if(array.length > length){
      this.append(', ...');
    }
+
+    var self = this;
+    var first = array.length === 0;
+    this.iterateObject(array, function(property, isGetter) {
+      if (property.match(/^\d+$/)) {
+        return;
+      }
+
+      if (first) {
+        first = false;
+      } else {
+        self.append(', ');
+      }
+
+      self.formatProperty(array, property, isGetter);
+    });
+
    this.append(' ]');
  };

@@ -1664,18 +1708,22 @@ getJasmineRequireObj().pp = function(j$) {
        self.append(', ');
      }

-      self.append(property);
-      self.append(': ');
-      if (isGetter) {
-        self.append('<getter>');
-      } else {
-        self.format(obj[property]);
-      }
+      self.formatProperty(obj, property, isGetter);
    });

    this.append(' })');
  };

+  StringPrettyPrinter.prototype.formatProperty = function(obj, property, isGetter) {
+      this.append(property);
+      this.append(': ');
+      if (isGetter) {
+        this.append('<getter>');
+      } else {
+        this.format(obj[property]);
+      }
+  };
+
  StringPrettyPrinter.prototype.append = function(value) {
    this.string += value;
  };
@@ -1706,7 +1754,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
    this.onException = attrs.onException || function() {};
    this.catchException = attrs.catchException || function() { return true; };
    this.userContext = attrs.userContext || {};
-    this.timer = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
+    this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
    this.fail = attrs.fail || function() {};
  }

@@ -1746,7 +1794,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {

    function attemptAsync(queueableFn) {
      var clearTimeout = function () {
-          Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeoutId]]);
+          Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
        },
        next = once(function () {
          clearTimeout(timeoutId);
@@ -1760,7 +1808,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      };

      if (queueableFn.timeout) {
-        timeoutId = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() {
+        timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
          var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');
          onException(error, queueableFn);
          next();
@@ -1938,24 +1986,20 @@ getJasmineRequireObj().SpyStrategy = function() {
  return SpyStrategy;
 };

-getJasmineRequireObj().Suite = function() {
+getJasmineRequireObj().Suite = function(j$) {
  function Suite(attrs) {
    this.env = attrs.env;
    this.id = attrs.id;
    this.parentSuite = attrs.parentSuite;
    this.description = attrs.description;
-    this.onStart = attrs.onStart || function() {};
-    this.resultCallback = attrs.resultCallback || function() {};
-    this.clearStack = attrs.clearStack || function(fn) {fn();};
    this.expectationFactory = attrs.expectationFactory;
    this.expectationResultFactory = attrs.expectationResultFactory;
-    this.runnablesExplictlySetGetter = attrs.runnablesExplictlySetGetter || function() {};
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;

    this.beforeFns = [];
    this.afterFns = [];
    this.beforeAllFns = [];
    this.afterAllFns = [];
-    this.queueRunner = attrs.queueRunner || function() {};
    this.disabled = false;

    this.children = [];
@@ -2018,51 +2062,17 @@ getJasmineRequireObj().Suite = function() {
    }
  };

-  Suite.prototype.execute = function(onComplete) {
-    var self = this;
-
-    this.onStart(this);
-
-    if (this.disabled) {
-      complete();
-      return;
-    }
-
-    var allFns = [];
-
-    for (var i = 0; i < this.children.length; i++) {
-      allFns.push(wrapChildAsAsync(this.children[i]));
-    }
-
-    if (this.isExecutable()) {
-      allFns = this.beforeAllFns.concat(allFns);
-      allFns = allFns.concat(this.afterAllFns);
-    }
-
-    this.queueRunner({
-      queueableFns: allFns,
-      onComplete: complete,
-      userContext: this.sharedUserContext(),
-      onException: function() { self.onException.apply(self, arguments); }
-    });
-
-    function complete() {
-      self.result.status = self.status();
-      self.resultCallback(self.result);
-
-      if (onComplete) {
-        onComplete();
-      }
-    }
-
-    function wrapChildAsAsync(child) {
-      return { fn: function(done) { child.execute(done); } };
-    }
+  Suite.prototype.isExecutable = function() {
+    return !this.disabled;
  };

-  Suite.prototype.isExecutable = function() {
-    var runnablesExplicitlySet = this.runnablesExplictlySetGetter();
-    return !runnablesExplicitlySet && hasExecutableChild(this.children);
+  Suite.prototype.canBeReentered = function() {
+    return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
+  };
+
+  Suite.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
  };

  Suite.prototype.sharedUserContext = function() {
@@ -2078,6 +2088,10 @@ getJasmineRequireObj().Suite = function() {
  };

  Suite.prototype.onException = function() {
+    if (arguments[0] instanceof j$.errors.ExpectationFailed) {
+      return;
+    }
+
    if(isAfterAll(this.children)) {
      var data = {
        matcherName: '',
@@ -2099,10 +2113,17 @@ getJasmineRequireObj().Suite = function() {
    if(isAfterAll(this.children) && isFailure(arguments)){
      var data = arguments[1];
      this.result.failedExpectations.push(this.expectationResultFactory(data));
+      if(this.throwOnExpectationFailure) {
+        throw new j$.errors.ExpectationFailed();
+      }
    } else {
      for (var i = 0; i < this.children.length; i++) {
        var child = this.children[i];
-        child.addExpectationResult.apply(child, arguments);
+        try {
+          child.addExpectationResult.apply(child, arguments);
+        } catch(e) {
+          // keep going
+        }
      }
    }
  };
@@ -2115,17 +2136,6 @@ getJasmineRequireObj().Suite = function() {
    return !args[0];
  }

-  function hasExecutableChild(children) {
-    var foundActive = false;
-    for (var i = 0; i < children.length; i++) {
-      if (children[i].isExecutable()) {
-        foundActive = true;
-        break;
-      }
-    }
-    return foundActive;
-  }
-
  function clone(obj) {
    var clonedObj = {};
    for (var prop in obj) {
@@ -2167,7 +2177,211 @@ getJasmineRequireObj().Timer = function() {
  return Timer;
 };

-getJasmineRequireObj().Any = function() {
+getJasmineRequireObj().TreeProcessor = function() {
+  function TreeProcessor(attrs) {
+    var tree = attrs.tree,
+        runnableIds = attrs.runnableIds,
+        queueRunnerFactory = attrs.queueRunnerFactory,
+        nodeStart = attrs.nodeStart || function() {},
+        nodeComplete = attrs.nodeComplete || function() {},
+        stats = { valid: true },
+        processed = false,
+        defaultMin = Infinity,
+        defaultMax = 1 - Infinity;
+
+    this.processTree = function() {
+      processNode(tree, false);
+      processed = true;
+      return stats;
+    };
+
+    this.execute = function(done) {
+      if (!processed) {
+        this.processTree();
+      }
+
+      if (!stats.valid) {
+        throw 'invalid order';
+      }
+
+      var childFns = wrapChildren(tree, 0);
+
+      queueRunnerFactory({
+        queueableFns: childFns,
+        onException: function() {
+          tree.onException.apply(tree, arguments);
+        },
+        onComplete: done
+      });
+    };
+
+    function runnableIndex(id) {
+      for (var i = 0; i < runnableIds.length; i++) {
+        if (runnableIds[i] === id) {
+          return i;
+        }
+      }
+    }
+
+    function processNode(node, parentEnabled) {
+      var executableIndex = runnableIndex(node.id);
+
+      if (executableIndex !== undefined) {
+        parentEnabled = true;
+      }
+
+      parentEnabled = parentEnabled && node.isExecutable();
+
+      if (!node.children) {
+        stats[node.id] = {
+          executable: parentEnabled && node.isExecutable(),
+          segments: [{
+            index: 0,
+            owner: node,
+            nodes: [node],
+            min: startingMin(executableIndex),
+            max: startingMax(executableIndex)
+          }]
+        };
+      } else {
+        var hasExecutableChild = false;
+
+        for (var i = 0; i < node.children.length; i++) {
+          var child = node.children[i];
+
+          processNode(child, parentEnabled);
+
+          if (!stats.valid) {
+            return;
+          }
+
+          var childStats = stats[child.id];
+
+          hasExecutableChild = hasExecutableChild || childStats.executable;
+        }
+
+        stats[node.id] = {
+          executable: hasExecutableChild
+        };
+
+        segmentChildren(node, stats[node.id], executableIndex);
+
+        if (!node.canBeReentered() && stats[node.id].segments.length > 1) {
+          stats = { valid: false };
+        }
+      }
+    }
+
+    function startingMin(executableIndex) {
+      return executableIndex === undefined ? defaultMin : executableIndex;
+    }
+
+    function startingMax(executableIndex) {
+      return executableIndex === undefined ? defaultMax : executableIndex;
+    }
+
+    function segmentChildren(node, nodeStats, executableIndex) {
+      var currentSegment = { index: 0, owner: node, nodes: [], min: startingMin(executableIndex), max: startingMax(executableIndex) },
+          result = [currentSegment],
+          lastMax = defaultMax,
+          orderedChildSegments = orderChildSegments(node.children);
+
+      function isSegmentBoundary(minIndex) {
+        return lastMax !== defaultMax && minIndex !== defaultMin && lastMax < minIndex - 1;
+      }
+
+      for (var i = 0; i < orderedChildSegments.length; i++) {
+        var childSegment = orderedChildSegments[i],
+          maxIndex = childSegment.max,
+          minIndex = childSegment.min;
+
+        if (isSegmentBoundary(minIndex)) {
+          currentSegment = {index: result.length, owner: node, nodes: [], min: defaultMin, max: defaultMax};
+          result.push(currentSegment);
+        }
+
+        currentSegment.nodes.push(childSegment);
+        currentSegment.min = Math.min(currentSegment.min, minIndex);
+        currentSegment.max = Math.max(currentSegment.max, maxIndex);
+        lastMax = maxIndex;
+      }
+
+      nodeStats.segments = result;
+    }
+
+    function orderChildSegments(children) {
+      var result = [];
+
+      for (var i = 0; i < children.length; i++) {
+        var child = children[i],
+            segments = stats[child.id].segments;
+
+        for (var j = 0; j < segments.length; j++) {
+          result.push(segments[j]);
+        }
+      }
+
+      result.sort(function(a, b) {
+        if (a.min === null) {
+          return b.min === null ? 0 : 1;
+        }
+
+        if (b.min === null) {
+          return -1;
+        }
+
+        return a.min - b.min;
+      });
+
+      return result;
+    }
+
+    function executeNode(node, segmentNumber) {
+      if (node.children) {
+        return {
+          fn: function(done) {
+            nodeStart(node);
+
+            queueRunnerFactory({
+              onComplete: function() {
+                nodeComplete(node, node.getResult());
+                done();
+              },
+              queueableFns: wrapChildren(node, segmentNumber),
+              userContext: node.sharedUserContext(),
+              onException: function() {
+                node.onException.apply(node, arguments);
+              }
+            });
+          }
+        };
+      } else {
+        return {
+          fn: function(done) { node.execute(done, stats[node.id].executable); }
+        };
+      }
+    }
+
+    function wrapChildren(node, segmentNumber) {
+      var result = [],
+          segmentChildren = stats[node.id].segments[segmentNumber].nodes;
+
+      for (var i = 0; i < segmentChildren.length; i++) {
+        result.push(executeNode(segmentChildren[i].owner, segmentChildren[i].index));
+      }
+
+      if (!stats[node.id].executable) {
+        return result;
+      }
+
+      return node.beforeAllFns.concat(result).concat(node.afterAllFns);
+    }
+  }
+
+  return TreeProcessor;
+};
+
+getJasmineRequireObj().Any = function(j$) {

  function Any(expectedObject) {
    this.expectedObject = expectedObject;
@@ -2198,7 +2412,7 @@ getJasmineRequireObj().Any = function() {
  };

  Any.prototype.jasmineToString = function() {
-    return '<jasmine.any(' + this.expectedObject + ')>';
+    return '<jasmine.any(' + j$.fnNameFor(this.expectedObject) + ')>';
  };

  return Any;
@@ -2251,11 +2465,35 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
    this.sample = sample;
  }

+  function getPrototype(obj) {
+    if (Object.getPrototypeOf) {
+      return Object.getPrototypeOf(obj);
+    }
+
+    if (obj.constructor.prototype == obj) {
+      return null;
+    }
+
+    return obj.constructor.prototype;
+  }
+
+  function hasProperty(obj, property) {
+    if (!obj) {
+      return false;
+    }
+
+    if (Object.prototype.hasOwnProperty.call(obj, property)) {
+      return true;
+    }
+
+    return hasProperty(getPrototype(obj), property);
+  }
+
  ObjectContaining.prototype.asymmetricMatch = function(other) {
    if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }

    for (var property in this.sample) {
-      if (!Object.prototype.hasOwnProperty.call(other, property) ||
+      if (!hasProperty(other, property) ||
          !j$.matchersUtil.equals(this.sample[property], other[property])) {
        return false;
      }
@@ -2292,6 +2530,16 @@ getJasmineRequireObj().StringMatching = function(j$) {
  return StringMatching;
 };

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

@@ -2461,11 +2709,13 @@ getJasmineRequireObj().matchersUtil = function(j$) {

    if (result) {
      // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(isFunction(aCtor) && (aCtor instanceof aCtor) &&
-        isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
+      // or `Array`s from different frames are.
+      if (className !== '[object Array]') {
+        var aCtor = a.constructor, bCtor = b.constructor;
+        if (aCtor !== bCtor && !(isFunction(aCtor) && aCtor instanceof aCtor &&
+               isFunction(bCtor) && bCtor instanceof bCtor)) {
+          return false;
+        }
      }
      // Deep compare objects.
      for (var key in a) {
@@ -2939,7 +3189,7 @@ getJasmineRequireObj().toThrowError = function(j$) {
          return expected === null && errorType === null;
        },
        matches: function(error) {
-          return (errorType === null || error.constructor === errorType) &&
+          return (errorType === null || error instanceof errorType) &&
            (expected === null || messageMatch(error.message));
        }
      };
@@ -3044,5 +3294,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };

 getJasmineRequireObj().version = function() {
-  return '2.2.0';
+  return '2.3.0';
 };
--- a/lib/jasmine-core/version.rb
+++ b/lib/jasmine-core/version.rb
@@ -4,6 +4,6 @@
 #
 module Jasmine
  module Core
-    VERSION = "2.2.0"
+    VERSION = "2.3.0"
  end
 end
--- a/package.json
+++ b/package.json
@@ -1,23 +1,34 @@
 {
  "name": "jasmine-core",
  "license": "MIT",
-  "version": "2.2.0",
+  "version": "2.3.0",
  "repository": {
    "type": "git",
    "url": "https://github.com/jasmine/jasmine.git"
  },
+  "keywords": [
+    "test",
+    "jasmine",
+    "tdd",
+    "bdd"
+  ],
+  "scripts": {
+    "test": "./node_modules/.bin/grunt jshint execSpecsInNode"
+  },
  "description": "Official packaging of Jasmine's core files for use by Node.js projects.",
  "homepage": "http://jasmine.github.io",
  "main": "./lib/jasmine-core.js",
  "devDependencies": {
+    "glob": "~3.2.9",
    "grunt": "~0.4.1",
-    "grunt-contrib-jshint": "~0.7.0",
-    "grunt-contrib-concat": "~0.3.0",
+    "grunt-cli": "^0.1.13",
    "grunt-contrib-compass": "~0.6.0",
    "grunt-contrib-compress": "~0.5.2",
-    "shelljs": "~0.1.4",
-    "glob": "~3.2.9",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-jshint": "~0.7.0",
    "jasmine": "https://github.com/jasmine/jasmine-npm/archive/master.tar.gz",
-    "load-grunt-tasks": "^0.4.0"
+    "load-grunt-tasks": "^0.4.0",
+    "shelljs": "~0.1.4",
+    "temp": "~0.8.1"
  }
 }
--- a/release_notes/2.2.1.md
+++ b/release_notes/2.2.1.md
@@ -0,0 +1,15 @@
+# Jasmine Core 2.2.1 Release Notes
+
+## Summary
+
+This is a hotfix release to fix the packaging for bower
+
+## Changes
+
+* Fix missing comma on bower.json
+    - Merges [#763](https://github.com/jasmine/jasmine/issues/763) from @gabrielhpugliese
+    - Merges [#764](https://github.com/jasmine/jasmine/issues/764) from @joshuacc
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
--- a/release_notes/2.3.0.md
+++ b/release_notes/2.3.0.md
@@ -0,0 +1,81 @@
+# Jasmine Core 2.3.0 Release Notes
+
+## Changes
+
+* Style disabled specs in the results list
+* Use `onclick` directly to better support older webkit
+* Don't use deprecated `onComplete` syntax for jasmine-npm
+* Allow the clock to be installed for the duration of a single closure
+* Add safari 7 & 8 to browser matrix
+* Remove unused standaloneBuilder var from Gruntfile
+* Add test script to package.json
+* Update bower.json keywords to match package.json keywords
+* Add keywords to package.json
+* refuse to execute an order if it would cause a suite with a beforeAll or afterAll to be re-entered after leaving once
+
+## Pull Requests & Issues
+
+* Specify a main entry point for bower so it can be loaded easier
+    - Merges [#827](https://github.com/jasmine/jasmine/issues/827) from @davetron5000
+
+* Use `instanceof` when checking Error types in toThrowError
+    - Fixes [#819](https://github.com/jasmine/jasmine/issues/819)
+
+* Remove periods from bullet points for consistency with rest of document
+    - Merge [#818](https://github.com/jasmine/jasmine/issues/818) from @lpww
+
+* Subjective readability improvements to CONTRIBUTING.md
+    - Merge [#815](https://github.com/jasmine/jasmine/issues/815) from @jhamon
+
+* Don't install the clock if the current timing functions aren't the originals
+    - Fixes [#782](https://github.com/jasmine/jasmine/issues/782)
+
+* Properly pass `j$` to `Any` so it can use other jasmine stuff
+    - Fixes [#806](https://github.com/jasmine/jasmine/issues/806)
+
+* Correctly handle functions that are scheduled after the clock is uninstalled and reinstalled from within Clock#tick.
+    - Merges [#804](https://github.com/jasmine/jasmine/issues/804) from @sgravrock
+    - Fixes [#790](https://github.com/jasmine/jasmine/issues/790).
+
+* Allow user to stop a specs execution when an expectation fails
+    - Fixes [#577](https://github.com/jasmine/jasmine/issues/577)
+
+* Remove unnecessary conditional
+    - Merges [#788](https://github.com/jasmine/jasmine/issues/788) from @toddbranch
+
+* Show the name of the constructor function when printing an `any` instead of a `toString` of the entire constructor
+    - Fixes [#796](https://github.com/jasmine/jasmine/issues/796)
+
+* Don't use hardcoded temporary directory paths
+    - Merges [#789](https://github.com/jasmine/jasmine/issues/789) from sgravrock
+
+* Execute beforeAll/afterAll once per suite instead of once per child when running focused specs/suites
+    - Fixes [#773](https://github.com/jasmine/jasmine/issues/773)
+
+* Report children of an xdescribe similarly to how they would be reported if they were themselves x'd out
+    - Fixes [#774](https://github.com/jasmine/jasmine/issues/774)
+    - Fixes [#776](https://github.com/jasmine/jasmine/issues/776)
+
+* Fixes issue where mock clock was being used by QueueRunner
+    - Fixes [#783](https://github.com/jasmine/jasmine/issues/783)
+    - Fixes [#792](https://github.com/jasmine/jasmine/issues/792)
+
+* add missing semicolon
+    - Merges [#775](https://github.com/jasmine/jasmine/issues/775) from @joscha
+
+* ObjectContaining matches prototype properties
+    - Fixes [#769](https://github.com/jasmine/jasmine/issues/769)
+
+* Updates pretty printer to include array properties
+    - Fixes [#766](https://github.com/jasmine/jasmine/issues/766)
+
+* Update year copyright
+    - Merges [#768](https://github.com/jasmine/jasmine/issues/768) from @danilovaz
+
+* Allow arrays from different frames or contexts to be equal
+    - Merges [#767](https://github.com/jasmine/jasmine/issues/767) from @juliemr
+    - Fixes [#765](https://github.com/jasmine/jasmine/issues/765)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
--- a/spec/core/ClockSpec.js
+++ b/spec/core/ClockSpec.js
@@ -6,7 +6,7 @@ describe("Clock", function() {
      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
      delayedFn = jasmine.createSpy("delayedFn"),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    fakeGlobal.setTimeout(delayedFn, 0);

@@ -28,7 +28,7 @@ describe("Clock", function() {
      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
      delayedFn = jasmine.createSpy("delayedFn"),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    fakeGlobal.clearTimeout("foo");

@@ -50,7 +50,7 @@ describe("Clock", function() {
      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
      delayedFn = jasmine.createSpy("delayedFn"),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    fakeGlobal.setInterval(delayedFn, 0);

@@ -72,7 +72,7 @@ describe("Clock", function() {
      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
      delayedFn = jasmine.createSpy("delayedFn"),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    fakeGlobal.clearInterval("foo");

@@ -88,6 +88,78 @@ describe("Clock", function() {
    expect(fakeClearInterval).not.toHaveBeenCalled();
  });

+  it("does not install if the current setTimeout is not the original function on the global", function() {
+    var originalFakeSetTimeout = function() {},
+      replacedSetTimeout = function() {},
+      fakeGlobal = { setTimeout: originalFakeSetTimeout },
+      delayedFunctionSchedulerFactory = jasmine.createSpy('delayedFunctionSchedulerFactory'),
+      mockDate = {},
+      clock = new j$.Clock(fakeGlobal, delayedFunctionSchedulerFactory, mockDate);
+
+    fakeGlobal.setTimeout = replacedSetTimeout;
+
+    expect(function() {
+      clock.install();
+    }).toThrowError(/unable to install/);
+
+    expect(delayedFunctionSchedulerFactory).not.toHaveBeenCalled();
+    expect(fakeGlobal.setTimeout).toBe(replacedSetTimeout);
+  });
+
+  it("does not install if the current clearTimeout is not the original function on the global", function() {
+    var originalFakeClearTimeout = function() {},
+      replacedClearTimeout = function() {},
+      fakeGlobal = { clearTimeout: originalFakeClearTimeout },
+      delayedFunctionSchedulerFactory = jasmine.createSpy('delayedFunctionSchedulerFactory'),
+      mockDate = {},
+      clock = new j$.Clock(fakeGlobal, delayedFunctionSchedulerFactory, mockDate);
+
+    fakeGlobal.clearTimeout = replacedClearTimeout;
+
+    expect(function() {
+      clock.install();
+    }).toThrowError(/unable to install/);
+
+    expect(delayedFunctionSchedulerFactory).not.toHaveBeenCalled();
+    expect(fakeGlobal.clearTimeout).toBe(replacedClearTimeout);
+  });
+
+  it("does not install if the current setInterval is not the original function on the global", function() {
+    var originalFakeSetInterval = function() {},
+      replacedSetInterval = function() {},
+      fakeGlobal = { setInterval: originalFakeSetInterval },
+      delayedFunctionSchedulerFactory = jasmine.createSpy('delayedFunctionSchedulerFactory'),
+      mockDate = {},
+      clock = new j$.Clock(fakeGlobal, delayedFunctionSchedulerFactory, mockDate);
+
+    fakeGlobal.setInterval = replacedSetInterval;
+
+    expect(function() {
+      clock.install();
+    }).toThrowError(/unable to install/);
+
+    expect(delayedFunctionSchedulerFactory).not.toHaveBeenCalled();
+    expect(fakeGlobal.setInterval).toBe(replacedSetInterval);
+  });
+
+  it("does not install if the current clearInterval is not the original function on the global", function() {
+    var originalFakeClearInterval = function() {},
+      replacedClearInterval = function() {},
+      fakeGlobal = { clearInterval: originalFakeClearInterval },
+      delayedFunctionSchedulerFactory = jasmine.createSpy('delayedFunctionSchedulerFactory'),
+      mockDate = {},
+      clock = new j$.Clock(fakeGlobal, delayedFunctionSchedulerFactory, mockDate);
+
+    fakeGlobal.clearInterval = replacedClearInterval;
+
+    expect(function() {
+      clock.install();
+    }).toThrowError(/unable to install/);
+
+    expect(delayedFunctionSchedulerFactory).not.toHaveBeenCalled();
+    expect(fakeGlobal.clearInterval).toBe(replacedClearInterval);
+  });
+
  it("replaces the global timer functions on uninstall", function() {
    var fakeSetTimeout = jasmine.createSpy("global setTimeout"),
      fakeClearTimeout = jasmine.createSpy("global clearTimeout"),
@@ -102,7 +174,7 @@ describe("Clock", function() {
      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction", "reset"]),
      delayedFn = jasmine.createSpy("delayedFn"),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();
    clock.uninstall();
@@ -118,6 +190,103 @@ describe("Clock", function() {
    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
  });

+  it("can be installed for the duration of a passed in function and uninstalled when done", function() {
+    var fakeSetTimeout = jasmine.createSpy("global setTimeout"),
+      fakeClearTimeout = jasmine.createSpy("global clearTimeout"),
+      fakeSetInterval = jasmine.createSpy("global setInterval"),
+      fakeClearInterval = jasmine.createSpy("global clearInterval"),
+      fakeGlobal = {
+        setTimeout: fakeSetTimeout,
+        clearTimeout: fakeClearTimeout,
+        setInterval: fakeSetInterval,
+        clearInterval: fakeClearInterval
+      },
+      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction", "reset", "removeFunctionWithId"]),
+      delayedFn = jasmine.createSpy("delayedFn"),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate),
+      passedFunctionCalled = false;
+
+    clock.withMock(function() {
+      fakeGlobal.setTimeout(delayedFn, 0);
+      fakeGlobal.clearTimeout("foo");
+      fakeGlobal.setInterval(delayedFn, 10);
+      fakeGlobal.clearInterval("bar");
+      passedFunctionCalled = true;
+    });
+
+    expect(passedFunctionCalled).toBe(true);
+
+    expect(fakeSetTimeout).not.toHaveBeenCalled();
+    expect(fakeClearTimeout).not.toHaveBeenCalled();
+    expect(fakeSetInterval).not.toHaveBeenCalled();
+    expect(fakeClearInterval).not.toHaveBeenCalled();
+    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalled();
+
+    delayedFunctionScheduler.scheduleFunction.calls.reset();
+
+    fakeGlobal.setTimeout(delayedFn, 0);
+    fakeGlobal.clearTimeout("foo");
+    fakeGlobal.setInterval(delayedFn, 10);
+    fakeGlobal.clearInterval("bar");
+
+    expect(fakeSetTimeout).toHaveBeenCalledWith(delayedFn, 0);
+    expect(fakeClearTimeout).toHaveBeenCalledWith("foo");
+    expect(fakeSetInterval).toHaveBeenCalledWith(delayedFn, 10);
+    expect(fakeClearInterval).toHaveBeenCalledWith("bar");
+    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
+  });
+
+  it("can be installed for the duration of a passed in function and uninstalled if an error is thrown", function() {
+    var fakeSetTimeout = jasmine.createSpy("global setTimeout"),
+      fakeClearTimeout = jasmine.createSpy("global clearTimeout"),
+      fakeSetInterval = jasmine.createSpy("global setInterval"),
+      fakeClearInterval = jasmine.createSpy("global clearInterval"),
+      fakeGlobal = {
+        setTimeout: fakeSetTimeout,
+        clearTimeout: fakeClearTimeout,
+        setInterval: fakeSetInterval,
+        clearInterval: fakeClearInterval
+      },
+      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction", "reset", "removeFunctionWithId"]),
+      delayedFn = jasmine.createSpy("delayedFn"),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate),
+      passedFunctionCalled = false;
+
+    expect(function() {
+      clock.withMock(function() {
+        fakeGlobal.setTimeout(delayedFn, 0);
+        fakeGlobal.clearTimeout("foo");
+        fakeGlobal.setInterval(delayedFn, 10);
+        fakeGlobal.clearInterval("bar");
+        passedFunctionCalled = true;
+        throw 'oops';
+      });
+    }).toThrow('oops');
+
+    expect(passedFunctionCalled).toBe(true);
+
+    expect(fakeSetTimeout).not.toHaveBeenCalled();
+    expect(fakeClearTimeout).not.toHaveBeenCalled();
+    expect(fakeSetInterval).not.toHaveBeenCalled();
+    expect(fakeClearInterval).not.toHaveBeenCalled();
+    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalled();
+
+    delayedFunctionScheduler.scheduleFunction.calls.reset();
+
+    fakeGlobal.setTimeout(delayedFn, 0);
+    fakeGlobal.clearTimeout("foo");
+    fakeGlobal.setInterval(delayedFn, 10);
+    fakeGlobal.clearInterval("bar");
+
+    expect(fakeSetTimeout).toHaveBeenCalledWith(delayedFn, 0);
+    expect(fakeClearTimeout).toHaveBeenCalledWith("foo");
+    expect(fakeSetInterval).toHaveBeenCalledWith(delayedFn, 10);
+    expect(fakeClearInterval).toHaveBeenCalledWith("bar");
+    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
+  });
+
  it("schedules the delayed function (via setTimeout) with the fake timer", function() {
    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
      scheduleFunction = jasmine.createSpy('scheduleFunction'),
@@ -125,7 +294,7 @@ describe("Clock", function() {
      fakeGlobal = { setTimeout: fakeSetTimeout },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();
    clock.setTimeout(delayedFn, 0, 'a', 'b');
@@ -142,7 +311,7 @@ describe("Clock", function() {
      fakeGlobal = { setTimeout: fakeSetTimeout },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate),
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate),
      timeoutId;

    clock.install();
@@ -157,7 +326,7 @@ describe("Clock", function() {
      fakeGlobal = { setTimeout: fakeClearTimeout },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();
    clock.clearTimeout(123);
@@ -173,7 +342,7 @@ describe("Clock", function() {
      fakeGlobal = { setInterval: fakeSetInterval },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();
    clock.setInterval(delayedFn, 0, 'a', 'b');
@@ -190,7 +359,7 @@ describe("Clock", function() {
      fakeGlobal = { setInterval: fakeSetInterval },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate),
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate),
      intervalId;

    clock.install();
@@ -205,7 +374,7 @@ describe("Clock", function() {
      fakeGlobal = { setInterval: clearInterval },
      delayedFn = jasmine.createSpy('delayedFn'),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();
    clock.clearInterval(123);
@@ -232,7 +401,7 @@ describe("Clock", function() {
        setInterval: fakeSetInterval
      },
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);

    fakeSetTimeout.apply = null;
    fakeSetInterval.apply = null;
@@ -251,7 +420,6 @@ describe("Clock", function() {
      clock.setInterval(fn, 0, 'extra');
    }).toThrow();
  });
-
 });

 describe("Clock (acceptance)", function() {
@@ -262,7 +430,7 @@ describe("Clock (acceptance)", function() {
      recurring1 = jasmine.createSpy('recurring1'),
      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();

@@ -309,7 +477,7 @@ describe("Clock (acceptance)", function() {
    var clearedFn = jasmine.createSpy('clearedFn'),
      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate),
+      clock = new j$.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate),
      timeoutId;

    clock.install();
@@ -327,7 +495,7 @@ describe("Clock (acceptance)", function() {
    var spy = jasmine.createSpy('spy'),
      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setInterval: function() {}}, delayedFunctionScheduler, mockDate),
+      clock = new j$.Clock({setInterval: function() {}}, function () { return delayedFunctionScheduler; }, mockDate),
      intervalId;

    clock.install();
@@ -345,7 +513,7 @@ describe("Clock (acceptance)", function() {
    var delayedFn1 = jasmine.createSpy('delayedFn1'),
      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();

@@ -362,7 +530,7 @@ describe("Clock (acceptance)", function() {
        delayedFn2 = jasmine.createSpy('delayedFn2'),
        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+        clock = new j$.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);

    delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 0); });
    clock.install();
@@ -381,7 +549,7 @@ describe("Clock (acceptance)", function() {
        delayedFn2 = jasmine.createSpy('delayedFn2'),
        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+        clock = new j$.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);

    delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 1); });
    clock.install();
@@ -392,11 +560,35 @@ describe("Clock (acceptance)", function() {
    expect(delayedFn2).toHaveBeenCalled();
  });

+  it("correctly schedules functions scheduled while the Clock is advancing but after the Clock is uninstalled", function() {
+    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+        delayedFn2 = jasmine.createSpy('delayedFn2'),
+        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+        clock = new j$.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);
+
+    delayedFn1.and.callFake(function() {
+      clock.uninstall();
+      clock.install();
+      clock.setTimeout(delayedFn2, 0);
+    });
+
+    clock.install();
+    clock.setTimeout(delayedFn1, 1);
+
+    clock.tick(1);
+    expect(delayedFn1).toHaveBeenCalled();
+    expect(delayedFn2).not.toHaveBeenCalled();
+
+    clock.tick(1);
+    expect(delayedFn2).toHaveBeenCalled();
+  });
+
  it("does not mock the Date object by default", function() {
     var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      global = {Date: Date},
      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install();

@@ -413,7 +605,7 @@ describe("Clock (acceptance)", function() {
    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      global = {Date: Date},
      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      clock = new j$.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);

    clock.install().mockDate();

@@ -437,7 +629,7 @@ describe("Clock (acceptance)", function() {
    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
      global = {Date: Date},
      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate),
+      clock = new j$.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate),
      baseTime = new Date(2013, 9, 23);


--- a/spec/core/DelayedFunctionSchedulerSpec.js
+++ b/spec/core/DelayedFunctionSchedulerSpec.js
@@ -113,47 +113,6 @@ describe("DelayedFunctionScheduler", function() {
    expect(fn).not.toHaveBeenCalled();
  });

-  it("reset removes scheduled functions", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.reset();
-
-    scheduler.tick(0);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
-  it("reset resets the returned ids", function() {
-    var scheduler = new j$.DelayedFunctionScheduler();
-    expect(scheduler.scheduleFunction(function() { }, 0)).toBe(1);
-    expect(scheduler.scheduleFunction(function() { }, 0, [], false, 123)).toBe(123);
-
-    scheduler.reset();
-    expect(scheduler.scheduleFunction(function() { }, 0)).toBe(1);
-    expect(scheduler.scheduleFunction(function() { }, 0, [], false, 123)).toBe(123);
-  });
-
-  it("reset resets the current tick time", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(15);
-    scheduler.reset();
-
-    scheduler.scheduleFunction(fn, 20, [], false, 1, 20);
-
-    scheduler.tick(5);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
  it("executes recurring functions interleaved with regular functions in the correct order", function() {
    var scheduler = new j$.DelayedFunctionScheduler(),
      fn = jasmine.createSpy('fn'),
--- a/spec/core/EnvSpec.js
+++ b/spec/core/EnvSpec.js
@@ -25,4 +25,24 @@ describe("Env", function() {
      expect(suite.description).toEqual('Jasmine__TopLevel__Suite');
    });
  });
+
+  it('can configure specs to throw errors on expectation failures', function() {
+    env.throwOnExpectationFailure(true);
+
+    spyOn(j$, 'Spec');
+    env.it('foo', function() {});
+    expect(j$.Spec).toHaveBeenCalledWith(jasmine.objectContaining({
+      throwOnExpectationFailure: true
+    }));
+  });
+
+  it('can configure suites to throw errors on expectation failures', function() {
+    env.throwOnExpectationFailure(true);
+
+    spyOn(j$, 'Suite');
+    env.describe('foo', function() {});
+    expect(j$.Suite).toHaveBeenCalledWith(jasmine.objectContaining({
+      throwOnExpectationFailure: true
+    }));
+  });
 });
--- a/spec/core/PrettyPrintSpec.js
+++ b/spec/core/PrettyPrintSpec.js
@@ -14,21 +14,63 @@ describe("j$.pp", function () {
    expect(j$.pp(-0)).toEqual("-0");
  });

-  it("should stringify arrays properly", function() {
-    expect(j$.pp([1, 2])).toEqual("[ 1, 2 ]");
-    expect(j$.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', Object({  }), undefined, null ]");
-  });
+  describe('stringify arrays', function() {
+    it("should stringify arrays properly", function() {
+      expect(j$.pp([1, 2])).toEqual("[ 1, 2 ]");
+      expect(j$.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', Object({  }), undefined, null ]");
+    });

-  it("should indicate circular array references", function() {
-    var array1 = [1, 2];
-    var array2 = [array1];
-    array1.push(array2);
-    expect(j$.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
-  });
+    it("should truncate arrays that are longer than j$.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
+      var originalMaxLength = j$.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      var array = [1, 2, 3];

-  it("should not indicate circular references incorrectly", function() {
-    var array = [ [1] ];
-    expect(j$.pp(array)).toEqual("[ [ 1 ] ]");
+      try {
+        j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
+        expect(j$.pp(array)).toEqual("[ 1, 2, ... ]");
+      } finally {
+        j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
+      }
+    });
+
+    it("should stringify arrays with properties properly", function() {
+      var arr = [1, 2];
+      arr.foo = 'bar';
+      arr.baz = {};
+      expect(j$.pp(arr)).toEqual("[ 1, 2, foo: 'bar', baz: Object({  }) ]");
+    });
+
+    it("should stringify empty arrays with properties properly", function() {
+      var empty = [];
+      empty.foo = 'bar';
+      empty.baz = {};
+      expect(j$.pp(empty)).toEqual("[ foo: 'bar', baz: Object({  }) ]");
+    });
+
+    it("should stringify long arrays with properties properly", function() {
+      var originalMaxLength = j$.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      var long = [1,2,3];
+      long.foo = 'bar';
+      long.baz = {};
+
+      try {
+        j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
+        expect(j$.pp(long)).toEqual("[ 1, 2, ..., foo: 'bar', baz: Object({  }) ]");
+      } finally {
+        j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
+      }
+    });
+
+    it("should indicate circular array references", function() {
+      var array1 = [1, 2];
+      var array2 = [array1];
+      array1.push(array2);
+      expect(j$.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
+    });
+
+    it("should not indicate circular references incorrectly", function() {
+      var array = [ [1] ];
+      expect(j$.pp(array)).toEqual("[ [ 1 ] ]");
+    });
  });

  it("should stringify objects properly", function() {
@@ -77,18 +119,6 @@ describe("j$.pp", function () {
    }
  });

-  it("should truncate arrays that are longer than j$.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
-    var originalMaxLength = j$.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-    var array = [1, 2, 3];
-
-    try {
-      j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
-      expect(j$.pp(array)).toEqual("[ 1, 2, ... ]");
-    } finally {
-      j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
-    }
-  });
-
  it("should stringify RegExp objects properly", function() {
    expect(j$.pp(/x|y|z/)).toEqual("/x|y|z/");
  });
--- a/spec/core/SpecSpec.js
+++ b/spec/core/SpecSpec.js
@@ -148,6 +148,29 @@ describe("Spec", function() {
    expect(resultCallback).toHaveBeenCalled();
  });

+  it("can be disabled at execution time by a parent", function() {
+    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+      startCallback = jasmine.createSpy('startCallback'),
+      specBody = jasmine.createSpy('specBody'),
+      resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+        onStart:startCallback,
+        queueableFn: { fn: specBody },
+        resultCallback: resultCallback,
+        queueRunnerFactory: fakeQueueRunner
+      });
+
+    spec.execute(undefined, false);
+
+    expect(spec.result.status).toBe('disabled');
+
+    expect(fakeQueueRunner).not.toHaveBeenCalled();
+    expect(specBody).not.toHaveBeenCalled();
+
+    expect(startCallback).toHaveBeenCalled();
+    expect(resultCallback).toHaveBeenCalled();
+  });
+
  it("can be marked pending, but still calls callbacks when executed", function() {
    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
      startCallback = jasmine.createSpy('startCallback'),
@@ -232,6 +255,40 @@ describe("Spec", function() {
    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual(['expectation2']);
  });

+  it("throws an ExpectationFailed error upon receiving a failed expectation when 'throwOnExpectationFailure' is set", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+      queueableFn: { fn: function() {} },
+      expectationResultFactory: function(data) { return data; },
+      queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+      resultCallback: resultCallback,
+      throwOnExpectationFailure: true
+    });
+
+    spec.addExpectationResult(true, 'passed');
+    expect(function() {
+      spec.addExpectationResult(false, 'failed')
+    }).toThrowError(j$.errors.ExpectationFailed);
+
+    spec.execute();
+
+    expect(resultCallback.calls.first().args[0].passedExpectations).toEqual(['passed']);
+    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual(['failed']);
+  });
+
+  it("does not throw an ExpectationFailed error when handling an error", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+        queueableFn: { fn: function() {} },
+        expectationResultFactory: function(data) { return data; },
+        queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+        resultCallback: resultCallback,
+        throwOnExpectationFailure: true
+      });
+
+    spec.onException('failing exception');
+  });
+
  it("can return its full name", function() {
    var specNameSpy = jasmine.createSpy('specNameSpy').and.returnValue('expected val');

@@ -244,7 +301,7 @@ describe("Spec", function() {
    expect(specNameSpy.calls.mostRecent().args[0].id).toEqual(spec.id);
  });

-   describe("when a spec is marked pending during execution", function() {
+  describe("when a spec is marked pending during execution", function() {
    it("should mark the spec as pending", function() {
      var fakeQueueRunner = function(opts) {
          opts.onException(new Error(j$.Spec.pendingSpecExceptionMessage));
@@ -279,4 +336,86 @@ describe("Spec", function() {
      expect(spec.result.pendingReason).toEqual('custom message');
    });
  });
+
+  it("should log a failure when handling an exception", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+        queueableFn: { fn: function() {} },
+        expectationResultFactory: function(data) { return data; },
+        queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+        resultCallback: resultCallback
+      });
+
+    spec.onException('foo');
+    spec.execute();
+
+    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([{
+      error: 'foo',
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: ''
+    }]);
+  });
+
+  it("should not log an additional failure when handling an ExpectationFailed error", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+        queueableFn: { fn: function() {} },
+        expectationResultFactory: function(data) { return data; },
+        queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+        resultCallback: resultCallback
+      });
+
+    spec.onException(new j$.errors.ExpectationFailed());
+    spec.execute();
+
+    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([]);
+  });
+
+  it("retrieves a result with updated status", function() {
+    var spec = new j$.Spec({ queueableFn: { fn: function() {} } });
+
+    expect(spec.getResult().status).toBe('passed');
+  });
+
+  it("retrives a result with disabled status", function() {
+    var spec = new j$.Spec({ queueableFn: { fn: function() {} } });
+    spec.disable();
+
+    expect(spec.getResult().status).toBe('disabled');
+  });
+
+  it("retrives a result with pending status", function() {
+    var spec = new j$.Spec({ queueableFn: { fn: function() {} } });
+    spec.pend();
+
+    expect(spec.getResult().status).toBe('pending');
+  });
+
+  it("should not be executable when disabled", function() {
+    var spec = new j$.Spec({
+      queueableFn: { fn: function() {} }
+    });
+    spec.disable();
+
+    expect(spec.isExecutable()).toBe(false);
+  });
+
+  it("should not be executable when pending", function() {
+    var spec = new j$.Spec({
+      queueableFn: { fn: function() {} }
+    });
+    spec.pend();
+
+    expect(spec.isExecutable()).toBe(false);
+  });
+
+  it("should be executable when not disabled or pending", function() {
+    var spec = new j$.Spec({
+      queueableFn: { fn: function() {} }
+    });
+
+    expect(spec.isExecutable()).toBe(true);
+  });
 });
--- a/spec/core/SuiteSpec.js
+++ b/spec/core/SuiteSpec.js
@@ -52,31 +52,6 @@ describe("Suite", function() {
    expect(suite.beforeFns).toEqual([innerBefore, outerBefore]);
  });

-  it("runs beforeAll functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite",
-        queueRunner: fakeQueueRunner
-      }),
-      firstBefore = jasmine.createSpy('outerBeforeAll'),
-      lastBefore = jasmine.createSpy('insideBeforeAll'),
-      fakeIt = {execute: jasmine.createSpy('it'), isExecutable: function() { return true; } };
-
-    suite.beforeAll(firstBefore);
-    suite.beforeAll(lastBefore);
-    suite.addChild(fakeIt);
-
-    suite.execute();
-    var suiteFns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
-
-    suiteFns[0]();
-    expect(firstBefore).toHaveBeenCalled();
-    suiteFns[1]();
-    expect(lastBefore).toHaveBeenCalled();
-  });
-
  it("adds after functions in order of needed execution", function() {
    var env = new j$.Env(),
      suite = new j$.Suite({
@@ -92,244 +67,6 @@ describe("Suite", function() {
    expect(suite.afterFns).toEqual([innerAfter, outerAfter]);
  });

-  it("runs afterAll functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite",
-        queueRunner: fakeQueueRunner
-      }),
-      firstAfter = jasmine.createSpy('outerAfterAll'),
-      lastAfter = jasmine.createSpy('insideAfterAll'),
-      fakeIt = {execute: jasmine.createSpy('it'), isExecutable: function() { return true; } };
-
-    suite.afterAll(firstAfter);
-    suite.afterAll(lastAfter);
-    suite.addChild(fakeIt);
-
-    suite.execute();
-    var suiteFns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
-
-    suiteFns[1]();
-    expect(firstAfter).toHaveBeenCalled();
-    suiteFns[2]();
-    expect(lastAfter).toHaveBeenCalled();
-  });
-
-  it("does not run *All functions if runnables are explicitly set", function(){
-    var env = new j$.Env(),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite",
-        queueRunner: fakeQueueRunner,
-        runnablesExplictlySetGetter: function(){return true;}
-      }),
-      beforeAll = jasmine.createSpy('beforeAll'),
-      afterAll = jasmine.createSpy('afterAll'),
-      fakeIt = {execute: jasmine.createSpy('it'), isExecutable: function() { return true; } };
-
-    suite.beforeAll(beforeAll);
-    suite.afterAll(afterAll);
-    suite.addChild(fakeIt);
-
-    suite.execute();
-    var suiteFns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
-
-    expect(suite.isExecutable()).toBeFalsy();
-    expect(suiteFns.length).toEqual(1);
-    expect(beforeAll).not.toHaveBeenCalled();
-    expect(afterAll).not.toHaveBeenCalled();
-  });
-
-  it("can be disabled, but still calls callbacks", function() {
-    var env = new j$.Env(),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      onStart = jasmine.createSpy('onStart'),
-      resultCallback = jasmine.createSpy('resultCallback'),
-      onComplete = jasmine.createSpy('onComplete'),
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        onStart: onStart,
-        resultCallback: resultCallback,
-        queueRunner: fakeQueueRunner
-      });
-
-    suite.disable();
-
-    expect(suite.disabled).toBe(true);
-
-    suite.execute(onComplete);
-
-    expect(fakeQueueRunner).not.toHaveBeenCalled();
-    expect(onStart).toHaveBeenCalled();
-    expect(resultCallback).toHaveBeenCalled();
-    expect(onComplete).toHaveBeenCalled();
-  });
-
-  it("delegates execution of its specs, suites, beforeAlls, and afterAlls", function() {
-    var env = new j$.Env(),
-      parentSuiteDone = jasmine.createSpy('parent suite done'),
-      fakeQueueRunnerForParent = jasmine.createSpy('fake parent queue runner'),
-      parentSuite = new j$.Suite({
-        env: env,
-        description: "I am a parent suite",
-        queueRunner: fakeQueueRunnerForParent
-      }),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1'),
-        isExecutable: function() { return true; }
-      },
-      beforeAllFn = { fn: jasmine.createSpy('beforeAll') },
-      afterAllFn = { fn: jasmine.createSpy('afterAll') };
-
-    spyOn(suite, "execute");
-
-    parentSuite.addChild(fakeSpec1);
-    parentSuite.addChild(suite);
-    parentSuite.beforeAll(beforeAllFn);
-    parentSuite.afterAll(afterAllFn);
-
-    parentSuite.execute(parentSuiteDone);
-
-    var parentSuiteFns = fakeQueueRunnerForParent.calls.mostRecent().args[0].queueableFns;
-
-    parentSuiteFns[0].fn();
-    expect(beforeAllFn.fn).toHaveBeenCalled();
-    parentSuiteFns[1].fn();
-    expect(fakeSpec1.execute).toHaveBeenCalled();
-    parentSuiteFns[2].fn();
-    expect(suite.execute).toHaveBeenCalled();
-    parentSuiteFns[3].fn();
-    expect(afterAllFn.fn).toHaveBeenCalled();
-  });
-
-  it("does not run beforeAll or afterAll if there are no executable child specs", function() {
-    var env = new j$.Env(),
-        fakeQueueRunnerForParent = jasmine.createSpy('fake parent queue runner'),
-        fakeQueueRunnerForChild = jasmine.createSpy('fake child queue runner'),
-        parentSuite = new j$.Suite({
-          env: env,
-          description: "I am a suite",
-          queueRunner: fakeQueueRunnerForParent
-        }),
-        childSuite = new j$.Suite({
-          env: env,
-          description: "I am a suite",
-          queueRunner: fakeQueueRunnerForChild,
-          parentSuite: parentSuite
-        }),
-        beforeAllFn = jasmine.createSpy('beforeAll'),
-        afterAllFn = jasmine.createSpy('afterAll');
-
-    parentSuite.addChild(childSuite);
-    parentSuite.beforeAll(beforeAllFn);
-    parentSuite.afterAll(afterAllFn);
-
-    parentSuite.execute();
-    expect(fakeQueueRunnerForParent).toHaveBeenCalledWith(jasmine.objectContaining({
-      queueableFns: [{ fn: jasmine.any(Function) }]
-    }));
-  });
-
-  it("calls a provided onStart callback when starting", function() {
-    var env = new j$.Env(),
-      suiteStarted = jasmine.createSpy('suiteStarted'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        onStart: suiteStarted,
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1'),
-        isExecutable: function() { return true; }
-      };
-
-    suite.execute();
-
-    expect(suiteStarted).toHaveBeenCalledWith(suite);
-  });
-
-  it("calls a provided onComplete callback when done", function() {
-    var env = new j$.Env(),
-      suiteCompleted = jasmine.createSpy('parent suite done'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.execute(suiteCompleted);
-
-    expect(suiteCompleted).toHaveBeenCalled();
-  });
-
-  it("calls a provided result callback when done", function() {
-    var env = new j$.Env(),
-      suiteResultsCallback = jasmine.createSpy('suite result callback'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner,
-        resultCallback: suiteResultsCallback
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.execute();
-
-    expect(suiteResultsCallback).toHaveBeenCalledWith({
-      id: suite.id,
-      status: 'finished',
-      description: "with a child suite",
-      fullName: "with a child suite",
-      failedExpectations: []
-    });
-  });
-
-  it("calls a provided result callback with status being disabled when disabled and done", function() {
-    var env = new j$.Env(),
-      suiteResultsCallback = jasmine.createSpy('suite result callback'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner,
-        resultCallback: suiteResultsCallback
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.disable();
-
-    suite.execute();
-
-    expect(suiteResultsCallback).toHaveBeenCalledWith({
-      id: suite.id,
-      status: 'disabled',
-      description: "with a child suite",
-      fullName: "with a child suite",
-      failedExpectations: []
-    });
-  });
-
  it('has a status of failed if any afterAll expectations have failed', function() {
    var suite = new j$.Suite({
      expectationResultFactory: function() { return 'hi'; }
@@ -339,4 +76,70 @@ describe("Suite", function() {
    suite.addExpectationResult(false);
    expect(suite.status()).toBe('failed');
  });
+
+  it("retrieves a result with updated status", function() {
+    var suite = new j$.Suite({});
+
+    expect(suite.getResult().status).toBe('finished');
+  });
+
+  it("retrieves a result with disabled status", function() {
+    var suite = new j$.Suite({});
+    suite.disable();
+
+    expect(suite.getResult().status).toBe('disabled');
+  });
+
+  it("is executable if not disabled", function() {
+    var suite = new j$.Suite({});
+
+    expect(suite.isExecutable()).toBe(true);
+  });
+
+  it("is not executable if disabled", function() {
+    var suite = new j$.Suite({});
+    suite.disable();
+
+    expect(suite.isExecutable()).toBe(false);
+  });
+
+  it("tells all children about expectation failures, even if one throws", function() {
+    var suite = new j$.Suite({}),
+      child1 = { addExpectationResult: jasmine.createSpy('child1#expectationResult'), result: {} },
+      child2 = { addExpectationResult: jasmine.createSpy('child2#expectationResult'), result: {} };
+
+    suite.addChild(child1);
+    suite.addChild(child2);
+
+    child1.addExpectationResult.and.throwError('foo');
+
+    suite.addExpectationResult('stuff');
+
+    expect(child1.addExpectationResult).toHaveBeenCalledWith('stuff');
+    expect(child2.addExpectationResult).toHaveBeenCalledWith('stuff');
+  });
+
+  it("throws an ExpectationFailed when receiving a failed expectation in an afterAll when throwOnExpectationFailure is set", function() {
+    var suite = new j$.Suite({
+      expectationResultFactory: function(data) { return data; },
+      throwOnExpectationFailure: true
+    });
+    suite.addChild({ result: { status: 'done' } });
+
+    expect(function() {
+      suite.addExpectationResult(false, 'failed');
+    }).toThrowError(j$.errors.ExpectationFailed);
+
+    expect(suite.status()).toBe('failed');
+    expect(suite.result.failedExpectations).toEqual(['failed']);
+  });
+
+  it("does not add an additional failure when an expectation fails in an afterAll", function(){
+    var suite = new j$.Suite({});
+    suite.addChild({ result: { status: 'done' } });
+
+    suite.onException(new j$.errors.ExpectationFailed());
+
+    expect(suite.getResult().failedExpectations).toEqual([]);
+  })
 });
--- a/spec/core/TreeProcessorSpec.js
+++ b/spec/core/TreeProcessorSpec.js
@@ -0,0 +1,633 @@
+describe("TreeProcessor", function() {
+  var nodeNumber = 0, leafNumber = 0;
+
+  function Node(attrs) {
+    attrs = attrs || {};
+    this.id = 'node' + nodeNumber++;
+    this.children = attrs.children || [];
+    this.canBeReentered = function() {
+      return !attrs.noReenter;
+    };
+    this.isExecutable = function() {
+      return attrs.executable !== false;
+    };
+    this.sharedUserContext = function() {
+      return attrs.userContext || {};
+    };
+    this.getResult = jasmine.createSpy(this.id + '#execute');
+    this.beforeAllFns = attrs.beforeAllFns || [];
+    this.afterAllFns = attrs.afterAllFns || [];
+  }
+
+  function Leaf(attrs) {
+    attrs = attrs || {};
+    this.id = 'leaf' + leafNumber++;
+    this.isExecutable = function() {
+      return attrs.executable !== false;
+    };
+    this.execute = jasmine.createSpy(this.id + '#execute');
+  }
+
+  it("processes a single executable leaf", function() {
+    var leaf = new Leaf(),
+        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[leaf.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("processes a single non-executable leaf", function() {
+    var leaf = new Leaf({ executable: false }),
+        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[leaf.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("processes a single non-specified leaf", function() {
+    var leaf = new Leaf(),
+        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[leaf.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("processes a tree with a single leaf with the root specified", function() {
+    var leaf = new Leaf(),
+        parent = new Node({ children: [leaf] }),
+        processor = new j$.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[parent.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[leaf.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("processes a tree with a single non-executable leaf, with the root specified", function() {
+    var leaf = new Leaf({ executable: false }),
+        parent = new Node({ children: [leaf] }),
+        processor = new j$.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[parent.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[leaf.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("processes a complicated tree with the root specified", function() {
+    var nonExecutable = new Leaf({ executable: false }),
+        executable = new Leaf({ executable: true }),
+        parent = new Node({ children: [nonExecutable, executable] }),
+        childless = new Node(),
+        childOfDisabled = new Leaf({ executable: true }),
+        disabledNode = new Node({ executable: false, children: [childOfDisabled] }),
+        root = new Node({ children: [parent, childless, disabledNode] }),
+        processor = new j$.TreeProcessor({ tree: root, runnableIds: [root.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+
+    expect(result[root.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[childless.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[nonExecutable.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[executable.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[parent.id]).toEqual({
+      executable: true,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[disabledNode.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+
+    expect(result[childOfDisabled.id]).toEqual({
+      executable: false,
+      segments: jasmine.any(Array)
+    });
+  });
+
+  it("marks the run order invalid if it would re-enter a node that does not allow re-entry", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        reentered = new Node({ noReenter: true, children: [leaf1, leaf2] }),
+        root = new Node({ children: [reentered, leaf3] }),
+        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
+        result = processor.processTree();
+
+    expect(result).toEqual({ valid: false });
+  });
+
+  it("marks the run order valid if a node being re-entered allows re-entry", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        reentered = new Node({ children: [leaf1, leaf2] }),
+        root = new Node({ children: [reentered, leaf3] }),
+        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+  });
+
+  it("marks the run order valid if a node which can't be re-entered is only entered once", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        noReentry = new Node({ noReenter: true }),
+        root = new Node({ children: [noReentry] }),
+        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf2.id, leaf1.id, leaf3.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+  });
+
+  it("marks the run order valid if a node which can't be re-entered is run directly", function() {
+    var leaf1 = new Leaf(),
+        noReentry = new Node({ noReenter: true }),
+        root = new Node({ children: [noReentry] }),
+        processor = new j$.TreeProcessor({ tree: root, runnableIds: [root.id] }),
+        result = processor.processTree();
+
+    expect(result.valid).toBe(true);
+  });
+
+  it("runs a single leaf", function() {
+    var leaf = new Leaf(),
+        node = new Node({ children: [leaf] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }),
+        treeComplete = jasmine.createSpy('treeComplete');
+
+    processor.execute(treeComplete);
+
+    expect(queueRunner).toHaveBeenCalledWith({
+      onComplete: treeComplete,
+      onException: jasmine.any(Function),
+      queueableFns: [{ fn: jasmine.any(Function) }]
+    });
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn('foo');
+
+    expect(leaf.execute).toHaveBeenCalledWith('foo', true);
+  });
+
+  it("runs a node with no children", function() {
+    var node = new Node({ userContext: { node: 'context' } }),
+        root = new Node({ children: [node] }),
+        nodeStart = jasmine.createSpy('nodeStart'),
+        nodeComplete = jasmine.createSpy('nodeComplete'),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          nodeStart: nodeStart,
+          nodeComplete: nodeComplete,
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+
+    expect(queueRunner).toHaveBeenCalledWith({
+      onComplete: treeComplete,
+      onException: jasmine.any(Function),
+      queueableFns: [{ fn: jasmine.any(Function) }]
+    });
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn(nodeDone);
+
+    expect(nodeStart).toHaveBeenCalledWith(node);
+    expect(queueRunner).toHaveBeenCalledWith({
+      onComplete: jasmine.any(Function),
+      queueableFns: [],
+      userContext: { node: 'context' },
+      onException: jasmine.any(Function)
+    });
+
+    node.getResult.and.returnValue({ my: 'result' });
+
+    queueRunner.calls.mostRecent().args[0].onComplete();
+    expect(nodeComplete).toHaveBeenCalledWith(node, { my: 'result' });
+    expect(nodeDone).toHaveBeenCalled();
+  });
+
+  it("runs a node with children", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        node = new Node({ children: [leaf1, leaf2] }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(2);
+
+    queueableFns[0].fn('foo');
+    expect(leaf1.execute).toHaveBeenCalledWith('foo', true);
+
+    queueableFns[1].fn('bar');
+    expect(leaf2.execute).toHaveBeenCalledWith('bar', true);
+  });
+
+  it("runs a disabled node", function() {
+    var leaf1 = new Leaf(),
+        node = new Node({ children: [leaf1], executable: false }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        nodeStart = jasmine.createSpy('nodeStart'),
+        nodeComplete = jasmine.createSpy('nodeComplete'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner,
+          nodeStart: nodeStart,
+          nodeComplete: nodeComplete
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    expect(nodeStart).toHaveBeenCalledWith(node);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(1);
+
+    queueableFns[0].fn('foo');
+    expect(leaf1.execute).toHaveBeenCalledWith('foo', false);
+
+    node.getResult.and.returnValue({ im: 'disabled' });
+
+    queueRunner.calls.mostRecent().args[0].onComplete();
+    expect(nodeComplete).toHaveBeenCalledWith(node, { im: 'disabled' });
+  });
+
+  it("runs beforeAlls for a node with children", function() {
+    var leaf = new Leaf(),
+        node = new Node({
+          children: [leaf],
+          beforeAllFns: ['beforeAll1', 'beforeAll2']
+        }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+
+    expect(queueableFns).toEqual(['beforeAll1', 'beforeAll2', { fn: jasmine.any(Function) }]);
+  });
+
+  it("runs afterAlls for a node with children", function() {
+    var leaf = new Leaf(),
+        node = new Node({
+          children: [leaf],
+          afterAllFns: ['afterAll1', 'afterAll2']
+        }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+
+    expect(queueableFns).toEqual([{ fn: jasmine.any(Function) }, 'afterAll1', 'afterAll2']);
+  });
+
+  it("does not run beforeAlls or afterAlls for a node with no children", function() {
+    var node = new Node({
+          beforeAllFns: ['before'],
+          afterAllFns: ['after']
+        }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+
+    expect(queueableFns).toEqual([]);
+  });
+
+  it("does not run beforeAlls or afterAlls for a disabled node", function() {
+    var leaf = new Leaf(),
+        node = new Node({
+          children: [leaf],
+          beforeAllFns: ['before'],
+          afterAllFns: ['after'],
+          executable: false
+        }),
+        root = new Node({ children: [node] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [node.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete'),
+        nodeDone = jasmine.createSpy('nodeDone');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn(nodeDone);
+
+    queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+
+    expect(queueableFns).toEqual([{ fn: jasmine.any(Function) }]);
+  });
+
+  it("runs leaves in the order specified", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        root = new Node({ children: [leaf1, leaf2] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [leaf2.id, leaf1.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn();
+
+    expect(leaf1.execute).not.toHaveBeenCalled();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+
+    expect(leaf1.execute).toHaveBeenCalled();
+  });
+
+  it("runs specified leaves before non-specified leaves", function() {
+    var specified = new Leaf(),
+        nonSpecified = new Leaf(),
+        root = new Node({ children: [nonSpecified, specified] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [specified.id],
+          queueRunnerFactory: queueRunner
+        }),
+        treeComplete = jasmine.createSpy('treeComplete');
+
+    processor.execute(treeComplete);
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn();
+
+    expect(nonSpecified.execute).not.toHaveBeenCalled();
+    expect(specified.execute).toHaveBeenCalledWith(undefined, true);
+
+    queueableFns[1].fn();
+
+    expect(nonSpecified.execute).toHaveBeenCalledWith(undefined, false);
+  });
+
+  it("runs nodes and leaves with a specified order", function() {
+    var specifiedLeaf = new Leaf(),
+        childLeaf = new Leaf(),
+        specifiedNode = new Node({ children: [childLeaf] }),
+        root = new Node({ children: [specifiedLeaf, specifiedNode] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [specifiedNode.id, specifiedLeaf.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    queueableFns[0].fn();
+
+    expect(specifiedLeaf.execute).not.toHaveBeenCalled();
+    var nodeQueueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    nodeQueueableFns[0].fn();
+
+    expect(childLeaf.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+
+    expect(specifiedLeaf.execute).toHaveBeenCalled();
+  });
+
+  it("runs a node multiple times if the order specified leaves and re-enters it", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        leaf4 = new Leaf(),
+        leaf5 = new Leaf(),
+        reentered = new Node({ children: [leaf1, leaf2, leaf3] }),
+        root = new Node({ children: [reentered, leaf4, leaf5] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [leaf1.id, leaf4.id, leaf2.id, leaf5.id, leaf3.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(5);
+
+    queueableFns[0].fn();
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+    expect(leaf4.execute).toHaveBeenCalled();
+
+    queueableFns[2].fn();
+    expect(queueRunner.calls.count()).toBe(3);
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[3].fn();
+    expect(leaf5.execute).toHaveBeenCalled();
+
+    queueableFns[4].fn();
+    expect(queueRunner.calls.count()).toBe(4);
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+  });
+
+  it("runs a parent of a node with segments correctly", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        leaf4 = new Leaf(),
+        leaf5 = new Leaf(),
+        parent = new Node({ children: [leaf1, leaf2, leaf3] }),
+        grandparent = new Node({ children: [parent] }),
+        root = new Node({ children: [grandparent, leaf4, leaf5] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [leaf1.id, leaf4.id, leaf2.id, leaf5.id, leaf3.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(5);
+
+    queueableFns[0].fn();
+    expect(queueRunner.calls.count()).toBe(2);
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(queueRunner.calls.count()).toBe(3);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+    expect(leaf4.execute).toHaveBeenCalled();
+
+    queueableFns[2].fn();
+    expect(queueRunner.calls.count()).toBe(4);
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(queueRunner.calls.count()).toBe(5);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[3].fn();
+    expect(leaf5.execute).toHaveBeenCalled();
+
+    queueableFns[4].fn();
+    expect(queueRunner.calls.count()).toBe(6);
+    expect(queueRunner.calls.mostRecent().args[0].queueableFns.length).toBe(1);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(queueRunner.calls.count()).toBe(7);
+
+    queueRunner.calls.mostRecent().args[0].queueableFns[0].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+  });
+
+  it("runs nodes in the order they were declared", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        parent = new Node({ children: [leaf2, leaf3] }),
+        root = new Node({ children: [leaf1, parent] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [root.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(2);
+
+    queueableFns[0].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+
+    var childFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(childFns.length).toBe(2);
+    childFns[0].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    childFns[1].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+  });
+});
--- a/spec/core/asymmetric_equality/AnySpec.js
+++ b/spec/core/asymmetric_equality/AnySpec.js
@@ -22,7 +22,7 @@ describe("Any", function() {

    expect(any.asymmetricMatch({})).toBe(true);
  });
-  
+
  it("matches a Boolean", function() {
    var any = new j$.Any(Boolean);

@@ -39,8 +39,7 @@ describe("Any", function() {
  it("jasmineToString's itself", function() {
    var any = new j$.Any(Number);

-    expect(any.jasmineToString()).toMatch('<jasmine.any');
-    expect(any.jasmineToString()).toMatch('Number');
+    expect(any.jasmineToString()).toEqual('<jasmine.any(Number)>');
  });

 });
--- a/spec/core/asymmetric_equality/ObjectContainingSpec.js
+++ b/spec/core/asymmetric_equality/ObjectContainingSpec.js
@@ -55,4 +55,35 @@ describe("ObjectContaining", function() {

    expect(containing.asymmetricMatch({})).toBe(false);
  });
+
+  it("matches defined properties", function(){
+    // IE 8 doesn't support `definePropery` on non-DOM nodes
+    if (jasmine.getEnv().ieVersion < 9) { return; }
+
+    var containing = new j$.ObjectContaining({ foo: "fooVal" });
+
+    var definedPropertyObject = {};
+    Object.defineProperty(definedPropertyObject, "foo", {
+      get: function() { return "fooVal" }
+    });
+    expect(containing.asymmetricMatch(definedPropertyObject)).toBe(true);
+  });
+
+  it("matches prototype properties", function(){
+    var containing = new j$.ObjectContaining({ foo: "fooVal" });
+
+    var prototypeObject = {foo: "fooVal"};
+    var obj;
+
+    if (Object.create) {
+      obj = Object.create(prototypeObject);
+    } else {
+      function Foo() {}
+      Foo.prototype = prototypeObject;
+      Foo.prototype.constructor = Foo;
+      obj = new Foo();
+    }
+
+    expect(containing.asymmetricMatch(obj)).toBe(true);
+  });
 });
--- a/spec/core/integration/EnvSpec.js
+++ b/spec/core/integration/EnvSpec.js
@@ -612,8 +612,6 @@ describe("Env integration", function() {
      expect(calls).toEqual([
        "before",
        "first spec",
-        "after",
-        "before",
        "second spec",
        "after"
      ]);
@@ -861,6 +859,36 @@ describe("Env integration", function() {
      env.execute();
    });

+    it("should not use the mock clock for asynchronous timeouts", function(){
+      var env = new j$.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [ "specDone", "jasmineDone" ]),
+        clock = env.clock;
+
+      reporter.jasmineDone.and.callFake(function() {
+        expect(reporter.specDone.calls.count()).toEqual(1);
+        expect(reporter.specDone.calls.argsFor(0)[0]).toEqual(jasmine.objectContaining({status: 'passed'}));
+      });
+
+      env.addReporter(reporter);
+      j$.DEFAULT_TIMEOUT_INTERVAL = 5;
+
+      env.beforeAll(function() {
+        clock.install();
+      });
+
+      env.afterAll(function() {
+        clock.uninstall();
+      });
+
+      env.it("spec that should not time out", function(done) {
+        clock.tick(6);
+        expect(true).toEqual(true);
+        done();
+      });
+
+      env.execute();
+    });
+
    it("should wait the specified interval before reporting an afterAll that fails to call done", function(done) {
      var env = new j$.Env(),
      reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
@@ -971,9 +999,6 @@ describe("Env integration", function() {

      env.addReporter({
        specDone: specDone,
-        specStarted: function() {
-          jasmine.clock().tick(1);
-        },
        jasmineDone: function() {
          expect(specDone).toHaveBeenCalledWith(jasmine.objectContaining({
            description: 'has a default message',
@@ -1033,6 +1058,10 @@ describe("Env integration", function() {
      });

      env.execute();
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
    });
  });

@@ -1177,7 +1206,7 @@ describe("Env integration", function() {
        totalSpecsDefined: 1
      });

-      expect(reporter.specDone).not.toHaveBeenCalled();
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({ status: 'disabled' }));
      expect(reporter.suiteDone.calls.count()).toBe(3);

      done();
--- a/spec/core/integration/SpecRunningSpec.js
+++ b/spec/core/integration/SpecRunningSpec.js
@@ -1,6 +1,5 @@
 describe("jasmine spec running", function () {
  var env;
-  var fakeTimer;

  beforeEach(function() {
    env = new j$.Env();
@@ -61,13 +60,17 @@ describe("jasmine spec running", function () {
    expect(bar).toEqual(0);
    expect(baz).toEqual(0);
    expect(quux).toEqual(0);
-    nested.execute(function() {
+    var assertions = function() {
      expect(foo).toEqual(1);
      expect(bar).toEqual(1);
      expect(baz).toEqual(1);
      expect(quux).toEqual(1);
      done();
-    });
+    };
+
+    env.addReporter({ jasmineDone: assertions });
+
+    env.execute();
  });

  it("should permit nested describes", function(done) {
@@ -289,7 +292,7 @@ describe("jasmine spec running", function () {
    env.execute();
  });

-  it('should run beforeAlls and afterAlls as beforeEachs and afterEachs in the order declared when runnablesToRun is provided', function(done) {
+  it('should run beforeAlls and afterAlls in the order declared when runnablesToRun is provided', function(done) {
    var actions = [],
      spec,
      spec2;
@@ -342,17 +345,13 @@ describe("jasmine spec running", function () {
        "inner beforeAll",
        "runner beforeEach",
        "inner beforeEach",
-        "it",
+        "it2",
        "inner afterEach",
        "runner afterEach",
-        "inner afterAll",
-        "runner afterAll",

-        "runner beforeAll",
-        "inner beforeAll",
        "runner beforeEach",
        "inner beforeEach",
-        "it2",
+        "it",
        "inner afterEach",
        "runner afterEach",
        "inner afterAll",
@@ -363,7 +362,7 @@ describe("jasmine spec running", function () {
    };

    env.addReporter({jasmineDone: assertions});
-    env.execute([spec.id, spec2.id]);
+    env.execute([spec2.id, spec.id]);
  });

  it('only runs *Alls once in a focused suite', function(done){
@@ -416,9 +415,7 @@ describe("jasmine spec running", function () {
          'beforeEach',
          'spec in fdescribe',
          'afterEach',
-          'afterAll',

-          'beforeAll',
          'beforeEach',
          'focused spec',
          'afterEach',
@@ -549,10 +546,14 @@ describe("jasmine spec running", function () {
        pendingSpec = env.it("I am a pending spec");
      });

-    suite.execute(function() {
+    var assertions = function() {
      expect(pendingSpec.status()).toBe("pending");
      done();
-    });
+    };
+
+    env.addReporter({jasmineDone: assertions});
+
+    env.execute();
  });

  // TODO: is this useful? It doesn't catch syntax errors
@@ -603,4 +604,96 @@ describe("jasmine spec running", function () {
    ));

  });
+
+  it("re-enters suites that have no *Alls", function(done) {
+    var actions = [],
+        spec1, spec2, spec3;
+
+    env.describe("top", function() {
+      spec1 = env.it("spec1", function() {
+        actions.push("spec1");
+      });
+
+      spec2 = env.it("spec2", function() {
+        actions.push("spec2");
+      });
+    });
+
+    spec3 = env.it("spec3", function() {
+      actions.push("spec3");
+    });
+
+    env.addReporter({
+      jasmineDone: function() {
+        expect(actions).toEqual(["spec2", "spec3", "spec1"]);
+        done();
+      }
+    });
+
+    env.execute([spec2.id, spec3.id, spec1.id]);
+  });
+
+  it("refuses to re-enter suites with a beforeAll", function() {
+    var actions = [],
+        spec1, spec2, spec3;
+
+    env.describe("top", function() {
+      env.beforeAll(function() {});
+
+      spec1 = env.it("spec1", function() {
+        actions.push("spec1");
+      });
+
+      spec2 = env.it("spec2", function() {
+        actions.push("spec2");
+      });
+    });
+
+    spec3 = env.it("spec3", function() {
+      actions.push("spec3");
+    });
+
+    env.addReporter({
+      jasmineDone: function() {
+        expect(actions).toEqual([]);
+        done();
+      }
+    });
+
+    expect(function() {
+      env.execute([spec2.id, spec3.id, spec1.id]);
+    }).toThrowError(/beforeAll/);
+  });
+
+  it("refuses to re-enter suites with a afterAll", function() {
+    var actions = [],
+        spec1, spec2, spec3;
+
+    env.describe("top", function() {
+      env.afterAll(function() {});
+
+      spec1 = env.it("spec1", function() {
+        actions.push("spec1");
+      });
+
+      spec2 = env.it("spec2", function() {
+        actions.push("spec2");
+      });
+    });
+
+    spec3 = env.it("spec3", function() {
+      actions.push("spec3");
+    });
+
+    env.addReporter({
+      jasmineDone: function() {
+        expect(actions).toEqual([]);
+        done();
+      }
+    });
+
+    expect(function() {
+      env.execute([spec2.id, spec3.id, spec1.id]);
+    }).toThrowError(/afterAll/);
+  });
 });
--- a/spec/core/matchers/matchersUtilSpec.js
+++ b/spec/core/matchers/matchersUtilSpec.js
@@ -171,6 +171,33 @@ describe("matchersUtil", function() {
      expect(j$.matchersUtil.equals(a,b)).toBe(true);
    });

+    it("passes for equivalent objects from different vm contexts", function() {
+      if (typeof require !== 'function') {
+        return;
+      }
+      var vm = require('vm');
+      var sandbox = {
+        obj: null
+      };
+      vm.runInNewContext('obj = {a: 1, b: 2}', sandbox);
+
+      expect(j$.matchersUtil.equals(sandbox.obj, {a: 1, b: 2})).toBe(true);
+    });
+
+    it("passes for equivalent arrays from different vm contexts", function() {
+      if (typeof require !== 'function') {
+        return;
+      }
+
+      var vm = require('vm');
+      var sandbox = {
+        arr: null
+      };
+      vm.runInNewContext('arr = [1, 2]', sandbox);
+
+      expect(j$.matchersUtil.equals(sandbox.arr, [1, 2])).toBe(true);
+    });
+
    it("passes when Any is used", function() {
      var number = 3,
        anyNumber = new j$.Any(Number);
--- a/spec/core/matchers/toThrowErrorSpec.js
+++ b/spec/core/matchers/toThrowErrorSpec.js
@@ -170,7 +170,6 @@ describe("toThrowError", function() {
      result;

    CustomError.prototype = new Error();
-    CustomError.prototype.constructor = CustomError;

    result = matcher.compare(fn, CustomError);

@@ -222,7 +221,6 @@ describe("toThrowError", function() {
      result;

    CustomError.prototype = new Error();
-    CustomError.prototype.constructor = CustomError;

    result = matcher.compare(fn, CustomError, "foo");

--- a/spec/html/HtmlReporterSpec.js
+++ b/spec/html/HtmlReporterSpec.js
@@ -266,7 +266,7 @@ describe("New HtmlReporter", function() {
      timer.elapsed.and.returnValue(100);
      reporter.jasmineDone();

-      var duration = container.querySelector(".banner .duration");
+      var duration = container.querySelector(".alert .duration");
      expect(duration.innerHTML).toMatch(/finished in 0.1s/);
    });

@@ -364,6 +364,40 @@ describe("New HtmlReporter", function() {
 //      expect(specLink.getAttribute("title")).toEqual("A Suite with a spec");
    });

+    it("has an options menu", function() {
+      var env = new j$.Env(),
+        container = document.createElement("div"),
+        getContainer = function() {
+          return container;
+        },
+        reporter = new j$.HtmlReporter({
+          env: env,
+          getContainer: getContainer,
+          createElement: function() {
+            return document.createElement.apply(document, arguments);
+          },
+          createTextNode: function() {
+            return document.createTextNode.apply(document, arguments);
+          }
+        });
+
+      reporter.initialize();
+      reporter.jasmineDone({});
+
+      var trigger = container.querySelector('.run-options .trigger'),
+          payload = container.querySelector('.run-options .payload');
+
+      expect(payload.className).not.toContain('open');
+
+      trigger.onclick();
+
+      expect(payload.className).toContain('open');
+
+      trigger.onclick();
+
+      expect(payload.className).not.toContain('open');
+    });
+
    describe("UI for raising/catching exceptions", function() {
      it("should be unchecked if the env is catching", function() {
        var env = new j$.Env(),
@@ -442,6 +476,86 @@ describe("New HtmlReporter", function() {
      });
    });

+    describe("UI for throwing errors on expectation failures", function() {
+      it("should be unchecked if not throwing", function() {
+        var env = new j$.Env(),
+          container = document.createElement("div"),
+          getContainer = function() {
+            return container;
+          },
+          reporter = new j$.HtmlReporter({
+            env: env,
+            getContainer: getContainer,
+            createElement: function() {
+              return document.createElement.apply(document, arguments);
+            },
+            createTextNode: function() {
+              return document.createTextNode.apply(document, arguments);
+            }
+          });
+
+        reporter.initialize();
+        reporter.jasmineDone({});
+
+        var throwingExpectationsUI = container.querySelector(".throw");
+        expect(throwingExpectationsUI.checked).toBe(false);
+      });
+
+      it("should be checked if throwing", function() {
+        var env = new j$.Env(),
+          container = document.createElement("div"),
+          getContainer = function() {
+            return container;
+          },
+          reporter = new j$.HtmlReporter({
+            env: env,
+            getContainer: getContainer,
+            createElement: function() {
+              return document.createElement.apply(document, arguments);
+            },
+            createTextNode: function() {
+              return document.createTextNode.apply(document, arguments);
+            }
+          });
+
+        env.throwOnExpectationFailure(true);
+
+        reporter.initialize();
+        reporter.jasmineDone({});
+
+        var throwingExpectationsUI = container.querySelector(".throw");
+        expect(throwingExpectationsUI.checked).toBe(true);
+      });
+
+      it("should affect the query param for throw expectation failures", function() {
+        var env = new j$.Env(),
+          container = document.createElement("div"),
+          throwingExceptionHandler = jasmine.createSpy('throwingExceptions'),
+          getContainer = function() {
+            return container;
+          },
+          reporter = new j$.HtmlReporter({
+            env: env,
+            getContainer: getContainer,
+            onThrowExpectationsClick: throwingExceptionHandler,
+            createElement: function() {
+              return document.createElement.apply(document, arguments);
+            },
+            createTextNode: function() {
+              return document.createTextNode.apply(document, arguments);
+            }
+          });
+
+        reporter.initialize();
+        reporter.jasmineDone({});
+
+        var throwingExpectationsUI = container.querySelector(".throw");
+        throwingExpectationsUI.click();
+
+        expect(throwingExceptionHandler).toHaveBeenCalled();
+      });
+    });
+
    it("shows a message if no specs are run", function(){
      var env, container, reporter;
      env = new j$.Env();
--- a/spec/npmPackage/npmPackageSpec.js
+++ b/spec/npmPackage/npmPackageSpec.js
@@ -1,5 +1,6 @@
 describe('npm package', function() {
  var path = require('path'),
+      temp = require('temp').track(),
      fs = require('fs');

  beforeAll(function() {
@@ -7,9 +8,7 @@ describe('npm package', function() {
        pack = shell.exec('npm pack', { silent: true });

    this.tarball = pack.output.split('\n')[0];
-    this.tmpDir = '/tmp/jasmine-core';
-
-    fs.mkdirSync(this.tmpDir);
+    this.tmpDir = temp.mkdirSync(); // automatically deleted on exit

    var untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, { silent: true });
    expect(untar.code).toBe(0);
@@ -44,8 +43,6 @@ describe('npm package', function() {
    };

    fs.unlink(this.tarball);
-    fs.readdirSync(this.tmpDir).forEach(cleanup.bind(null, this.tmpDir));
-    fs.rmdirSync(this.tmpDir);
  });

  it('has a root path', function() {
--- a/src/core/Clock.js
+++ b/src/core/Clock.js
@@ -1,5 +1,5 @@
 getJasmineRequireObj().Clock = function() {
-  function Clock(global, delayedFunctionScheduler, mockDate) {
+  function Clock(global, delayedFunctionSchedulerFactory, mockDate) {
    var self = this,
      realTimingFunctions = {
        setTimeout: global.setTimeout,
@@ -14,19 +14,24 @@ getJasmineRequireObj().Clock = function() {
        clearInterval: clearInterval
      },
      installed = false,
+      delayedFunctionScheduler,
      timer;


    self.install = function() {
+      if(!originalTimingFunctionsIntact()) {
+        throw new Error('Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?');
+      }
      replace(global, fakeTimingFunctions);
      timer = fakeTimingFunctions;
+      delayedFunctionScheduler = delayedFunctionSchedulerFactory();
      installed = true;

      return self;
    };

    self.uninstall = function() {
-      delayedFunctionScheduler.reset();
+      delayedFunctionScheduler = null;
      mockDate.uninstall();
      replace(global, realTimingFunctions);

@@ -34,6 +39,15 @@ getJasmineRequireObj().Clock = function() {
      installed = false;
    };

+    self.withMock = function(closure) {
+      this.install();
+      try {
+        closure();
+      } finally {
+        this.uninstall();
+      }
+    };
+
    self.mockDate = function(initialDate) {
      mockDate.install(initialDate);
    };
@@ -77,6 +91,13 @@ getJasmineRequireObj().Clock = function() {

    return self;

+    function originalTimingFunctionsIntact() {
+      return global.setTimeout === realTimingFunctions.setTimeout &&
+        global.clearTimeout === realTimingFunctions.clearTimeout &&
+        global.setInterval === realTimingFunctions.setInterval &&
+        global.clearInterval === realTimingFunctions.clearInterval;
+    }
+
    function legacyIE() {
      //if these methods are polyfilled, apply will be present
      return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
--- a/src/core/DelayedFunctionScheduler.js
+++ b/src/core/DelayedFunctionScheduler.js
@@ -72,13 +72,6 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
      }
    };

-    self.reset = function() {
-      currentTime = 0;
-      scheduledLookup = [];
-      scheduledFunctions = {};
-      delayedFnCount = 0;
-    };
-
    return self;

    function indexOfFirstToPass(array, testFn) {
--- a/src/core/Env.js
+++ b/src/core/Env.js
@@ -11,7 +11,7 @@ getJasmineRequireObj().Env = function(j$) {

    var realSetTimeout = j$.getGlobal().setTimeout;
    var realClearTimeout = j$.getGlobal().clearTimeout;
-    this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler(), new j$.MockDate(global));
+    this.clock = new j$.Clock(global, function () { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));

    var runnableLookupTable = {};
    var runnableResources = {};
@@ -19,6 +19,7 @@ getJasmineRequireObj().Env = function(j$) {
    var currentSpec = null;
    var currentlyExecutingSuites = [];
    var currentDeclarationSuite = null;
+    var throwOnExpectationFailure = false;

    var currentSuite = function() {
      return currentlyExecutingSuites[currentlyExecutingSuites.length - 1];
@@ -100,27 +101,21 @@ getJasmineRequireObj().Env = function(j$) {
        delete runnableResources[id];
    };

-    var beforeAndAfterFns = function(suite, runnablesExplictlySet) {
+    var beforeAndAfterFns = function(suite) {
      return function() {
        var befores = [],
-          afters = [],
-          beforeAlls = [],
-          afterAlls = [];
+          afters = [];

        while(suite) {
          befores = befores.concat(suite.beforeFns);
          afters = afters.concat(suite.afterFns);

-          if (runnablesExplictlySet()) {
-            beforeAlls = beforeAlls.concat(suite.beforeAllFns);
-            afterAlls = afterAlls.concat(suite.afterAllFns);
-          }
-
          suite = suite.parentSuite;
        }
+
        return {
-          befores: beforeAlls.reverse().concat(befores.reverse()),
-          afters: afters.concat(afterAlls)
+          befores: befores.reverse(),
+          afters: afters
        };
      };
    };
@@ -166,10 +161,18 @@ getJasmineRequireObj().Env = function(j$) {
      return j$.Spec.isPendingSpecException(e) || catchExceptions;
    };

+    this.throwOnExpectationFailure = function(value) {
+      throwOnExpectationFailure = !!value;
+    };
+
+    this.throwingExpectationFailures = function() {
+      return throwOnExpectationFailure;
+    };
+
    var queueRunnerFactory = function(options) {
      options.catchException = catchException;
      options.clearStack = options.clearStack || clearStack;
-      options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
+      options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
      options.fail = self.fail;

      new j$.QueueRunner(options).execute();
@@ -190,26 +193,40 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.execute = function(runnablesToRun) {
-      if(runnablesToRun) {
-        runnablesExplictlySet = true;
-      } else if (focusedRunnables.length) {
-        runnablesExplictlySet = true;
-        runnablesToRun = focusedRunnables;
-      } else {
-        runnablesToRun = [topSuite.id];
+      if(!runnablesToRun) {
+        if (focusedRunnables.length) {
+          runnablesToRun = focusedRunnables;
+        } else {
+          runnablesToRun = [topSuite.id];
+        }
      }
+      var processor = new j$.TreeProcessor({
+        tree: topSuite,
+        runnableIds: runnablesToRun,
+        queueRunnerFactory: queueRunnerFactory,
+        nodeStart: function(suite) {
+          currentlyExecutingSuites.push(suite);
+          defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
+          reporter.suiteStarted(suite.result);
+        },
+        nodeComplete: function(suite, result) {
+          if (!suite.disabled) {
+            clearResourcesForRunnable(suite.id);
+          }
+          currentlyExecutingSuites.pop();
+          reporter.suiteDone(result);
+        }
+      });

-      var allFns = [];
-      for(var i = 0; i < runnablesToRun.length; i++) {
-        var runnable = runnableLookupTable[runnablesToRun[i]];
-        allFns.push((function(runnable) { return { fn: function(done) { runnable.execute(done); } }; })(runnable));
+      if(!processor.processTree().valid) {
+        throw new Error('Invalid order: would cause a beforeAll or afterAll to be run multiple times');
      }

      reporter.jasmineStarted({
        totalSpecsDefined: totalSpecsDefined
      });

-      queueRunnerFactory({queueableFns: allFns, onComplete: reporter.jasmineDone});
+      processor.execute(reporter.jasmineDone);
    };

    this.addReporter = function(reporterToAdd) {
@@ -233,28 +250,13 @@ getJasmineRequireObj().Env = function(j$) {
        id: getNextSuiteId(),
        description: description,
        parentSuite: currentDeclarationSuite,
-        queueRunner: queueRunnerFactory,
-        onStart: suiteStarted,
        expectationFactory: expectationFactory,
        expectationResultFactory: expectationResultFactory,
-        runnablesExplictlySetGetter: runnablesExplictlySetGetter,
-        resultCallback: function(attrs) {
-          if (!suite.disabled) {
-            clearResourcesForRunnable(suite.id);
-          }
-          currentlyExecutingSuites.pop();
-          reporter.suiteDone(attrs);
-        }
+        throwOnExpectationFailure: throwOnExpectationFailure
      });

      runnableLookupTable[suite.id] = suite;
      return suite;
-
-      function suiteStarted(suite) {
-        currentlyExecutingSuites.push(suite);
-        defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
-        reporter.suiteStarted(suite.result);
-      }
    };

    this.describe = function(description, specDefinitions) {
@@ -326,17 +328,11 @@ getJasmineRequireObj().Env = function(j$) {
      }
    }

-    var runnablesExplictlySet = false;
-
-    var runnablesExplictlySetGetter = function(){
-      return runnablesExplictlySet;
-    };
-
    var specFactory = function(description, fn, suite, timeout) {
      totalSpecsDefined++;
      var spec = new j$.Spec({
        id: getNextSpecId(),
-        beforeAndAfterFns: beforeAndAfterFns(suite, runnablesExplictlySetGetter),
+        beforeAndAfterFns: beforeAndAfterFns(suite),
        expectationFactory: expectationFactory,
        resultCallback: specResultCallback,
        getSpecName: function(spec) {
@@ -350,7 +346,8 @@ getJasmineRequireObj().Env = function(j$) {
        queueableFn: {
          fn: fn,
          timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
-        }
+        },
+        throwOnExpectationFailure: throwOnExpectationFailure
      });

      runnableLookupTable[spec.id] = spec;
--- a/src/core/PrettyPrinter.js
+++ b/src/core/PrettyPrinter.js
@@ -93,6 +93,23 @@ getJasmineRequireObj().pp = function(j$) {
    if(array.length > length){
      this.append(', ...');
    }
+
+    var self = this;
+    var first = array.length === 0;
+    this.iterateObject(array, function(property, isGetter) {
+      if (property.match(/^\d+$/)) {
+        return;
+      }
+
+      if (first) {
+        first = false;
+      } else {
+        self.append(', ');
+      }
+
+      self.formatProperty(array, property, isGetter);
+    });
+
    this.append(' ]');
  };

@@ -115,18 +132,22 @@ getJasmineRequireObj().pp = function(j$) {
        self.append(', ');
      }

-      self.append(property);
-      self.append(': ');
-      if (isGetter) {
-        self.append('<getter>');
-      } else {
-        self.format(obj[property]);
-      }
+      self.formatProperty(obj, property, isGetter);
    });

    this.append(' })');
  };

+  StringPrettyPrinter.prototype.formatProperty = function(obj, property, isGetter) {
+      this.append(property);
+      this.append(': ');
+      if (isGetter) {
+        this.append('<getter>');
+      } else {
+        this.format(obj[property]);
+      }
+  };
+
  StringPrettyPrinter.prototype.append = function(value) {
    this.string += value;
  };
--- a/src/core/QueueRunner.js
+++ b/src/core/QueueRunner.js
@@ -17,7 +17,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
    this.onException = attrs.onException || function() {};
    this.catchException = attrs.catchException || function() { return true; };
    this.userContext = attrs.userContext || {};
-    this.timer = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
+    this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
    this.fail = attrs.fail || function() {};
  }

@@ -57,7 +57,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {

    function attemptAsync(queueableFn) {
      var clearTimeout = function () {
-          Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeoutId]]);
+          Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
        },
        next = once(function () {
          clearTimeout(timeoutId);
@@ -71,7 +71,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      };

      if (queueableFn.timeout) {
-        timeoutId = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() {
+        timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
          var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');
          onException(error, queueableFn);
          next();
--- a/src/core/Spec.js
+++ b/src/core/Spec.js
@@ -12,6 +12,7 @@ getJasmineRequireObj().Spec = function(j$) {
    this.expectationResultFactory = attrs.expectationResultFactory || function() { };
    this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
    this.catchingExceptions = attrs.catchingExceptions || function() { return true; };
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;

    if (!this.queueableFn.fn) {
      this.pend();
@@ -27,12 +28,16 @@ getJasmineRequireObj().Spec = function(j$) {
    };
  }

-  Spec.prototype.addExpectationResult = function(passed, data) {
+  Spec.prototype.addExpectationResult = function(passed, data, isError) {
    var expectationResult = this.expectationResultFactory(data);
    if (passed) {
      this.result.passedExpectations.push(expectationResult);
    } else {
      this.result.failedExpectations.push(expectationResult);
+
+      if (this.throwOnExpectationFailure && !isError) {
+        throw new j$.errors.ExpectationFailed();
+      }
    }
  };

@@ -40,13 +45,13 @@ getJasmineRequireObj().Spec = function(j$) {
    return this.expectationFactory(actual, this);
  };

-  Spec.prototype.execute = function(onComplete) {
+  Spec.prototype.execute = function(onComplete, enabled) {
    var self = this;

    this.onStart(this);

-    if (this.markedPending || this.disabled) {
-      complete();
+    if (!this.isExecutable() || enabled === false) {
+      complete(enabled);
      return;
    }

@@ -60,8 +65,8 @@ getJasmineRequireObj().Spec = function(j$) {
      userContext: this.userContext()
    });

-    function complete() {
-      self.result.status = self.status();
+    function complete(enabledAgain) {
+      self.result.status = self.status(enabledAgain);
      self.resultCallback(self.result);

      if (onComplete) {
@@ -76,13 +81,17 @@ getJasmineRequireObj().Spec = function(j$) {
      return;
    }

+    if (e instanceof j$.errors.ExpectationFailed) {
+      return;
+    }
+
    this.addExpectationResult(false, {
      matcherName: '',
      passed: false,
      expected: '',
      actual: '',
      error: e
-    });
+    }, true);
  };

  Spec.prototype.disable = function() {
@@ -96,8 +105,13 @@ getJasmineRequireObj().Spec = function(j$) {
    }
  };

-  Spec.prototype.status = function() {
-    if (this.disabled) {
+  Spec.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
+  };
+
+  Spec.prototype.status = function(enabled) {
+    if (this.disabled || enabled === false) {
      return 'disabled';
    }

--- a/src/core/Suite.js
+++ b/src/core/Suite.js
@@ -1,21 +1,17 @@
-getJasmineRequireObj().Suite = function() {
+getJasmineRequireObj().Suite = function(j$) {
  function Suite(attrs) {
    this.env = attrs.env;
    this.id = attrs.id;
    this.parentSuite = attrs.parentSuite;
    this.description = attrs.description;
-    this.onStart = attrs.onStart || function() {};
-    this.resultCallback = attrs.resultCallback || function() {};
-    this.clearStack = attrs.clearStack || function(fn) {fn();};
    this.expectationFactory = attrs.expectationFactory;
    this.expectationResultFactory = attrs.expectationResultFactory;
-    this.runnablesExplictlySetGetter = attrs.runnablesExplictlySetGetter || function() {};
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;

    this.beforeFns = [];
    this.afterFns = [];
    this.beforeAllFns = [];
    this.afterAllFns = [];
-    this.queueRunner = attrs.queueRunner || function() {};
    this.disabled = false;

    this.children = [];
@@ -78,51 +74,17 @@ getJasmineRequireObj().Suite = function() {
    }
  };

-  Suite.prototype.execute = function(onComplete) {
-    var self = this;
-
-    this.onStart(this);
-
-    if (this.disabled) {
-      complete();
-      return;
-    }
-
-    var allFns = [];
-
-    for (var i = 0; i < this.children.length; i++) {
-      allFns.push(wrapChildAsAsync(this.children[i]));
-    }
-
-    if (this.isExecutable()) {
-      allFns = this.beforeAllFns.concat(allFns);
-      allFns = allFns.concat(this.afterAllFns);
-    }
-
-    this.queueRunner({
-      queueableFns: allFns,
-      onComplete: complete,
-      userContext: this.sharedUserContext(),
-      onException: function() { self.onException.apply(self, arguments); }
-    });
-
-    function complete() {
-      self.result.status = self.status();
-      self.resultCallback(self.result);
-
-      if (onComplete) {
-        onComplete();
-      }
-    }
-
-    function wrapChildAsAsync(child) {
-      return { fn: function(done) { child.execute(done); } };
-    }
+  Suite.prototype.isExecutable = function() {
+    return !this.disabled;
  };

-  Suite.prototype.isExecutable = function() {
-    var runnablesExplicitlySet = this.runnablesExplictlySetGetter();
-    return !runnablesExplicitlySet && hasExecutableChild(this.children);
+  Suite.prototype.canBeReentered = function() {
+    return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
+  };
+
+  Suite.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
  };

  Suite.prototype.sharedUserContext = function() {
@@ -138,6 +100,10 @@ getJasmineRequireObj().Suite = function() {
  };

  Suite.prototype.onException = function() {
+    if (arguments[0] instanceof j$.errors.ExpectationFailed) {
+      return;
+    }
+
    if(isAfterAll(this.children)) {
      var data = {
        matcherName: '',
@@ -159,10 +125,17 @@ getJasmineRequireObj().Suite = function() {
    if(isAfterAll(this.children) && isFailure(arguments)){
      var data = arguments[1];
      this.result.failedExpectations.push(this.expectationResultFactory(data));
+      if(this.throwOnExpectationFailure) {
+        throw new j$.errors.ExpectationFailed();
+      }
    } else {
      for (var i = 0; i < this.children.length; i++) {
        var child = this.children[i];
-        child.addExpectationResult.apply(child, arguments);
+        try {
+          child.addExpectationResult.apply(child, arguments);
+        } catch(e) {
+          // keep going
+        }
      }
    }
  };
@@ -175,17 +148,6 @@ getJasmineRequireObj().Suite = function() {
    return !args[0];
  }

-  function hasExecutableChild(children) {
-    var foundActive = false;
-    for (var i = 0; i < children.length; i++) {
-      if (children[i].isExecutable()) {
-        foundActive = true;
-        break;
-      }
-    }
-    return foundActive;
-  }
-
  function clone(obj) {
    var clonedObj = {};
    for (var prop in obj) {
--- a/src/core/TreeProcessor.js
+++ b/src/core/TreeProcessor.js
@@ -0,0 +1,203 @@
+getJasmineRequireObj().TreeProcessor = function() {
+  function TreeProcessor(attrs) {
+    var tree = attrs.tree,
+        runnableIds = attrs.runnableIds,
+        queueRunnerFactory = attrs.queueRunnerFactory,
+        nodeStart = attrs.nodeStart || function() {},
+        nodeComplete = attrs.nodeComplete || function() {},
+        stats = { valid: true },
+        processed = false,
+        defaultMin = Infinity,
+        defaultMax = 1 - Infinity;
+
+    this.processTree = function() {
+      processNode(tree, false);
+      processed = true;
+      return stats;
+    };
+
+    this.execute = function(done) {
+      if (!processed) {
+        this.processTree();
+      }
+
+      if (!stats.valid) {
+        throw 'invalid order';
+      }
+
+      var childFns = wrapChildren(tree, 0);
+
+      queueRunnerFactory({
+        queueableFns: childFns,
+        onException: function() {
+          tree.onException.apply(tree, arguments);
+        },
+        onComplete: done
+      });
+    };
+
+    function runnableIndex(id) {
+      for (var i = 0; i < runnableIds.length; i++) {
+        if (runnableIds[i] === id) {
+          return i;
+        }
+      }
+    }
+
+    function processNode(node, parentEnabled) {
+      var executableIndex = runnableIndex(node.id);
+
+      if (executableIndex !== undefined) {
+        parentEnabled = true;
+      }
+
+      parentEnabled = parentEnabled && node.isExecutable();
+
+      if (!node.children) {
+        stats[node.id] = {
+          executable: parentEnabled && node.isExecutable(),
+          segments: [{
+            index: 0,
+            owner: node,
+            nodes: [node],
+            min: startingMin(executableIndex),
+            max: startingMax(executableIndex)
+          }]
+        };
+      } else {
+        var hasExecutableChild = false;
+
+        for (var i = 0; i < node.children.length; i++) {
+          var child = node.children[i];
+
+          processNode(child, parentEnabled);
+
+          if (!stats.valid) {
+            return;
+          }
+
+          var childStats = stats[child.id];
+
+          hasExecutableChild = hasExecutableChild || childStats.executable;
+        }
+
+        stats[node.id] = {
+          executable: hasExecutableChild
+        };
+
+        segmentChildren(node, stats[node.id], executableIndex);
+
+        if (!node.canBeReentered() && stats[node.id].segments.length > 1) {
+          stats = { valid: false };
+        }
+      }
+    }
+
+    function startingMin(executableIndex) {
+      return executableIndex === undefined ? defaultMin : executableIndex;
+    }
+
+    function startingMax(executableIndex) {
+      return executableIndex === undefined ? defaultMax : executableIndex;
+    }
+
+    function segmentChildren(node, nodeStats, executableIndex) {
+      var currentSegment = { index: 0, owner: node, nodes: [], min: startingMin(executableIndex), max: startingMax(executableIndex) },
+          result = [currentSegment],
+          lastMax = defaultMax,
+          orderedChildSegments = orderChildSegments(node.children);
+
+      function isSegmentBoundary(minIndex) {
+        return lastMax !== defaultMax && minIndex !== defaultMin && lastMax < minIndex - 1;
+      }
+
+      for (var i = 0; i < orderedChildSegments.length; i++) {
+        var childSegment = orderedChildSegments[i],
+          maxIndex = childSegment.max,
+          minIndex = childSegment.min;
+
+        if (isSegmentBoundary(minIndex)) {
+          currentSegment = {index: result.length, owner: node, nodes: [], min: defaultMin, max: defaultMax};
+          result.push(currentSegment);
+        }
+
+        currentSegment.nodes.push(childSegment);
+        currentSegment.min = Math.min(currentSegment.min, minIndex);
+        currentSegment.max = Math.max(currentSegment.max, maxIndex);
+        lastMax = maxIndex;
+      }
+
+      nodeStats.segments = result;
+    }
+
+    function orderChildSegments(children) {
+      var result = [];
+
+      for (var i = 0; i < children.length; i++) {
+        var child = children[i],
+            segments = stats[child.id].segments;
+
+        for (var j = 0; j < segments.length; j++) {
+          result.push(segments[j]);
+        }
+      }
+
+      result.sort(function(a, b) {
+        if (a.min === null) {
+          return b.min === null ? 0 : 1;
+        }
+
+        if (b.min === null) {
+          return -1;
+        }
+
+        return a.min - b.min;
+      });
+
+      return result;
+    }
+
+    function executeNode(node, segmentNumber) {
+      if (node.children) {
+        return {
+          fn: function(done) {
+            nodeStart(node);
+
+            queueRunnerFactory({
+              onComplete: function() {
+                nodeComplete(node, node.getResult());
+                done();
+              },
+              queueableFns: wrapChildren(node, segmentNumber),
+              userContext: node.sharedUserContext(),
+              onException: function() {
+                node.onException.apply(node, arguments);
+              }
+            });
+          }
+        };
+      } else {
+        return {
+          fn: function(done) { node.execute(done, stats[node.id].executable); }
+        };
+      }
+    }
+
+    function wrapChildren(node, segmentNumber) {
+      var result = [],
+          segmentChildren = stats[node.id].segments[segmentNumber].nodes;
+
+      for (var i = 0; i < segmentChildren.length; i++) {
+        result.push(executeNode(segmentChildren[i].owner, segmentChildren[i].index));
+      }
+
+      if (!stats[node.id].executable) {
+        return result;
+      }
+
+      return node.beforeAllFns.concat(result).concat(node.afterAllFns);
+    }
+  }
+
+  return TreeProcessor;
+};
--- a/src/core/asymmetric_equality/Any.js
+++ b/src/core/asymmetric_equality/Any.js
@@ -1,4 +1,4 @@
-getJasmineRequireObj().Any = function() {
+getJasmineRequireObj().Any = function(j$) {

  function Any(expectedObject) {
    this.expectedObject = expectedObject;
@@ -29,7 +29,7 @@ getJasmineRequireObj().Any = function() {
  };

  Any.prototype.jasmineToString = function() {
-    return '<jasmine.any(' + this.expectedObject + ')>';
+    return '<jasmine.any(' + j$.fnNameFor(this.expectedObject) + ')>';
  };

  return Any;
--- a/src/core/asymmetric_equality/ObjectContaining.js
+++ b/src/core/asymmetric_equality/ObjectContaining.js
@@ -4,11 +4,35 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
    this.sample = sample;
  }

+  function getPrototype(obj) {
+    if (Object.getPrototypeOf) {
+      return Object.getPrototypeOf(obj);
+    }
+
+    if (obj.constructor.prototype == obj) {
+      return null;
+    }
+
+    return obj.constructor.prototype;
+  }
+
+  function hasProperty(obj, property) {
+    if (!obj) {
+      return false;
+    }
+
+    if (Object.prototype.hasOwnProperty.call(obj, property)) {
+      return true;
+    }
+
+    return hasProperty(getPrototype(obj), property);
+  }
+
  ObjectContaining.prototype.asymmetricMatch = function(other) {
    if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }

    for (var property in this.sample) {
-      if (!Object.prototype.hasOwnProperty.call(other, property) ||
+      if (!hasProperty(other, property) ||
          !j$.matchersUtil.equals(this.sample[property], other[property])) {
        return false;
      }
--- a/src/core/errors.js
+++ b/src/core/errors.js
@@ -0,0 +1,10 @@
+getJasmineRequireObj().errors = function() {
+  function ExpectationFailed() {}
+
+  ExpectationFailed.prototype = new Error();
+  ExpectationFailed.prototype.constructor = ExpectationFailed;
+
+  return {
+    ExpectationFailed: ExpectationFailed
+  };
+};
--- a/src/core/matchers/matchersUtil.js
+++ b/src/core/matchers/matchersUtil.js
@@ -167,11 +167,13 @@ getJasmineRequireObj().matchersUtil = function(j$) {

    if (result) {
      // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(isFunction(aCtor) && (aCtor instanceof aCtor) &&
-        isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
+      // or `Array`s from different frames are.
+      if (className !== '[object Array]') {
+        var aCtor = a.constructor, bCtor = b.constructor;
+        if (aCtor !== bCtor && !(isFunction(aCtor) && aCtor instanceof aCtor &&
+               isFunction(bCtor) && bCtor instanceof bCtor)) {
+          return false;
+        }
      }
      // Deep compare objects.
      for (var key in a) {
--- a/src/core/matchers/toThrowError.js
+++ b/src/core/matchers/toThrowError.js
@@ -109,7 +109,7 @@ getJasmineRequireObj().toThrowError = function(j$) {
          return expected === null && errorType === null;
        },
        matches: function(error) {
-          return (errorType === null || error.constructor === errorType) &&
+          return (errorType === null || error instanceof errorType) &&
            (expected === null || messageMatch(error.message));
        }
      };
--- a/src/core/requireCore.js
+++ b/src/core/requireCore.js
@@ -20,7 +20,8 @@ var getJasmineRequireObj = (function (jasmineGlobal) {

    jRequire.base(j$, jasmineGlobal);
    j$.util = jRequire.util();
-    j$.Any = jRequire.Any();
+    j$.errors = jRequire.errors();
+    j$.Any = jRequire.Any(j$);
    j$.Anything = jRequire.Anything(j$);
    j$.CallTracker = jRequire.CallTracker();
    j$.MockDate = jRequire.MockDate();
@@ -41,8 +42,9 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.SpyRegistry = jRequire.SpyRegistry(j$);
    j$.SpyStrategy = jRequire.SpyStrategy();
    j$.StringMatching = jRequire.StringMatching(j$);
-    j$.Suite = jRequire.Suite();
+    j$.Suite = jRequire.Suite(j$);
    j$.Timer = jRequire.Timer();
+    j$.TreeProcessor = jRequire.TreeProcessor();
    j$.version = jRequire.version();

    j$.matchers = jRequire.requireMatchers(jRequire, j$);
--- a/src/html/HtmlReporter.js
+++ b/src/html/HtmlReporter.js
@@ -11,6 +11,7 @@ jasmineRequire.HtmlReporter = function(j$) {
      createElement = options.createElement,
      createTextNode = options.createTextNode,
      onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {},
+      onThrowExpectationsClick = options.onThrowExpectationsClick || function() {},
      addToExistingQueryString = options.addToExistingQueryString || defaultQueryString,
      timer = options.timer || noopTimer,
      results = [],
@@ -116,22 +117,51 @@ jasmineRequire.HtmlReporter = function(j$) {

    this.jasmineDone = function() {
      var banner = find('.banner');
-      banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));
-
      var alert = find('.alert');
+      alert.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));

-      alert.appendChild(createDom('span', { className: 'exceptions' },
-        createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'),
-        createDom('input', {
-          className: 'raise',
-          id: 'raise-exceptions',
-          type: 'checkbox'
-        })
-      ));
-      var checkbox = find('#raise-exceptions');
+      banner.appendChild(
+        createDom('div', { className: 'run-options' },
+          createDom('span', { className: 'trigger' }, 'Options'),
+          createDom('div', { className: 'payload' },
+            createDom('div', { className: 'exceptions' },
+              createDom('input', {
+                className: 'raise',
+                id: 'raise-exceptions',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions')),
+            createDom('div', { className: 'throw-failures' },
+              createDom('input', {
+                className: 'throw',
+                id: 'throw-failures',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'label', 'for': 'throw-failures' }, 'stop spec on expectation failure'))
+          )
+        ));

-      checkbox.checked = !env.catchingExceptions();
-      checkbox.onclick = onRaiseExceptionsClick;
+      var raiseCheckbox = find('#raise-exceptions');
+
+      raiseCheckbox.checked = !env.catchingExceptions();
+      raiseCheckbox.onclick = onRaiseExceptionsClick;
+
+      var throwCheckbox = find('#throw-failures');
+      throwCheckbox.checked = env.throwingExpectationFailures();
+      throwCheckbox.onclick = onThrowExpectationsClick;
+
+      var optionsMenu = find('.run-options'),
+          optionsTrigger = optionsMenu.querySelector('.trigger'),
+          optionsPayload = optionsMenu.querySelector('.payload'),
+          isOpen = /\bopen\b/;
+
+      optionsTrigger.onclick = function() {
+        if (isOpen.test(optionsPayload.className)) {
+          optionsPayload.className = optionsPayload.className.replace(isOpen, '');
+        } else {
+          optionsPayload.className += ' open';
+        }
+      };

      if (specsExecuted < totalSpecsDefined) {
        var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
--- a/src/html/_HTMLReporter.scss
+++ b/src/html/_HTMLReporter.scss
@@ -14,6 +14,7 @@ $failing-color: #ca3a11;
 $pending-color: #ba9d37;
 $empty-color: #eff543;
 $neutral-color: #bababa;
+$jasmine-color: #8a4182;

 $font-size: 11px;
 $large-font-size: 14px;
@@ -77,12 +78,6 @@ body {
    top: 6px;
  }

-  .banner .duration {
-    position: absolute;
-    right: 14px;
-    top: 6px;
-   }
-
  // This div is available for testing elements that must be added to the DOM.
  // We position it out of view, so it doesn't obstruct the runner.
  #jasmine_content {
@@ -101,8 +96,10 @@ body {
  }

  .duration {
-    color: $faint-text-color;
+    color: #fff;
    float: right;
+    line-height: $line-height * 2;
+    padding-right: 9px;
  }

  //--- Symbol summary ---//
@@ -166,11 +163,32 @@ body {
    }
  }

-  .exceptions {
-    color: #fff;
+  .run-options {
    float: right;
-    margin-top: 5px;
    margin-right: 5px;
+    border: 1px solid $jasmine-color;
+    color: $jasmine-color;
+    position: relative;
+    line-height: 20px;
+
+    .trigger {
+      cursor: pointer;
+      padding: 8px 16px;
+    }
+
+    .payload {
+      position: absolute;
+      display: none;
+      right: -1px;
+      border: 1px solid $jasmine-color;
+      background-color: $page-background-color;
+      white-space: nowrap;
+      padding: 4px 8px;
+
+      &.open {
+        display: block;
+      }
+    }
  }

  //--- Alerts: status bars ---//
@@ -302,6 +320,10 @@ body {
      &.pending a {
        color: $pending-color;
      }
+
+      &.disabled a {
+        color: $neutral-color;
+      }
    }
  }

--- a/travis-node-script.sh
+++ b/travis-node-script.sh
@@ -1,6 +1,4 @@
 #!/bin/bash -e

-npm install -g grunt-cli
 npm install
-
-grunt jshint execSpecsInNode
+npm test
Author	SHA1	Message	Date
Gregg Van Hove	19f812c4f6	Fix cp command for release documentation	2015-04-28 11:27:03 -07:00
Gregg Van Hove	5ea24a8448	version bump to 2.3.0	2015-04-28 10:13:42 -07:00
Gregg Van Hove	4173a4089c	Merge pull request #827 from davetron5000/patch-1 Explicitly state the main JS	2015-04-19 10:03:19 -07:00
David Copeland	f712b795d7	Explicitly state the main JS # Problem To bring this lib in using Sprockets, you must do this: ```javascript //= require jasmine/lib/jasmine-core ``` Sprockets can read `bower.json` and, if `main` is explicitly stated in the file, you can do the much more future-proof and compact: ```javascript //= require jasmine ``` # Solution Explicitly specify it. # Caveats I am not super-versed in Bower or JS packaging, so this is proposed in the vein of "this fixes my problem and seems consistent with other JS libs I've looked at", but I'm open to other solutions.	2015-04-19 12:22:33 -04:00
Gregg Van Hove	ff029b37b5	Use `instanceof` when checking Error types in toThrowError Fixes #819	2015-04-09 15:38:24 -07:00
Gregg Van Hove	7cd8c41d31	Merge pull request #818 from lpww/patch-1 Update formatting	2015-04-05 21:56:59 -07:00
Thomas Treffry	d7dd85c64f	Update formatting Remove periods from bullet points for consistency with rest of document	2015-04-05 20:19:29 -07:00
Davis W. Frank	2d5c071d28	Merge pull request #815 from jhamon/contributing-subjective-readability-improvements Subjective readability improvements to CONTRIBUTING.md	2015-04-02 08:49:39 -07:00
Jen Hamon	76bc0a87db	Use code fence syntax around git workflow for readability.	2015-04-01 13:25:32 -07:00
Jen Hamon	5cae401c98	Pull urls out of paragraph to improve readability	2015-04-01 13:06:58 -07:00
Gregg Van Hove	1d366772b7	Don't throw if we're already handling an exception [finish #91407284]	2015-03-30 08:19:06 -07:00
Gregg Van Hove and Nikhil Gajwani	d137b83c1c	Don't install the clock if the current timing functions aren't the originals [finish #64116664] Fix #782	2015-03-27 10:14:03 -07:00
Gregg Van Hove	692c8716f0	Style disabled specs in the results list	2015-03-26 15:45:26 -07:00
Gregg Van Hove	965229bd03	Properly pass `j$` to `Any` so it can use other jasmine stuff Fixes #806	2015-03-18 13:12:40 -07:00
Gregg Van Hove	46044dd345	Merge branch 'sgravrock-clock-reset'	2015-03-15 13:23:56 -07:00
Steve Gravrock	2af9a45fb2	Correctly handle functions that are scheduled after the clock is uninstalled and reinstalled from within Clock#tick. Fixes #790.	2015-03-14 17:40:27 -07:00
Gregg Van Hove	abc0c4a97e	Update to ruby 2.x for travis builds - sauce gem allowed cmdparse to upgrade a major version and 3.0 of cmdparse requires ruby >= 2.0.0	2015-03-14 15:26:46 -07:00
slackersoft	eb1d98338a	Properly inject j$ into Suite	2015-03-06 11:43:57 -08:00
slackersoft	f0c480f456	Use `onclick` directly to better support older webkit	2015-03-06 10:09:08 -08:00
Gregg Van Hove and Molly Trombley-McCann	7693a4c959	Allow user to stop a specs execution when an expectation fails [finish #1165916] #577	2015-03-05 15:28:00 -08:00
Gregg Van Hove	1a08d1e8c6	Don't use deprecated `onComplete` syntax for jasmine-npm	2015-03-04 17:44:05 -08:00
Gregg Van Hove	ce9600a3f6	Allow the clock to be installed for the duration of a single closure [finish #67434180]	2015-03-04 17:41:49 -08:00
Gregg Van Hove and Molly Trombley-McCann	c58d83bbe3	Merge branch 'remove-unnecessary-conditional' of https://github.com/toddbranch/jasmine into toddbranch-remove-unnecessary-conditional	2015-03-04 12:00:07 -08:00
Gregg Van Hove and Molly Trombley-McCann	1c6f4ef0e6	Build distribution for previous changes	2015-03-04 11:58:47 -08:00
Gregg Van Hove	c77ff30263	Show the name of the constructor function when printing an `any` - instead of a `toString` of the entire constructor Fixes #796	2015-03-03 13:27:31 -08:00
Gregg Van Hove	dc652cfb05	Clean up some TreeProcessor stuff. - Properly segment parents of segmented suites	2015-03-03 13:14:20 -08:00
Gregg Van Hove	22f58c0049	Merge pull request #789 from sgravrock/safe-temp-dir Don't use hardcoded temporary directory paths	2015-03-02 13:59:26 -08:00
slackersoft	715de7aa38	Implement TreeProcessor to solve some issues with running the suite - execute beforeAll/afterAll once per suite instead of once per child when running focused specs/suites Fixes #773 - refuse to execute an order if it would cause a suite with a beforeAll or afterAll to be re-entered after leaving once - report children of an xdescribe similarly to how they would be reported if they were themselves x'd out Fixes #774 - only process the tree once instead of figuring it out again at each level [finishes #87545620] Fixes #776	2015-03-02 11:41:45 -08:00
slackersoft	0c68cc4afc	Fix spec so it can be run in isolation relates to #790	2015-02-27 16:57:23 -08:00
slackersoft	ce6ce4e2c7	Add safari 7 & 8 to browser matrix	2015-02-27 13:44:55 -08:00
Greg Cobb	10f87b3b90	Fixes issue where mock clock was being used by QueueRunner - If the mock clock was installed in a beforeAll, the QueueRunner would use the mock clock for its own clock. If the mock clock was ticked more than the default timeout, async specs would timeout. [fixes #783 #792]	2015-02-24 21:56:52 -05:00
Steve Gravrock	0776146d3b	Don't use hardcoded temporary directory paths	2015-02-22 16:03:20 -08:00
Todd Branchflower	bbac4bb23f	remove unnecessary conditional	2015-02-20 14:04:08 -07:00
Gregg Van Hove	8c59875afe	Merge pull request #775 from joscha/patch-1 add missing semicolon	2015-02-09 09:54:54 -08:00
Joscha Feth	cdee9c8853	add missing semicolon	2015-02-09 15:40:41 +01:00
Greg Cobb and Gregg Van Hove	69956bf8f6	ObjectContaining matches prototype properties [#769]	2015-02-05 14:15:57 -08:00
Christopher Amavisca	e1249ac89a	Remove unused standaloneBuilder var from Gruntfile	2015-02-04 17:06:56 -08:00
Christopher Amavisca	a84e0cd8ef	Add test script to package.json - Use `npm test` in travis-node-script	2015-02-04 16:55:07 -08:00
Christopher Amavisca	6177a4aeff	Update bower.json keywords to match package.json keywords	2015-02-04 16:36:43 -08:00
Christopher Amavisca	471a241493	Add keywords to package.json	2015-02-04 16:36:31 -08:00
Greg Cobb and Gregg Van Hove	d5dfbc98c3	Updates pretty printer to include array properties [fixes #766][finishes #87644044]	2015-02-04 11:05:03 -08:00
Gregg Van Hove	2ab2a83a3b	Merge pull request #768 from danilovaz/master Update year copyright	2015-02-04 09:58:40 -08:00
Greg Cobb and Gregg Van Hove	f22862fd80	Merge branch 'juliemr-arrayfix' Fixes #765	2015-02-04 09:38:45 -08:00
Julie Ralph	53b0752ff0	Allow arrays from different frames or contexts to be equal	2015-02-04 09:28:04 -08:00
Danilo Vaz	7616e5a3fd	Update year copyright	2015-02-04 08:42:18 -02:00
Greg Cobb and Gregg Van Hove	e173cd1c9d	bump version to 2.2.1 for bower fix	2015-02-02 12:24:14 -08:00
Gregg Van Hove	234dc1a047	Merge pull request #763 from gabrielhpugliese/gabrielhpugliese-patch-bower-json Fix missing comma on bower.json	2015-02-02 12:16:47 -08:00
Gabriel H Pugliese	d22a030b87	Fix missing comma on bower.json	2015-02-02 18:03:32 -02:00