Update to 2.5.2

- jasmine/jasmine-npm#88

.codeclimate.yml

@@ -0,0 +1,7 @@
+languages:
+  JavaScript: true
+exclude_paths:
+- "lib/*"
+- "dist/*"
+- "grunt/*"
+- "images/*"

.editorconfig

@@ -0,0 +1,16 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js, json, sh, yml, gemspec}]
+indent_style = space
+indent_size = 2
+
+[{Rakefile, .jshintrc}]
+indent_style = space
+indent_size = 2
+
+[*.{py}]
+indent_style = space
+indent_size = 4

.github/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. If you want to contribute but don't know what to work on, [issues tagged ready for work](https://github.com/jasmine/jasmine/labels/ready%20for%20work) should have enough detail to get started.
+
+## 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. Asign original repository to a remote named 'upstream': (`git remote add                                                                                                                       
-upstream https://github.com/pivotal/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
 
@@ -67,17 +72,21 @@ To install the Ruby dependencies, you will need Ruby, Rubygems, and Bundler avai
 
     $ bundle
 
-...will install all of the Ruby dependencies.
+...will install all of the Ruby dependencies. If the ffi gem fails to build its native extensions, you may need to manually install some system dependencies. On Ubuntu:
+
+    $ apt-get install gcc ruby ruby-dev libxml2 libxml2-dev libxslt1-dev
+
+...should get you to the point that `bundle` can install everything.
 
 To install the Node dependencies, you will need Node.js, Npm, and [Grunt](http://gruntjs.com/), the [grunt-cli](https://github.com/gruntjs/grunt-cli) and ensure that `grunt` is on your path.
 
     $ npm install --local
 
-...will install all of the node modules locally. If when you run
+...will install all of the node modules locally. Now run
 
     $ grunt
 
-...you see that JSHint runs your system is ready.
+...if you see that JSHint runs, your system is ready.
 
 ### How to write new Jasmine code
 
@@ -94,18 +103,27 @@ Follow these tips and your pull request, patch, or suggestion is much more likel
 
 ### Running Specs
 
-Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to test itself in browser.
+Jasmine uses the [Jasmine Ruby gem](http://github.com/jasmine/jasmine-gem) to test itself in browser.
 
-    $ rake jasmine
+    $ bundle exec rake jasmine
 
 ...and then visit `http://localhost:8888` to run specs.
 
-Jasmine uses the [Jasmine NPM package](http://github.com/pivotal/jasmine-npm) to test itself in a Node.js/npm environment.
+Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to test itself in a Node.js/npm environment.
 
     $ grunt execSpecsInNode
 
 ...and then the results will print to the console. All specs run except those that expect a browser (the specs in `spec/html` are ignored).
 
+The easiest way to run the tests in **Internet Explorer** is to run a VM that has IE installed. It's easy to do this with VirtualBox.
+
+1. Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
+1. Download a VM image [from Microsoft](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/). Select "VirtualBox" as the platform.
+1. Unzip the downloaded archive. There should be an OVA file inside.
+1. In VirtualBox, choose `File > Import Appliance` and select the OVA file. Accept the default settings in the dialog that appears. Now you have a Windows VM!
+1. Run the VM and start IE.
+1. With `bundle exec rake jasmine` running on your host machine, navigate to `http://10.0.2.2:8888` in IE.
+
 ## Before Committing or Submitting a Pull Request
 
 1. Ensure all specs are green in browser *and* node
@@ -114,8 +132,8 @@ Jasmine uses the [Jasmine NPM package](http://github.com/pivotal/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.
 

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+### Are you creating an issue in the correct repository?
+
+- When in doubt, create an issue here.
+- If you have an issue with the Jasmine docs, file an issue in the docs repo
+  here: https://github.com/jasmine/jasmine.github.io
+- This repository is for the core Jasmine framework
+- If you are using a test runner that wraps Jasmine (Jasmine npm, karma, etc),
+  consider filing an issue with that library if appropriate
+
+### When submitting an issue, please answer the following:
+
+ - What version are you using?
+ - What environment are you running Jasmine in (node, browser, etc)?
+ - How are you running Jasmine (standalone, npm, karma, etc)?
+ - If possible, include an example spec that demonstrates your issue.
+
+ Thanks for using Jasmine!

.gitignore

@@ -20,5 +20,5 @@ sauce_connect.log
 *.swp
 build/
 *.egg-info/
-dist/*.tar.gz
+dist
 nbproject/

.npmignore

@@ -1,6 +1,7 @@
 dist/
 grunt/
 node_modules
+pkg/
 release_notes/
 spec/
 src/
@@ -8,14 +9,20 @@ Gemfile
 Gemfile.lock
 Rakefile
 jasmine-core.gemspec
-.rspec
-.travis.yml
-.jshintrc
+.bundle/
 .gitignore
+.gitmodules
+.idea
+.jshintrc
+.rspec
+.sass-cache/
+.travis.yml
 *.sh
+*.py
 Gruntfile.js
 lib/jasmine-core.rb
 lib/jasmine-core/boot/
 lib/jasmine-core/spec
 lib/jasmine-core/version.rb
 lib/jasmine-core/*.py
+sauce_connect.log

.travis.yml

@@ -1,51 +1,70 @@
----
-script: $TEST_COMMAND
 language: ruby
-cache: bundler
-rvm: 1.9.3
+
+sudo: false
+
+rvm: 2.2.2
+
+script: $TEST_COMMAND
+
 env:
   global:
-  - USE_SAUCE=true
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - TEST_COMMAND="bash travis-core-script.sh"
-  - JASMINE_BROWSER="firefox"
-  - SAUCE_OS="Linux"
-  - SAUCE_BROWSER_VERSION=''
-  - secure: WSPWhlnC4mWSnSPquX+m1/BCu5ch5NygkaHuM2Nea7lD8oS3XLX8QncZZAsQ4lnNfqoDDuBOizG0AESiqNvE4y6x5qvLLTS6q+ce255ZEMZ71TBdZgDEEvGMEjOPPsVXiXyTQOP1lwOPlrbZvaPgWV7e11KIBab6DfFcQpnvDgo=
-  - secure: SW7CJhZnwaNT749Gdnhvqb5rbXlAOsygUAzh9qhtyvbqXKkmJdBIEsO01YF6pbju1X2twE9JvWCOxeZju43NgQChJlPsGbjY2j3k/TdQeTAJesQe2K7ytwghunI30gjEovtRH0T3w1EmcKPH8yj5eBIcB2OYoJHx8KEC7e68q1g=
-matrix:
-  include:
-  - env:
-    - USE_SAUCE=false
-    - TEST_COMMAND="bash travis-node-script.sh"
-  - env:
-    - JASMINE_BROWSER="safari"
-    - SAUCE_OS="OS X 10.8"
-    - SAUCE_BROWSER_VERSION=6
-  - env:
-    - JASMINE_BROWSER="safari"
-    - SAUCE_OS="OS X 10.6"
-    - SAUCE_BROWSER_VERSION=5
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 8"
-    - SAUCE_BROWSER_VERSION=10
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 7"
-    - SAUCE_BROWSER_VERSION=9
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 7"
-    - SAUCE_BROWSER_VERSION=8
-  - env:
-    - JASMINE_BROWSER="chrome"
+    - USE_SAUCE=true
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - TEST_COMMAND="bash travis-core-script.sh"
+    - JASMINE_BROWSER="firefox"
     - SAUCE_OS="Linux"
     - SAUCE_BROWSER_VERSION=''
-  - env:
-    - JASMINE_BROWSER="phantomjs"
-    - USE_SAUCE=false
-  - env:
-    - USE_SAUCE=false
-    - JASMINE_BROWSER="phantomjs"
-    - TEST_COMMAND="bash travis-docs-script.sh"
+    - secure: WSPWhlnC4mWSnSPquX+m1/BCu5ch5NygkaHuM2Nea7lD8oS3XLX8QncZZAsQ4lnNfqoDDuBOizG0AESiqNvE4y6x5qvLLTS6q+ce255ZEMZ71TBdZgDEEvGMEjOPPsVXiXyTQOP1lwOPlrbZvaPgWV7e11KIBab6DfFcQpnvDgo=
+    - secure: SW7CJhZnwaNT749Gdnhvqb5rbXlAOsygUAzh9qhtyvbqXKkmJdBIEsO01YF6pbju1X2twE9JvWCOxeZju43NgQChJlPsGbjY2j3k/TdQeTAJesQe2K7ytwghunI30gjEovtRH0T3w1EmcKPH8yj5eBIcB2OYoJHx8KEC7e68q1g=
+
+addons:
+  sauce_connect: true
+
+matrix:
+  include:
+    - env:
+      - USE_SAUCE=false
+      - TEST_COMMAND="bash travis-node-script.sh"
+    - env:
+      - JASMINE_BROWSER="safari"
+      - SAUCE_OS="OS X 10.11"
+      - SAUCE_BROWSER_VERSION=9
+    - 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"
+      - SAUCE_BROWSER_VERSION=6
+    - env:
+      - JASMINE_BROWSER="internet explorer"
+      - SAUCE_OS="Windows 8.1"
+      - SAUCE_BROWSER_VERSION=11
+    - env:
+      - JASMINE_BROWSER="internet explorer"
+      - SAUCE_OS="Windows 8"
+      - SAUCE_BROWSER_VERSION=10
+    - env:
+      - JASMINE_BROWSER="internet explorer"
+      - SAUCE_OS="Windows 7"
+      - SAUCE_BROWSER_VERSION=9
+    - env:
+      - JASMINE_BROWSER="internet explorer"
+      - SAUCE_OS="Windows 7"
+      - SAUCE_BROWSER_VERSION=8
+    - env:
+      - JASMINE_BROWSER="chrome"
+      - SAUCE_OS="Linux"
+      - SAUCE_BROWSER_VERSION=''
+    - env:
+      - JASMINE_BROWSER="phantomjs"
+      - USE_SAUCE=false
+    - env:
+      - USE_SAUCE=false
+      - JASMINE_BROWSER="phantomjs"
+      - TEST_COMMAND="bash travis-docs-script.sh"

GOALS_2.0.md

@@ -1,64 +0,0 @@
-# (Vague) Jasmine 2.0 Goals/(Guidelines)
-
-1. No globals!
-  * jasmine library is entirely inside `jasmine` namespace
-  * globals required for backwards compatibility should be added in `boot.js` (EG, var describe = jasmine.getCurrentEnv().describe lives in boot.js)
-1. Don't use properties as getters. Use methods.
-  * Properties aren't encapsulated -- can be mutated, unsafe.
-1. Reporters get data objects (no methods).
-  * easier to refactor as needed
-1. More unit tests - fewer nasty integration tests
-
-## Remaining non-story-able work:
-* Make a `TODO` list
-
-### Hard
-* Finish killing Globals
-  * Guidelines:
-    * New objects can have constructors on `jasmine`
-    * Top level functions can live on `jasmine`
-    * Top level (i.e., any `jasmine` property) should only be referenced inside the `Env` constructor
-    * should better allow any object to get jasmine code (Node-friendly)
-* review everything in base.js
-* Remove isA functions:
-  * isArray_ - used in matchers and spies
-  * isString_
-  * isDOMNode_
-  * isA_
-  * unimplementedMethod_, used by PrettyPrinter
-* jasmine.util should be util closure inside of env or something
-  * argsToArray is used for Spies and matching (and can be replaced)
-  * inherit is only for PrettyPrinter now
-  * formatException is used only inside Env/spec
-  * htmlEscape is for messages in matchers - should this be HTML at all?
-* Pretty printing
-  * move away from pretty printer and to a JSON.stringify implementation?
-  * jasmineToString vs. custom toString ?
-
-### Easy
-
-* unify params to ctors: options vs. attrs.
-* This will be a lot of the TODOs, but clean up & simplify Env.js (is this a 2.1 task?)
-
-### DONE
-* Matchers improvements
-  * unit testable DONE
-  * better equality (from Underscore) DONE
-  * addCustomMatchers doesn't explode stack DONE
-  * refactor equals function so that it just loops & recurses over a list of fns (custom and built-in) - 2.1? (Tracker story)
-* Spies
-  * break these out into their own tests/file DONE
-
-
-## Other Topics
-
-* Docs
-  * Docco has gone over well. Should we annotate all the sources and then have Pages be more complex, having tutorials and annotated source like Backbone? Are we small enough?
-  * Need examples for:
-     * How to build a Custom Matcher
-     * How to add a custom equality tester
-
-
-
-
-

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git'
+gem "jasmine", :git => 'https://github.com/jasmine/jasmine-gem.git'
 # gem "jasmine", path: "../jasmine-gem"
 
 gemspec

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();

MIT.LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,6 +1,7 @@
-<a name="README">[<img src="https://rawgithub.com/pivotal/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/pivotal/jasmine.png?branch=master)](https://travis-ci.org/pivotal/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine)
+[![Build Status](https://travis-ci.org/jasmine/jasmine.svg?branch=master)](https://travis-ci.org/jasmine/jasmine)
+[![Code Climate](https://codeclimate.com/github/pivotal/jasmine.svg)](https://codeclimate.com/github/pivotal/jasmine)
 
 =======
 
@@ -8,40 +9,51 @@
 
 Jasmine is a Behavior Driven Development testing framework for JavaScript. It does not rely on browsers, DOM, or any JavaScript framework. Thus it's suited for websites, [Node.js](http://nodejs.org) projects, or anywhere that JavaScript can run.
 
-Documentation & guides live here: [http://jasmine.github.io](http://jasmine.github.io/)  
+Documentation & guides live here: [http://jasmine.github.io](http://jasmine.github.io/)
 For a quick start guide of Jasmine 2.0, see the beginning of [http://jasmine.github.io/2.0/introduction.html](http://jasmine.github.io/2.0/introduction.html)
 
-Upgrading from Jasmine 1.x? Check out the [2.0 release notes](https://github.com/pivotal/jasmine/blob/v2.0.0/release_notes/20.md) for a list of what's new (including breaking interface changes).
+Upgrading from Jasmine 1.x? Check out the [2.0 release notes](https://github.com/jasmine/jasmine/blob/v2.0.0/release_notes/20.md) for a list of what's new (including breaking interface changes). You can also read the [upgrade guide](http://jasmine.github.io/2.0/upgrading.html).
 
 ## Contributing
 
-Please read the [contributors' guide](https://github.com/pivotal/jasmine/blob/master/CONTRIBUTING.md)
+Please read the [contributors' guide](https://github.com/jasmine/jasmine/blob/master/CONTRIBUTING.md)
 
 ## Installation
 
-To install Jasmine on your local box:
+For the Jasmine NPM module:<br>
+[https://github.com/jasmine/jasmine-npm](https://github.com/jasmine/jasmine-npm)
 
-* Clone Jasmine - `git clone https://github.com/pivotal/jasmine.git`
+For the Jasmine Ruby Gem:<br>
+[https://github.com/jasmine/jasmine-gem](https://github.com/jasmine/jasmine-gem)
+
+For the Jasmine Python Egg:<br>
+[https://github.com/jasmine/jasmine-py](https://github.com/jasmine/jasmine-py)
+
+For the Jasmine headless browser gulp plugin:<br>
+[https://github.com/jasmine/gulp-jasmine-browser](https://github.com/jasmine/gulp-jasmine-browser)
+
+To install Jasmine standalone on your local box:
+
+* Download the standalone distribution for your desired release from the [releases page](https://github.com/jasmine/jasmine/releases)
 * Create a Jasmine directory in your project - `mkdir my-project/jasmine`
-* Move latest dist to your project directory - `mv jasmine/dist/jasmine-standalone-2.0.0.zip my-project/jasmine`
+* Move the dist to your project directory - `mv jasmine/dist/jasmine-standalone-2.0.0.zip my-project/jasmine`
 * Change directory - `cd my-project/jasmine`
 * Unzip the dist - `unzip jasmine-standalone-2.0.0.zip`
 
 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"> 
+```html
+<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">
 
-    <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>
-    <script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/boot.js"></script>
+<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>
+<script type="text/javascript" src="jasmine/lib/jasmine-2.0.0/boot.js"></script>
+```
 
-For the Jasmine Ruby Gem:<br>
-[https://github.com/pivotal/jasmine-gem](https://github.com/pivotal/jasmine-gem)
-
-For the Jasmine Python Egg:<br>
-[https://github.com/pivotal/jasmine-py](https://github.com/pivotal/jasmine-py)
+## Supported environments
 
+Jasmine tests itself across many browsers (Safari, Chrome, Firefox, PhantomJS, and new Internet Explorer) as well as node. To see the exact version tests are run against look at our [.travis.yml](https://github.com/jasmine/jasmine/blob/master/.travis.yml)
 
 
 ## Support
@@ -55,11 +67,13 @@ For the Jasmine Python Egg:<br>
 
 * [Davis W. Frank](mailto:dwfrank@pivotal.io), Pivotal Labs
 * [Rajan Agaskar](mailto:rajan@pivotal.io), Pivotal Labs
-* [Gregg Van Hove](mailto:ghove@pivotal.io), Pivotal Labs
+* [Gregg Van Hove](mailto:gvanhove@pivotal.io), Pivotal Labs
+* [Greg Cobb](mailto:gcobb@pivotal.io), Pivotal Labs
+* [Chris Amavisca](mailto:camavisca@pivotal.io), Pivotal Labs
 
 ### Maintainers Emeritus
 
 * [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-2016 Pivotal Labs. This software is licensed under the MIT License.

RELEASE.md

@@ -15,11 +15,16 @@ Please attempt to keep commits to `master` small, but cohesive. If a feature is
 
 We attempt to stick to [Semantic Versioning](http://semver.org/). Most of the time, development should be against a new minor version - fixing bugs and adding new features that are backwards compatible.
 
-The current version lives in the file `/package.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0.
+The current version lives in the file `/package.json`. This version will be the version number that is currently released. When releasing a new version, update `package.json` with the new version and `grunt build:copyVersionToGem` to update the gem version number.
 
 This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem.
 
-Note that Jasmine should *not* use the "patch" version number. Let downstream projects rev their patch versions as needed, keeping their major and minor version numbers in sync with Jasmine core.
+Note that Jasmine should only use the "patch" version number in the following cases:
+
+* Changes related to packaging for a specific platform (npm, gem, or pip).
+* Fixes for regressions.
+
+When jasmine-core revs its major or minor version, the binding libraries should also rev to that version.
 
 ## Release
 
@@ -32,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
 
@@ -56,12 +59,12 @@ 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
 
-1. Visit the [Releases page for Jasmine](https://github.com/pivotal/jasmine/releases), find the tag just pushed.
+1. Visit the [Releases page for Jasmine](https://github.com/jasmine/jasmine/releases), find the tag just pushed.
  1. Paste in a link to the correct release notes for this release. The link should reference the blob and tag correctly, and the markdown file for the notes.
  1. If it is a pre-release, mark it as such.
  1. Attach the standalone zipfile

bower.json

@@ -0,0 +1,40 @@
+{
+  "name": "jasmine-core",
+  "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/jasmine.js",
+  "ignore": [
+    "**/.*",
+    "dist",
+    "grunt",
+    "node_modules",
+    "pkg",
+    "release_notes",
+    "spec",
+    "src",
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "jasmine-core.gemspec",
+    "*.sh",
+    "*.py",
+    "Gruntfile.js",
+    "lib/jasmine-core.rb",
+    "lib/jasmine-core/boot/",
+    "lib/jasmine-core/spec",
+    "lib/jasmine-core/version.rb",
+    "lib/jasmine-core/*.py",
+    "sauce_connect.log"
+  ]
+}

grunt/config/compass.js

@@ -5,6 +5,7 @@ module.exports = {
       sassDir: 'src/html',
       outputStyle: 'compact',
       noLineComments: true,
+      bundleExec: true
     }
   }
 };

grunt/config/concat.js

@@ -26,6 +26,7 @@ module.exports = {
       'src/core/base.js',
       'src/core/util.js',
       'src/core/Spec.js',
+      'src/core/Order.js',
       'src/core/Env.js',
       'src/core/JsApiReporter.js',
       'src/core/PrettyPrinter',

jasmine-core.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = %q{JavaScript BDD framework}
   s.description = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.}
   s.email = %q{jasmine-js@googlegroups.com}
-  s.homepage = "http://pivotal.github.com/jasmine"
+  s.homepage = "http://jasmine.github.io"
   s.rubyforge_project = "jasmine-core"
   s.license = "MIT"
 

lib/console/console.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

lib/jasmine-core/boot.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -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,13 +74,27 @@ 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);
+
+  var random = queryString.getParam("random");
+  env.randomizeTests(random);
+
+  var seed = queryString.getParam("seed");
+  if (seed) {
+    env.seed(seed);
+  }
+
   /**
    * ## 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).
    */
   var htmlReporter = new jasmine.HtmlReporter({
     env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
+    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
+    onRandomClick: function() { queryString.navigateWithNewParam("random", !env.randomTests()); },
+    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
     getContainer: function() { return document.body; },
     createElement: function() { return document.createElement.apply(document, arguments); },
     createTextNode: function() { return document.createTextNode.apply(document, arguments); },

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,13 +52,27 @@
   var catchingExceptions = queryString.getParam("catch");
   env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
 
+  var throwingExpectationFailures = queryString.getParam("throwFailures");
+  env.throwOnExpectationFailure(throwingExpectationFailures);
+
+  var random = queryString.getParam("random");
+  env.randomizeTests(random);
+
+  var seed = queryString.getParam("seed");
+  if (seed) {
+    env.seed(seed);
+  }
+
   /**
    * ## 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).
    */
   var htmlReporter = new jasmine.HtmlReporter({
     env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
+    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
+    onRandomClick: function() { queryString.navigateWithNewParam("random", !env.randomTests()); },
+    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
     getContainer: function() { return document.body; },
     createElement: function() { return document.createElement.apply(document, arguments); },
     createTextNode: function() { return document.createTextNode.apply(document, arguments); },

lib/jasmine-core/example/node_example/spec/jasmine_examples/PlayerSpec.js

@@ -1,6 +1,6 @@
 describe("Player", function() {
-  var Player = require('../src/Player.js');
-  var Song = require('../src/Song.js');
+  var Player = require('../../lib/jasmine_examples/Player');
+  var Song = require('../../lib/jasmine_examples/Song');
   var player;
   var song;
 

lib/jasmine-core/example/spec/SpecHelper.js

@@ -7,7 +7,7 @@ beforeEach(function () {
 
           return {
             pass: player.currentlyPlayingSong === expected && player.isPlaying
-          }
+          };
         }
       };
     }

lib/jasmine-core/jasmine-html.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -40,6 +40,9 @@ jasmineRequire.HtmlReporter = function(j$) {
       createElement = options.createElement,
       createTextNode = options.createTextNode,
       onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {},
+      onThrowExpectationsClick = options.onThrowExpectationsClick || function() {},
+      onRandomClick = options.onRandomClick || function() {},
+      addToExistingQueryString = options.addToExistingQueryString || defaultQueryString,
       timer = options.timer || noopTimer,
       results = [],
       specsExecuted = 0,
@@ -52,19 +55,17 @@ jasmineRequire.HtmlReporter = function(j$) {
     this.initialize = function() {
       clearPrior();
       htmlReporterMain = createDom('div', {className: 'jasmine_html-reporter'},
-        createDom('div', {className: 'banner'},
-          createDom('a', {className: 'title', href: 'http://jasmine.github.io/', target: '_blank'}),
-          createDom('span', {className: 'version'}, j$.version)
+        createDom('div', {className: 'jasmine-banner'},
+          createDom('a', {className: 'jasmine-title', href: 'http://jasmine.github.io/', target: '_blank'}),
+          createDom('span', {className: 'jasmine-version'}, j$.version)
         ),
-        createDom('ul', {className: 'symbol-summary'}),
-        createDom('div', {className: 'alert'}),
-        createDom('div', {className: 'results'},
-          createDom('div', {className: 'failures'})
+        createDom('ul', {className: 'jasmine-symbol-summary'}),
+        createDom('div', {className: 'jasmine-alert'}),
+        createDom('div', {className: 'jasmine-results'},
+          createDom('div', {className: 'jasmine-failures'})
         )
       );
       getContainer().appendChild(htmlReporterMain);
-
-      symbols = find('.symbol-summary');
     };
 
     var totalSpecsDefined;
@@ -73,7 +74,7 @@ jasmineRequire.HtmlReporter = function(j$) {
       timer.start();
     };
 
-    var summary = createDom('div', {className: 'summary'});
+    var summary = createDom('div', {className: 'jasmine-summary'});
 
     var topResults = new j$.ResultsNode({}, '', null),
       currentParent = topResults;
@@ -109,8 +110,12 @@ jasmineRequire.HtmlReporter = function(j$) {
         specsExecuted++;
       }
 
+      if (!symbols){
+        symbols = find('.jasmine-symbol-summary');
+      }
+
       symbols.appendChild(createDom('li', {
-          className: noExpectations(result) ? 'empty' : result.status,
+          className: noExpectations(result) ? 'jasmine-empty' : 'jasmine-' + result.status,
           id: 'spec_' + result.id,
           title: result.fullName
         }
@@ -120,18 +125,18 @@ jasmineRequire.HtmlReporter = function(j$) {
         failureCount++;
 
         var failure =
-          createDom('div', {className: 'spec-detail failed'},
-            createDom('div', {className: 'description'},
+          createDom('div', {className: 'jasmine-spec-detail jasmine-failed'},
+            createDom('div', {className: 'jasmine-description'},
               createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName)
             ),
-            createDom('div', {className: 'messages'})
+            createDom('div', {className: 'jasmine-messages'})
           );
         var messages = failure.childNodes[1];
 
         for (var i = 0; i < result.failedExpectations.length; i++) {
           var expectation = result.failedExpectations[i];
-          messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message));
-          messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack));
+          messages.appendChild(createDom('div', {className: 'jasmine-result-message'}, expectation.message));
+          messages.appendChild(createDom('div', {className: 'jasmine-stack-trace'}, expectation.stack));
         }
 
         failures.push(failure);
@@ -142,57 +147,114 @@ jasmineRequire.HtmlReporter = function(j$) {
       }
     };
 
-    this.jasmineDone = function() {
-      var banner = find('.banner');
-      banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));
+    this.jasmineDone = function(doneResult) {
+      var banner = find('.jasmine-banner');
+      var alert = find('.jasmine-alert');
+      var order = doneResult && doneResult.order;
+      alert.appendChild(createDom('span', {className: 'jasmine-duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));
 
-      var alert = find('.alert');
+      banner.appendChild(
+        createDom('div', { className: 'jasmine-run-options' },
+          createDom('span', { className: 'jasmine-trigger' }, 'Options'),
+          createDom('div', { className: 'jasmine-payload' },
+            createDom('div', { className: 'jasmine-exceptions' },
+              createDom('input', {
+                className: 'jasmine-raise',
+                id: 'jasmine-raise-exceptions',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'jasmine-label', 'for': 'jasmine-raise-exceptions' }, 'raise exceptions')),
+            createDom('div', { className: 'jasmine-throw-failures' },
+              createDom('input', {
+                className: 'jasmine-throw',
+                id: 'jasmine-throw-failures',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'jasmine-label', 'for': 'jasmine-throw-failures' }, 'stop spec on expectation failure')),
+            createDom('div', { className: 'jasmine-random-order' },
+              createDom('input', {
+                className: 'jasmine-random',
+                id: 'jasmine-random-order',
+                type: 'checkbox'
+              }),
+              createDom('label', { className: 'jasmine-label', 'for': 'jasmine-random-order' }, 'run tests in random order'))
+          )
+        ));
 
-      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');
+      var raiseCheckbox = find('#jasmine-raise-exceptions');
 
-      checkbox.checked = !env.catchingExceptions();
-      checkbox.onclick = onRaiseExceptionsClick;
+      raiseCheckbox.checked = !env.catchingExceptions();
+      raiseCheckbox.onclick = onRaiseExceptionsClick;
+
+      var throwCheckbox = find('#jasmine-throw-failures');
+      throwCheckbox.checked = env.throwingExpectationFailures();
+      throwCheckbox.onclick = onThrowExpectationsClick;
+
+      var randomCheckbox = find('#jasmine-random-order');
+      randomCheckbox.checked = env.randomTests();
+      randomCheckbox.onclick = onRandomClick;
+
+      var optionsMenu = find('.jasmine-run-options'),
+          optionsTrigger = optionsMenu.querySelector('.jasmine-trigger'),
+          optionsPayload = optionsMenu.querySelector('.jasmine-payload'),
+          isOpen = /\bjasmine-open\b/;
+
+      optionsTrigger.onclick = function() {
+        if (isOpen.test(optionsPayload.className)) {
+          optionsPayload.className = optionsPayload.className.replace(isOpen, '');
+        } else {
+          optionsPayload.className += ' jasmine-open';
+        }
+      };
 
       if (specsExecuted < totalSpecsDefined) {
         var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
+        var skippedLink = order && order.random ? '?random=true' : '?';
         alert.appendChild(
-          createDom('span', {className: 'bar skipped'},
-            createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage)
+          createDom('span', {className: 'jasmine-bar jasmine-skipped'},
+            createDom('a', {href: skippedLink, title: 'Run all specs'}, skippedMessage)
           )
         );
       }
       var statusBarMessage = '';
-      var statusBarClassName = 'bar ';
+      var statusBarClassName = 'jasmine-bar ';
 
       if (totalSpecsDefined > 0) {
         statusBarMessage += pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount);
         if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); }
-        statusBarClassName += (failureCount > 0) ? 'failed' : 'passed';
+        statusBarClassName += (failureCount > 0) ? 'jasmine-failed' : 'jasmine-passed';
       } else {
-        statusBarClassName += 'skipped';
+        statusBarClassName += 'jasmine-skipped';
         statusBarMessage += 'No specs found';
       }
 
-      alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage));
+      var seedBar;
+      if (order && order.random) {
+        seedBar = createDom('span', {className: 'jasmine-seed-bar'},
+          ', randomized with seed ',
+          createDom('a', {title: 'randomized with seed ' + order.seed, href: seedHref(order.seed)}, order.seed)
+        );
+      }
 
-      for(i = 0; i < failedSuites.length; i++) {
+      alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage, seedBar));
+
+      var errorBarClassName = 'jasmine-bar jasmine-errored';
+      var errorBarMessagePrefix = 'AfterAll ';
+
+      for(var i = 0; i < failedSuites.length; i++) {
         var failedSuite = failedSuites[i];
         for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
-          var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message;
-          var errorBarClassName = 'bar errored';
-          alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage));
+          alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message));
         }
       }
 
-      var results = find('.results');
+      var globalFailures = (doneResult && doneResult.failedExpectations) || [];
+      for(i = 0; i < globalFailures.length; i++) {
+        var failure = globalFailures[i];
+        alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failure.message));
+      }
+
+      var results = find('.jasmine-results');
       results.appendChild(summary);
 
       summaryList(topResults, summary);
@@ -202,8 +264,8 @@ jasmineRequire.HtmlReporter = function(j$) {
         for (var i = 0; i < resultsTree.children.length; i++) {
           var resultNode = resultsTree.children[i];
           if (resultNode.type == 'suite') {
-            var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id},
-              createDom('li', {className: 'suite-detail'},
+            var suiteListNode = createDom('ul', {className: 'jasmine-suite', id: 'suite-' + resultNode.result.id},
+              createDom('li', {className: 'jasmine-suite-detail'},
                 createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description)
               )
             );
@@ -212,17 +274,20 @@ jasmineRequire.HtmlReporter = function(j$) {
             domParent.appendChild(suiteListNode);
           }
           if (resultNode.type == 'spec') {
-            if (domParent.getAttribute('class') != 'specs') {
-              specListNode = createDom('ul', {className: 'specs'});
+            if (domParent.getAttribute('class') != 'jasmine-specs') {
+              specListNode = createDom('ul', {className: 'jasmine-specs'});
               domParent.appendChild(specListNode);
             }
             var specDescription = resultNode.result.description;
             if(noExpectations(resultNode.result)) {
               specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription;
             }
+            if(resultNode.result.status === 'pending' && resultNode.result.pendingReason !== '') {
+              specDescription = specDescription + ' PENDING WITH MESSAGE: ' + resultNode.result.pendingReason;
+            }
             specListNode.appendChild(
               createDom('li', {
-                  className: resultNode.result.status,
+                  className: 'jasmine-' + resultNode.result.status,
                   id: 'spec-' + resultNode.result.id
                 },
                 createDom('a', {href: specHref(resultNode.result)}, specDescription)
@@ -234,25 +299,25 @@ jasmineRequire.HtmlReporter = function(j$) {
 
       if (failures.length) {
         alert.appendChild(
-          createDom('span', {className: 'menu bar spec-list'},
+          createDom('span', {className: 'jasmine-menu jasmine-bar jasmine-spec-list'},
             createDom('span', {}, 'Spec List | '),
-            createDom('a', {className: 'failures-menu', href: '#'}, 'Failures')));
+            createDom('a', {className: 'jasmine-failures-menu', href: '#'}, 'Failures')));
         alert.appendChild(
-          createDom('span', {className: 'menu bar failure-list'},
-            createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'),
+          createDom('span', {className: 'jasmine-menu jasmine-bar jasmine-failure-list'},
+            createDom('a', {className: 'jasmine-spec-list-menu', href: '#'}, 'Spec List'),
             createDom('span', {}, ' | Failures ')));
 
-        find('.failures-menu').onclick = function() {
-          setMenuModeTo('failure-list');
+        find('.jasmine-failures-menu').onclick = function() {
+          setMenuModeTo('jasmine-failure-list');
         };
-        find('.spec-list-menu').onclick = function() {
-          setMenuModeTo('spec-list');
+        find('.jasmine-spec-list-menu').onclick = function() {
+          setMenuModeTo('jasmine-spec-list');
         };
 
-        setMenuModeTo('failure-list');
+        setMenuModeTo('jasmine-failure-list');
 
-        var failureNode = find('.failures');
-        for (var i = 0; i < failures.length; i++) {
+        var failureNode = find('.jasmine-failures');
+        for (i = 0; i < failures.length; i++) {
           failureNode.appendChild(failures[i]);
         }
       }
@@ -267,7 +332,7 @@ jasmineRequire.HtmlReporter = function(j$) {
     function clearPrior() {
       // return the reporter
       var oldReporter = find('');
-      
+
       if(oldReporter) {
         getContainer().removeChild(oldReporter);
       }
@@ -306,7 +371,15 @@ jasmineRequire.HtmlReporter = function(j$) {
     }
 
     function specHref(result) {
-      return '?spec=' + encodeURIComponent(result.fullName);
+      return addToExistingQueryString('spec', result.fullName);
+    }
+
+    function seedHref(seed) {
+      return addToExistingQueryString('seed', seed);
+    }
+
+    function defaultQueryString(key, value) {
+      return '?' + key + '=' + value;
     }
 
     function setMenuModeTo(mode) {
@@ -358,10 +431,14 @@ jasmineRequire.ResultsNode = function() {
 jasmineRequire.QueryString = function() {
   function QueryString(options) {
 
-    this.setParam = function(key, value) {
+    this.navigateWithNewParam = function(key, value) {
+      options.getWindowLocation().search = this.fullStringWithNewParam(key, value);
+    };
+
+    this.fullStringWithNewParam = function(key, value) {
       var paramMap = queryStringToParamMap();
       paramMap[key] = value;
-      options.getWindowLocation().search = toQueryString(paramMap);
+      return toQueryString(paramMap);
     };
 
     this.getParam = function(key) {

lib/jasmine-core/node_boot.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2014 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.1.1"
+    VERSION = "2.5.2"
   end
 end

package.json

@@ -1,23 +1,34 @@
 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "2.1.1",
+  "version": "2.5.2",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pivotal/jasmine.git"
+    "url": "https://github.com/jasmine/jasmine.git"
+  },
+  "keywords": [
+    "test",
+    "jasmine",
+    "tdd",
+    "bdd"
+  ],
+  "scripts": {
+    "test": "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": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-jshint": "~0.7.0",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-compass": "~0.6.0",
-    "grunt-contrib-compress": "~0.5.2",
-    "shelljs": "~0.1.4",
-    "glob": "~3.2.9",
-    "jasmine": "https://github.com/pivotal/jasmine-npm/archive/master.tar.gz",
-    "load-grunt-tasks": "^0.4.0"
+    "glob": "~7.0.5",
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-compass": "^1.1.1",
+    "grunt-contrib-compress": "^1.3.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-jshint": "^1.0.0",
+    "jasmine": "^2.4.0",
+    "load-grunt-tasks": "^0.4.0",
+    "shelljs": "^0.7.0",
+    "temp": "~0.8.1"
   }
 }

release_notes/2.1.2.md

@@ -0,0 +1,14 @@
+# Jasmine Core 2.1.2 Release Notes
+
+## Summary
+
+This is a hotfix release of jasmine core to fix a breaking change with reporting when all of the specs in a suite are pending.
+
+## Changes
+
+- Suites still run their children even if none are executable
+    - Fixes [#707](http://github.com/pivotal/jasmine/issues/707)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.1.3.md

@@ -0,0 +1,21 @@
+# Jasmine Core 2.1.3 Release Notes
+
+## Summary
+
+This release is primarily a bug-fix release to clean up some recent regressions.
+
+## Pull Requests & Issues
+
+* Top level suite no longer reports suiteStart and suiteDone
+    - Fixes [#716](https://github.com/jasmine/jasmine/issues/716)
+
+* Don't keep the expected and actual for a passed expectation
+    - Fixes [#640](https://github.com/jasmine/jasmine/issues/640)
+    - Fixes [#690](https://github.com/jasmine/jasmine/issues/690)
+
+* Use the new build env on Travis
+    - Merges [#712](https://github.com/jasmine/jasmine/issues/712) from @joshk
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.2.0.md

@@ -0,0 +1,98 @@
+# Jasmine Core 2.2.0 Release Notes
+
+## Changes
+
+* `ObjectContaining` no longer tries to track exact mismatches
+* HTML reporter keeps extra query params when focusing on a spec or suite 
+* Check custom properties on Arrays when computing equality
+* Better error message if `spyOn` is called without a method name
+* Rename `jasmineMatches` to `asymmetricMatch`
+* Don't double escape focus spec links
+* Jasmine equality checks if either side implements `asymmetricMatch`
+* Add asymmetric equality tester to match a string with a RegExp
+* Add jshint to node build on Travis for pull request builds
+* Restructure node examples directory to look more realistic
+
+## Pull Requests & Issues
+
+* Add a basic bower config
+    - Fixes [#719](https://github.com/jasmine/jasmine/issues/719)
+
+* Allow `pending` to take a reason and show it in the HtmlReporter
+    - Fixes [#671](https://github.com/jasmine/jasmine/issues/671)
+
+* Set jasmineGlobal correctly in GJS
+    - Merges [#757](https://github.com/jasmine/jasmine/issues/757) from @ptomato
+    - Fixes [#751](https://github.com/jasmine/jasmine/issues/751)
+
+* Fix some SpiderMonkey lint warnings
+    - Merges [#752](https://github.com/jasmine/jasmine/issues/752) from @ptomato
+    - Fixes [#751](https://github.com/jasmine/jasmine/issues/751)
+
+* Prevents *Alls from running when runnables are explicitly set
+    - Fixes [#732](https://github.com/jasmine/jasmine/issues/732)
+
+* Update contribution guide to mention possible ffi dependencies for Ubuntu
+    - Fixes [#755](https://github.com/jasmine/jasmine/issues/755)
+
+* Fix spelling mistake in contributors guide
+    - Merges [#746](https://github.com/jasmine/jasmine/issues/746) from @swirlycheetah
+
+* Use new jasmine github repo url
+    - Merges [#745](https://github.com/jasmine/jasmine/issues/745) rohit
+
+* Allow `createSpyObj` to be called with just an array of method names
+    - Fixes [#321](https://github.com/jasmine/jasmine/issues/321)
+
+* Add `arrayContaining` matcher
+    - Merges [#440](https://github.com/jasmine/jasmine/issues/440) from @slackersoft
+
+* Use the stack trace from the Error object if supplied
+    - Fixes [#734](https://github.com/jasmine/jasmine/issues/734)
+
+* Update readme with link to upgrading doc and mention browser support.
+    - Fixes [#739](https://github.com/jasmine/jasmine/issues/739)
+
+* Link to the Jasmine NPM module
+    - Merges [#736](https://github.com/jasmine/jasmine/issues/736) from @moonmaster9000
+
+* Allow null prototype objects to be compared for equality
+    - Merges [#731](https://github.com/jasmine/jasmine/issues/731) from @rohit
+    - Fixes [#729](https://github.com/jasmine/jasmine/issues/729)
+
+* Fix URL's of Jasmine repositories on Github
+    - Merges [#730](https://github.com/jasmine/jasmine/issues/730) from @rohit
+
+* Add `anything` matcher to match any value that is neither null or undefined
+    - Fixes [#186](https://github.com/jasmine/jasmine/issues/186)
+
+* Allow asymmetric equality testers to preempt their symmetric brethren
+    - Fixes [#540](https://github.com/jasmine/jasmine/issues/540)
+
+* Check for `ObjectContaining` on either side of equality
+    - Fixes [#682](https://github.com/jasmine/jasmine/issues/682)
+
+* Display the name of the constructor when pretty printing objects
+    - Fixes [#598](https://github.com/jasmine/jasmine/issues/598)
+
+* `toMatch` requires the `expected` to be a String or RegExp
+    - Fixes [#723](https://github.com/jasmine/jasmine/issues/723)
+
+* Better equality comparison of Dom nodes
+    - Merges [#657](https://github.com/jasmine/jasmine/issues/657) from @alexeibs
+
+* Hide unnecessary files from the npm package
+    - Fixes [#726](https://github.com/jasmine/jasmine/issues/726)
+
+* Properly record finishing an `xdescribe` so further cleanup works
+    - Fixes [#724](https://github.com/jasmine/jasmine/issues/724)
+
+* Reschedule all functions for a tick before executing any. This allows any function run during a tick to cancel any other in the same tick.
+    - Fixes [#708](https://github.com/jasmine/jasmine/issues/708)
+
+* Pass through all args from external interface for befores, afters, its
+    - Fixes [#483](https://github.com/jasmine/jasmine/issues/483)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

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)_

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)_

release_notes/2.3.1.md

@@ -0,0 +1,14 @@
+# Jasmine 2.3.1 Release Notes
+
+## Summary
+
+This release is a packaging update for bower only.
+
+## Pull Requests & Issues
+
+* Point Bower's main field to jasmine.js, which is browser-friendly.
+    - Merge [#843](https://github.com/jasmine/jasmine/issues/843) from @evoL
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.3.2.md

@@ -0,0 +1,14 @@
+# Jasmine 2.3.2 Release Notes
+
+## Summary
+
+This is a hotfix release to fix a regression with specs declared without a function body
+
+## Pull Requests & Issues
+
+* A spec without a function provided should be `pending` not `disabled`
+    - Fixes [#840](https://github.com/jasmine/jasmine/issues/840)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.3.3.md

@@ -0,0 +1,14 @@
+# Jasmine 2.3.3 Release Notes
+
+## Summary
+
+This is a hotfix release to fix a regression with the execution context for `beforeAll`
+
+## Pull Requests & Issues
+
+* Set the shared user context correctly when executing the top level suite
+    - Fixes [#846](https://github.com/jasmine/jasmine/issues/846)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.3.4.md

@@ -0,0 +1,22 @@
+# Jasmine 2.3.4 Release Notes
+
+## Summary
+
+This is a hotfix release to fix a regression with execution ordering
+
+## Pull Requests & Issues
+
+* Fix ordering for suites with more than 11 direct children.
+    - Fixes [#850](https://github.com/jasmine/jasmine/issues/850)
+
+* Update standalone installation instructions to reference the releases page
+    - Fixes [#603](https://github.com/jasmine/jasmine/issues/603)
+
+* Remove dead CSS class styles
+    - Merges [#849](https://github.com/jasmine/jasmine/issues/849) from @prather-mcs
+    - Merges [#848](https://github.com/jasmine/jasmine/issues/848) from @prather-mcs
+    - Fixes [#847](https://github.com/jasmine/jasmine/issues/847)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.4.0.md

@@ -0,0 +1,91 @@
+# Jasmine Core 2.4.0 Release Notes
+
+## Summary
+
+This release contains a number of fixes and pull requests.
+The most notable is probably that Jasmine now supports randomization of spec order
+
+## Changes
+
+* Run jasmine's specs in random order
+* Add support for returning run details for reporting randomness
+* Use className instead of class when creating DOM elements
+
+
+## Pull Requests & Issues
+
+* Syntax highlighting in README.md
+    - Merges [#973](https://github.com/jasmine/jasmine/issues/973) from @brunoqc
+
+* Added a throw error block in describe incase a function with arguments is passed in describe
+    - Fixes [#896](https://github.com/jasmine/jasmine/issues/896)
+    - Merges [#955](https://github.com/jasmine/jasmine/issues/955) from @himajasuman
+
+* Remove unused `queueableFn` arg from `onException`
+    - Fixes [#958](https://github.com/jasmine/jasmine/issues/958)
+
+* Remove unused parameter from toThrowError
+    - Merges [#957](https://github.com/jasmine/jasmine/issues/957) from @FuzzySockets
+
+* Abort spying when the target cannot be spied upon
+    - Fixes [#948](https://github.com/jasmine/jasmine/issues/948)
+    - Merges [#949](https://github.com/jasmine/jasmine/issues/949) from @StephanBijzitter
+
+* Removed GOALS_2.0.md, doesn't seem to be needed anymore
+    - Merges [#954](https://github.com/jasmine/jasmine/issues/954) from @matthewhuff89
+
+* Change #xit so that it will output a more BDD-style pending message
+    - Merges [#942](https://github.com/jasmine/jasmine/issues/942) from @lalunamel
+    - Fixes [#930](https://github.com/jasmine/jasmine/issues/930)
+    - Fixes [#912](https://github.com/jasmine/jasmine/issues/912)
+
+* Allow tests to run in random order
+    - Merges [#927](https://github.com/jasmine/jasmine/issues/927) from @marcioj
+
+* Use toString for objects if it has been overriden
+    - Merges [#929](https://github.com/jasmine/jasmine/issues/929) from @myitcv
+    - Fixes [#928](https://github.com/jasmine/jasmine/issues/928)
+
+* Fix circles/x from getting cut off on Mac/chrome
+    - Merges [#932](https://github.com/jasmine/jasmine/issues/932) from @James-Dunn
+
+* Postpone find() until it is needed
+    - Merges [#924](https://github.com/jasmine/jasmine/issues/924) from @danielalexiuc
+    - Fixes [#917](https://github.com/jasmine/jasmine/issues/917)
+
+* check for global before assigning
+* Reverse suite afterEach behavior to match semantics?
+    - Merges [#908](https://github.com/jasmine/jasmine/issues/908) from @mcamac
+
+* Use badges from shields.io
+    - Merges [#902](https://github.com/jasmine/jasmine/issues/902) from @SimenB
+
+* xdescribe marks pending, plus associated tests.
+    - Merges [#869](https://github.com/jasmine/jasmine/issues/869) from @ljwall
+    - Fixes [#855](https://github.com/jasmine/jasmine/issues/855)
+
+* Update glob to latest
+    - Merge [#892](https://github.com/jasmine/jasmine/issues/892) from @obastemur
+    - Fixes [#891](https://github.com/jasmine/jasmine/issues/891)
+
+* Remove moot `version` property from bower.json
+    - Merges [#874](https://github.com/jasmine/jasmine/issues/874) from @kkirsche
+
+* add toHaveBeenCalledTimes matcher
+    - Merges [#871](https://github.com/jasmine/jasmine/issues/871) from @logankd
+    - Fixes [#853](https://github.com/jasmine/jasmine/issues/853)
+
+* Update CONTRIBUTING.md
+    - Merges [#856](https://github.com/jasmine/jasmine/issues/856) from @lpww
+
+* Make the HtmlReport CSS classes "unique enough"
+    - Merges [#851](https://github.com/jasmine/jasmine/issues/851) from @prather-mcs
+    - Fixes [#844](https://github.com/jasmine/jasmine/issues/844)
+
+* Raise an error when jasmine.any() isn't passed a constructor
+    - Merges [#854](https://github.com/jasmine/jasmine/issues/854) from @danfinnie
+    - Fixes [#852](https://github.com/jasmine/jasmine/issues/852)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.4.1.md

@@ -0,0 +1,11 @@
+# Jasmine Core 2.4.1 Release Notes
+
+## Changes
+
+* Run `afterEach` in reverse order declared as before
+    - Reverts [#908](https://github.com/jasmine/jasmine/issues/908)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.5.0.md

@@ -0,0 +1,116 @@
+# Jasmine 2.5.0 Release Notes 
+
+## Summary
+
+This release contains a number of fixes and pull requests.
+
+## Changes
+
+* Rename `j$` to `jasmineUnderTest` for specs
+    - Please update any pull requests to simplify merging, thanks.
+
+## Pull Requests & Issues
+
+* Prettyprint objects whose constructors have custom toString method
+  - Fixes [#1019](https://github.com/jasmine/jasmine/issues/1019)
+  - Merges [#1099](https://github.com/jasmine/jasmine/issues/1099) from @mbildner
+
+* Add gulp-jasmine-browser link to readme
+  - Fixes [#1089](https://github.com/jasmine/jasmine/issues/1089)
+
+* Exclude lib directory from codeclimate
+  - Fixes [#1171](https://github.com/jasmine/jasmine/issues/1171)
+
+* Add instructions for testing in IE
+  - Merges [#1170](https://github.com/jasmine/jasmine/issues/1170) from @benchristel
+
+* Update devDependencies and fix issues from this
+  - Merges [#1162](https://github.com/jasmine/jasmine/issues/1162) from @amavisca
+
+* Remove runnableLookupTable which is no longer used
+  - Merges [#1129](https://github.com/jasmine/jasmine/issues/1129) from @gregeninfrank
+
+* Make `toEqual` pass for arrays with equivalent properties
+  - Merges [#1155](https://github.com/jasmine/jasmine/issues/1155) from @benchristel
+
+* Update ruby version on travis to let rack install
+  - Merges [#1152](https://github.com/jasmine/jasmine/issues/1152) from @amavisca
+
+* Fix jasmine setup in Electron environment
+  - Merges [#1079](https://github.com/jasmine/jasmine/issues/1079) from @skupr
+  - Fixes [#964](https://github.com/jasmine/jasmine/issues/964)
+
+* Improve errors with the domain and how to use the API
+  - Merges [#1026](https://github.com/jasmine/jasmine/issues/1026) from @dhoko
+  - Fixes [#1025](https://github.com/jasmine/jasmine/issues/1025)
+
+* The done function now returns null
+  - Merges [#1062](https://github.com/jasmine/jasmine/issues/1062) from @marneborn
+  - Fixes [#992](https://github.com/jasmine/jasmine/issues/992)
+
+* Add .editorconfig file
+  - Merges [#1058](https://github.com/jasmine/jasmine/issues/1058) from @kapke
+  - Fixes [#1057](https://github.com/jasmine/jasmine/issues/1057)
+
+* Improve error message when passing a non-function to callFake
+  - Merges [#1059](https://github.com/jasmine/jasmine/issues/1059) from @kapke
+  - Fixes [#1016](https://github.com/jasmine/jasmine/issues/1016)
+
+* Allow expectations in a global beforeAll or afterAll
+  - Fixes [#811](https://github.com/jasmine/jasmine/issues/811)
+
+* Correctly tear down spies on inherited methods
+  - Merges [#1036](https://github.com/jasmine/jasmine/issues/1036) from @benchristel
+  - Fixes [#737](https://github.com/jasmine/jasmine/issues/737)
+
+* Array equality treats undefined elements as equal however they got in there
+  - Fixes [#786](https://github.com/jasmine/jasmine/issues/786)
+
+* Add support for a fallback reporter
+  - Merges [#1009](https://github.com/jasmine/jasmine/issues/1009) from @mauricioborges
+
+* Grunt task for compass should prefix command with 'bundle exec'
+  - Merges [#1047](https://github.com/jasmine/jasmine/issues/1047) from @d-reinhold
+
+* Fix `toEqual` for Microsoft Edge
+  - Merges [#1041](https://github.com/jasmine/jasmine/issues/1041) from @everedifice
+
+* Update describe error message to no longer assume errant args are `done`
+  - Fixes [#896](https://github.com/jasmine/jasmine/issues/896)
+
+* Add toBeGreatThanOrEqual and toBeLessThanOrEqual matchers
+  - Merges [#1049](https://github.com/jasmine/jasmine/issues/1049) from @rullopat
+  - Fixes [#1013](https://github.com/jasmine/jasmine/issues/1013)
+
+* Support call count of 0 with toHaveBeenCalledTimes matcher
+  - Merges [#1048](https://github.com/jasmine/jasmine/issues/1048) from @logankd
+  - Fixes [#994](https://github.com/jasmine/jasmine/issues/994)
+
+* Correctly clean up spies after a spy is replaced and re-spied upon
+  - Merges [#1011](https://github.com/jasmine/jasmine/issues/1011) from @bodawei
+  - Fixes [#1010](https://github.com/jasmine/jasmine/issues/1010)
+
+* remove extra topSuite `queueRunner` construction parameter
+  - Merges [#1006](https://github.com/jasmine/jasmine/issues/1006) from @jurko-gospodnetic
+
+* add option to shallow clone args in call tracker
+  - Merges [#1000](https://github.com/jasmine/jasmine/issues/1000) from @a-r-d
+  - Fixes [#872](https://github.com/jasmine/jasmine/issues/872)
+
+* Update license year range to 2016
+    - Merges [#1021](https://github.com/jasmine/jasmine/issues/1021) from pra85
+
+* Persist randomize param in 'run all' links
+    - Merges [#990](https://github.com/jasmine/jasmine/issues/990) from @basawyer
+
+* make DelayedFunctionScheduler update the mockDate
+    - Fixes [#915](https://github.com/jasmine/jasmine/issues/915)
+    - Merges [#980](https://github.com/jasmine/jasmine/issues/980) from @andrewiggings
+
+* Allow `spyOn` to allow a respy for functions that have already been spied upon
+  - Merges [#953](https://github.com/jasmine/jasmine/issues/953) from @guy-mograbi-at-gigaspaces
+  - Fixes [#931](https://github.com/jasmine/jasmine/issues/931)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.5.1.md

@@ -0,0 +1,19 @@
+# Jasmine 2.5.1 Release Notes
+
+## Pull Requests & Issues
+
+* fallback on assignment when a spy cannot be deleted
+  - Merges [#1193](https://github.com/jasmine/jasmine/issues/1193) from @seanparmlee
+  - Fixes [#1189](https://github.com/jasmine/jasmine/issues/1189)
+
+* Fix issue with equality of Arrays in PhantomJS
+  - Merges [#1192](https://github.com/jasmine/jasmine/issues/1192) from @logankd
+  - Fixes [#1188](https://github.com/jasmine/jasmine/issues/1188)
+
+* Properly tick date along with clock
+  - Fixes [#1190](https://github.com/jasmine/jasmine/issues/1190)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.5.2.md

@@ -0,0 +1,14 @@
+# Jasmine 2.5.2 Release Notes
+
+## Pull Requests & Issues
+
+* Allow currently registered reporters to be cleared
+  - [jasmine/jasmine-npm#88](https://github.com/jasmine/jasmine-npm/issues/88)
+
+
+* Use `isFunction` to check for functionness in `callFake`
+  - Fixes [#1191](https://github.com/jasmine/jasmine/issues/1191)
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

setup.py

@@ -7,7 +7,7 @@ with open('package.json') as packageFile:
 setup(
     name="jasmine-core",
     version=version,
-    url="http://pivotal.github.io/jasmine/",
+    url="http://jasmine.github.io",
     author="Pivotal Labs",
     author_email="jasmine-js@googlegroups.com",
     description=('Jasmine is a Behavior Driven Development testing framework for JavaScript. It does not rely on '+

spec/console/ConsoleReporterSpec.js

@@ -19,7 +19,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports that the suite has started to the console", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -30,7 +30,7 @@ describe("ConsoleReporter", function() {
 
   it("starts the provided timer when jasmine starts", function() {
     var timerSpy = jasmine.createSpyObj('timer', ['start']),
-        reporter = new j$.ConsoleReporter({
+        reporter = new jasmineUnderTest.ConsoleReporter({
           print: out.print,
           timer: timerSpy
         });
@@ -41,7 +41,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a passing spec as a dot", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -51,7 +51,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("does not report a disabled spec", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -61,7 +61,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a failing spec as an 'F'", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -71,7 +71,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a pending spec as a '*'", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -81,7 +81,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("alerts user if there are no specs", function(){
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
           print: out.print
         });
 
@@ -94,7 +94,7 @@ describe("ConsoleReporter", function() {
 
   it("reports a summary when done (singular spec and time)", function() {
     var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new j$.ConsoleReporter({
+        reporter = new jasmineUnderTest.ConsoleReporter({
           print: out.print,
           timer: timerSpy
         });
@@ -114,7 +114,7 @@ describe("ConsoleReporter", function() {
 
   it("reports a summary when done (pluralized specs and seconds)", function() {
     var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new j$.ConsoleReporter({
+        reporter = new jasmineUnderTest.ConsoleReporter({
           print: out.print,
           timer: timerSpy
         });
@@ -148,7 +148,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes stack traces for a failing suite", function() {
-    var reporter = new j$.ConsoleReporter({
+    var reporter = new jasmineUnderTest.ConsoleReporter({
       print: out.print
     });
 
@@ -182,7 +182,7 @@ describe("ConsoleReporter", function() {
 
     beforeEach(function() {
       onComplete = jasmine.createSpy('onComplete');
-      reporter = new j$.ConsoleReporter({
+      reporter = new jasmineUnderTest.ConsoleReporter({
         print: out.print,
         onComplete: onComplete
       });
@@ -210,7 +210,7 @@ describe("ConsoleReporter", function() {
 
   describe("with color", function() {
     it("reports that the suite has started to the console", function() {
-      var reporter = new j$.ConsoleReporter({
+      var reporter = new jasmineUnderTest.ConsoleReporter({
         print: out.print,
         showColors: true
       });
@@ -221,7 +221,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("reports a passing spec as a dot", function() {
-      var reporter = new j$.ConsoleReporter({
+      var reporter = new jasmineUnderTest.ConsoleReporter({
         print: out.print,
         showColors: true
       });
@@ -232,7 +232,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("does not report a disabled spec", function() {
-      var reporter = new j$.ConsoleReporter({
+      var reporter = new jasmineUnderTest.ConsoleReporter({
         print: out.print,
         showColors: true
       });
@@ -243,7 +243,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("reports a failing spec as an 'F'", function() {
-      var reporter = new j$.ConsoleReporter({
+      var reporter = new jasmineUnderTest.ConsoleReporter({
         print: out.print,
         showColors: true
       });
@@ -254,7 +254,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("displays all afterAll exceptions", function() {
-        var reporter = new j$.ConsoleReporter({
+        var reporter = new jasmineUnderTest.ConsoleReporter({
           print: out.print,
           showColors: true
         });

spec/core/AnySpec.js

@@ -1,46 +0,0 @@
-describe("Any", function() {
-  it("matches a string", function() {
-    var any = new j$.Any(String);
-
-    expect(any.jasmineMatches("foo")).toBe(true);
-  });
-
-  it("matches a number", function() {
-    var any = new j$.Any(Number);
-
-    expect(any.jasmineMatches(1)).toBe(true);
-  });
-
-  it("matches a function", function() {
-    var any = new j$.Any(Function);
-
-    expect(any.jasmineMatches(function(){})).toBe(true);
-  });
-
-  it("matches an Object", function() {
-    var any = new j$.Any(Object);
-
-    expect(any.jasmineMatches({})).toBe(true);
-  });
-  
-  it("matches a Boolean", function() {
-    var any = new j$.Any(Boolean);
-
-    expect(any.jasmineMatches(true)).toBe(true);
-  });
-
-  it("matches another constructed object", function() {
-    var Thing = function() {},
-      any = new j$.Any(Thing);
-
-    expect(any.jasmineMatches(new Thing())).toBe(true);
-  });
-
-  it("jasmineToString's itself", function() {
-    var any = new j$.Any(Number);
-
-    expect(any.jasmineToString()).toMatch('<jasmine.any');
-    expect(any.jasmineToString()).toMatch('Number');
-  });
-
-});

spec/core/CallTrackerSpec.js

@@ -1,6 +1,6 @@
 describe("CallTracker", function() {
   it("tracks that it was called when executed", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.any()).toBe(false);
 
@@ -10,7 +10,7 @@ describe("CallTracker", function() {
   });
 
   it("tracks that number of times that it is executed", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.count()).toEqual(0);
 
@@ -20,7 +20,7 @@ describe("CallTracker", function() {
   });
 
   it("tracks the params from each execution", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({object: void 0, args: []});
     callTracker.track({object: {}, args: [0, "foo"]});
@@ -31,13 +31,13 @@ describe("CallTracker", function() {
   });
 
   it("returns any empty array when there was no call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.argsFor(0)).toEqual([]);
   });
 
   it("allows access for the arguments for all calls", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({object: {}, args: []});
     callTracker.track({object: {}, args: [0, "foo"]});
@@ -46,7 +46,7 @@ describe("CallTracker", function() {
   });
 
   it("tracks the context and arguments for each call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({object: {}, args: []});
     callTracker.track({object: {}, args: [0, "foo"]});
@@ -57,7 +57,7 @@ describe("CallTracker", function() {
   });
 
   it("simplifies access to the arguments for the last (most recent) call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track();
     callTracker.track({object: {}, args: [0, "foo"]});
@@ -69,13 +69,13 @@ describe("CallTracker", function() {
   });
 
   it("returns a useful falsy value when there isn't a last (most recent) call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.mostRecent()).toBeFalsy();
   });
 
   it("simplifies access to the arguments for the first (oldest) call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({object: {}, args: [0, "foo"]});
 
@@ -83,14 +83,14 @@ describe("CallTracker", function() {
   });
 
   it("returns a useful falsy value when there isn't a first (oldest) call", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.first()).toBeFalsy();
   });
 
 
   it("allows the tracking to be reset", function() {
-    var callTracker = new j$.CallTracker();
+    var callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track();
     callTracker.track({object: {}, args: [0, "foo"]});
@@ -102,4 +102,19 @@ describe("CallTracker", function() {
     expect(callTracker.all()).toEqual([]);
     expect(callTracker.mostRecent()).toBeFalsy();
   });
+
+  it("allows object arguments to be shallow cloned", function() {
+    var callTracker = new jasmineUnderTest.CallTracker();
+    callTracker.saveArgumentsByValue();
+
+    var objectArg = {"foo": "bar"},
+        arrayArg = ["foo", "bar"];
+
+    callTracker.track({object: {}, args: [objectArg, arrayArg, false, undefined, null, NaN, "", 0, 1.0]});
+
+    expect(callTracker.mostRecent().args[0]).not.toBe(objectArg);
+    expect(callTracker.mostRecent().args[0]).toEqual(objectArg);
+    expect(callTracker.mostRecent().args[1]).not.toBe(arrayArg);
+    expect(callTracker.mostRecent().args[1]).toEqual(arrayArg);
+  });
 });

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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.Clock(fakeGlobal, function () { return delayedFunctionScheduler; }, mockDate);
 
     clock.install();
     clock.clearInterval(123);
@@ -215,7 +384,7 @@ describe("Clock", function() {
   });
 
   it("gives you a friendly reminder if the Clock is not installed and you tick", function() {
-    var clock = new j$.Clock({}, jasmine.createSpyObj('delayedFunctionScheduler', ['tick']));
+    var clock = new jasmineUnderTest.Clock({}, jasmine.createSpyObj('delayedFunctionScheduler', ['tick']));
     expect(function() {
       clock.tick(50);
     }).toThrow();
@@ -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 jasmineUnderTest.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() {
@@ -260,9 +428,9 @@ describe("Clock (acceptance)", function() {
       delayedFn2 = jasmine.createSpy('delayedFn2'),
       delayedFn3 = jasmine.createSpy('delayedFn3'),
       recurring1 = jasmine.createSpy('recurring1'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      clock = new jasmineUnderTest.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);
 
     clock.install();
 
@@ -307,9 +475,9 @@ describe("Clock (acceptance)", function() {
 
   it("can clear a previously set timeout", function() {
     var clearedFn = jasmine.createSpy('clearedFn'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate),
+      clock = new jasmineUnderTest.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate),
       timeoutId;
 
     clock.install();
@@ -325,9 +493,9 @@ describe("Clock (acceptance)", function() {
 
   it("can clear a previously set interval using that interval's handler", function() {
     var spy = jasmine.createSpy('spy'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setInterval: function() {}}, delayedFunctionScheduler, mockDate),
+      clock = new jasmineUnderTest.Clock({setInterval: function() {}}, function () { return delayedFunctionScheduler; }, mockDate),
       intervalId;
 
     clock.install();
@@ -343,9 +511,9 @@ describe("Clock (acceptance)", function() {
 
   it("correctly schedules functions after the Clock has advanced", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+      clock = new jasmineUnderTest.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);
 
     clock.install();
 
@@ -360,9 +528,9 @@ describe("Clock (acceptance)", function() {
   it("correctly schedules functions while the Clock is advancing", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
         delayedFn2 = jasmine.createSpy('delayedFn2'),
-        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+        delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
         mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+        clock = new jasmineUnderTest.Clock({setTimeout: function() {}}, function () { return delayedFunctionScheduler; }, mockDate);
 
     delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 0); });
     clock.install();
@@ -379,9 +547,9 @@ describe("Clock (acceptance)", function() {
   it("correctly calls functions scheduled while the Clock is advancing", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
         delayedFn2 = jasmine.createSpy('delayedFn2'),
-        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+        delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
         mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
+        clock = new jasmineUnderTest.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 jasmineUnderTest.DelayedFunctionScheduler(),
+        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+        clock = new jasmineUnderTest.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(),
+     var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = {Date: Date},
-      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      mockDate = new jasmineUnderTest.MockDate(global),
+      clock = new jasmineUnderTest.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);
 
     clock.install();
 
@@ -410,10 +602,10 @@ describe("Clock (acceptance)", function() {
   });
 
   it("mocks the Date object and sets it to current time", function() {
-    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = {Date: Date},
-      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+      mockDate = new jasmineUnderTest.MockDate(global),
+      clock = new jasmineUnderTest.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate);
 
     clock.install().mockDate();
 
@@ -434,10 +626,10 @@ describe("Clock (acceptance)", function() {
   });
 
   it("mocks the Date object and sets it to a given time", function() {
-    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = {Date: Date},
-      mockDate = new j$.MockDate(global),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate),
+      mockDate = new jasmineUnderTest.MockDate(global),
+      clock = new jasmineUnderTest.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate),
       baseTime = new Date(2013, 9, 23);
 
 
@@ -460,4 +652,31 @@ describe("Clock (acceptance)", function() {
 
     expect(timeoutDate).toEqual(baseTime.getTime() + 150);
   });
+
+  it("mocks the Date object and updates the date per delayed function", function () {
+    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+      global = {Date: Date},
+      mockDate = new jasmineUnderTest.MockDate(global),
+      clock = new jasmineUnderTest.Clock({setTimeout: setTimeout}, function () { return delayedFunctionScheduler; }, mockDate),
+      baseTime = new Date();
+
+    clock.install().mockDate(baseTime);
+
+    var actualTimes = [];
+    var pushCurrentTime = function() { actualTimes.push(global.Date().getTime()); };
+    delayedFunctionScheduler.scheduleFunction(pushCurrentTime);
+    delayedFunctionScheduler.scheduleFunction(pushCurrentTime, 1);
+    delayedFunctionScheduler.scheduleFunction(pushCurrentTime, 3);
+
+    clock.tick(1);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 1);
+
+    clock.tick(3);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 4);
+
+    clock.tick(1);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 5);
+
+    expect(actualTimes).toEqual([baseTime.getTime(), baseTime.getTime() + 1, baseTime.getTime() + 3]);
+  })
 });

spec/core/DelayedFunctionSchedulerSpec.js

@@ -1,6 +1,6 @@
 describe("DelayedFunctionScheduler", function() {
   it("schedules a function for later execution", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0);
@@ -13,7 +13,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("schedules a string for later execution", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       strfn = "horrible = true;";
 
     scheduler.scheduleFunction(strfn, 0);
@@ -24,7 +24,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("#tick defaults to 0", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0);
@@ -37,7 +37,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("defaults delay to 0", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn);
@@ -50,7 +50,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("optionally passes params to scheduled functions", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0, ['foo', 'bar']);
@@ -63,7 +63,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("scheduled fns can optionally reoccur", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 20, [], true);
@@ -85,7 +85,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("increments scheduled fns ids unless one is passed", function() {
-    var scheduler = new j$.DelayedFunctionScheduler();
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler();
 
     expect(scheduler.scheduleFunction(function() {
     }, 0)).toBe(1);
@@ -98,7 +98,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("#removeFunctionWithId removes a previously scheduled function with a given id", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       timeoutKey;
 
@@ -113,49 +113,8 @@ 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(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       recurringCallCount = 0,
       recurring = jasmine.createSpy('recurring').and.callFake(function() {
@@ -176,7 +135,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("schedules a function for later execution during a tick", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       fnDelay = 10;
 
@@ -192,7 +151,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("#removeFunctionWithId removes a previously scheduled function with a given id during a tick", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       fnDelay = 10,
       timeoutKey;
@@ -210,7 +169,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("executes recurring functions interleaved with regular functions and functions scheduled during a tick in the correct order", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       recurringCallCount = 0,
       recurring = jasmine.createSpy('recurring').and.callFake(function() {
@@ -243,7 +202,7 @@ describe("DelayedFunctionScheduler", function() {
   });
 
   it("executes recurring functions after rescheduling them", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       recurring = function() {
         expect(scheduler.scheduleFunction).toHaveBeenCalled();
       };
@@ -255,5 +214,55 @@ describe("DelayedFunctionScheduler", function() {
     scheduler.tick(10);
   });
 
+  it("removes functions during a tick that runs the function", function() {
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+      fn = jasmine.createSpy('fn'),
+      fnDelay = 10,
+      timeoutKey;
+
+    timeoutKey = scheduler.scheduleFunction(fn, fnDelay, [], true);
+    scheduler.scheduleFunction(function () {
+      scheduler.removeFunctionWithId(timeoutKey);
+    }, 2 * fnDelay);
+
+    expect(fn).not.toHaveBeenCalled();
+
+    scheduler.tick(3 * fnDelay);
+
+    expect(fn).toHaveBeenCalled();
+    expect(fn.calls.count()).toBe(2);
+  });
+
+  it("removes functions during the first tick that runs the function", function() {
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+      fn = jasmine.createSpy('fn'),
+      fnDelay = 10,
+      timeoutKey;
+
+    timeoutKey = scheduler.scheduleFunction(fn, fnDelay, [], true);
+    scheduler.scheduleFunction(function () {
+      scheduler.removeFunctionWithId(timeoutKey);
+    }, fnDelay);
+
+    expect(fn).not.toHaveBeenCalled();
+
+    scheduler.tick(3 * fnDelay);
+
+    expect(fn).toHaveBeenCalled();
+    expect(fn.calls.count()).toBe(1);
+  });
+
+  it("updates the mockDate per scheduled time", function () {
+    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+      tickDate = jasmine.createSpy('tickDate');
+
+      scheduler.scheduleFunction(function() {});
+      scheduler.scheduleFunction(function() {}, 1);
+
+      scheduler.tick(1, tickDate);
+
+      expect(tickDate).toHaveBeenCalledWith(0);
+      expect(tickDate).toHaveBeenCalledWith(1);
+  })
 });
 

spec/core/EnvSpec.js

@@ -2,14 +2,20 @@
 describe("Env", function() {
   var env;
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmineUnderTest.Env();
   });
 
   describe("#pending", function() {
     it("throws the Pending Spec exception", function() {
       expect(function() {
         env.pending();
-      }).toThrow(j$.Spec.pendingSpecExceptionMessage);
+      }).toThrow(jasmineUnderTest.Spec.pendingSpecExceptionMessage);
+    });
+
+    it("throws the Pending Spec exception with a custom message", function() {
+      expect(function() {
+        env.pending('custom message');
+      }).toThrow(jasmineUnderTest.Spec.pendingSpecExceptionMessage + 'custom message');
     });
   });
 
@@ -19,4 +25,44 @@ describe("Env", function() {
       expect(suite.description).toEqual('Jasmine__TopLevel__Suite');
     });
   });
+
+  describe('#describe', function () {
+    var spec = function(done){};
+    it("throws the error", function() {
+      expect(function() {
+        env.describe('done method', spec);
+      }).toThrow(new Error('describe does not expect any arguments'));
+    });
+  });
+
+  it('can configure specs to throw errors on expectation failures', function() {
+    env.throwOnExpectationFailure(true);
+
+    spyOn(jasmineUnderTest, 'Spec');
+    env.it('foo', function() {});
+    expect(jasmineUnderTest.Spec).toHaveBeenCalledWith(jasmine.objectContaining({
+      throwOnExpectationFailure: true
+    }));
+  });
+
+  it('can configure suites to throw errors on expectation failures', function() {
+    env.throwOnExpectationFailure(true);
+
+    spyOn(jasmineUnderTest, 'Suite');
+    env.describe('foo', function() {});
+    expect(jasmineUnderTest.Suite).toHaveBeenCalledWith(jasmine.objectContaining({
+      throwOnExpectationFailure: true
+    }));
+  });
+
+  describe('#xit', function() {
+    it('calls spec.pend with "Temporarily disabled with xit"', function() {
+      var pendSpy = jasmine.createSpy();
+      spyOn(env, 'it').and.returnValue({
+        pend: pendSpy
+      });
+      env.xit();
+      expect(pendSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
+    });
+  });
 });

spec/core/ExceptionFormatterSpec.js

@@ -7,7 +7,7 @@ describe("ExceptionFormatter", function() {
           message: 'you got your foo in my bar',
           name: 'A Classic Mistake'
         },
-        exceptionFormatter = new j$.ExceptionFormatter(),
+        exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(sampleFirefoxException);
 
       expect(message).toEqual('A Classic Mistake: you got your foo in my bar in foo.js (line 1978)');
@@ -20,7 +20,7 @@ describe("ExceptionFormatter", function() {
           message: 'you got your foo in my bar',
           name: 'A Classic Mistake'
         },
-        exceptionFormatter = new j$.ExceptionFormatter(),
+        exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(sampleWebkitException);
 
       expect(message).toEqual('A Classic Mistake: you got your foo in my bar in foo.js (line 1978)');
@@ -31,7 +31,7 @@ describe("ExceptionFormatter", function() {
           message: 'you got your foo in my bar',
           name: 'A Classic Mistake'
         },
-        exceptionFormatter = new j$.ExceptionFormatter(),
+        exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(sampleV8);
 
       expect(message).toEqual('A Classic Mistake: you got your foo in my bar');
@@ -39,7 +39,7 @@ describe("ExceptionFormatter", function() {
 
     it("formats thrown exceptions that aren't errors", function() {
       var thrown = "crazy error",
-          exceptionFormatter = new j$.ExceptionFormatter(),
+          exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
           message = exceptionFormatter.message(thrown);
 
       expect(message).toEqual("crazy error thrown");
@@ -53,11 +53,11 @@ describe("ExceptionFormatter", function() {
       var error;
       try { throw new Error("an error") } catch(e) { error = e; }
 
-      expect(new j$.ExceptionFormatter().stack(error)).toMatch(/ExceptionFormatterSpec\.js.*\d+/)
+      expect(new jasmineUnderTest.ExceptionFormatter().stack(error)).toMatch(/ExceptionFormatterSpec\.js.*\d+/)
     });
 
     it("returns null if no Error provided", function() {
-      expect(new j$.ExceptionFormatter().stack()).toBeNull();
+      expect(new jasmineUnderTest.ExceptionFormatter().stack()).toBeNull();
     });
   });
 });

spec/core/ExceptionsSpec.js

@@ -2,7 +2,7 @@ describe('Exceptions:', function() {
   var env;
 
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmineUnderTest.Env();
   });
 
   describe('with break on exception', function() {

spec/core/ExpectationResultSpec.js

@@ -1,16 +1,16 @@
 describe("buildExpectationResult", function() {
   it("defaults to passed", function() {
-    var result = j$.buildExpectationResult({passed: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({passed: 'some-value'});
     expect(result.passed).toBe('some-value');
   });
 
   it("message defaults to Passed for passing specs", function() {
-    var result = j$.buildExpectationResult({passed: true, message: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({passed: true, message: 'some-value'});
     expect(result.message).toBe('Passed.');
   });
 
   it("message returns the message for failing expectations", function() {
-    var result = j$.buildExpectationResult({passed: false, message: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({passed: false, message: 'some-value'});
     expect(result.message).toBe('some-value');
   });
 
@@ -18,7 +18,7 @@ describe("buildExpectationResult", function() {
     var fakeError = {message: 'foo'},
       messageFormatter = jasmine.createSpy("exception message formatter").and.returnValue(fakeError.message);
 
-    var result = j$.buildExpectationResult(
+    var result = jasmineUnderTest.buildExpectationResult(
       {
         passed: false,
         error: fakeError,
@@ -33,7 +33,7 @@ describe("buildExpectationResult", function() {
     var fakeError = {stack: 'foo'},
       stackFormatter = jasmine.createSpy("stack formatter").and.returnValue(fakeError.stack);
 
-    var result = j$.buildExpectationResult(
+    var result = jasmineUnderTest.buildExpectationResult(
       {
         passed: false,
         error: fakeError,
@@ -45,17 +45,17 @@ describe("buildExpectationResult", function() {
   });
 
   it("matcherName returns passed matcherName", function() {
-    var result = j$.buildExpectationResult({matcherName: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({matcherName: 'some-value'});
     expect(result.matcherName).toBe('some-value');
   });
 
   it("expected returns passed expected", function() {
-    var result = j$.buildExpectationResult({expected: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({expected: 'some-value'});
     expect(result.expected).toBe('some-value');
   });
 
   it("actual returns passed actual", function() {
-    var result = j$.buildExpectationResult({actual: 'some-value'});
+    var result = jasmineUnderTest.buildExpectationResult({actual: 'some-value'});
     expect(result.actual).toBe('some-value');
   });
 });

spec/core/ExpectationSpec.js

@@ -6,7 +6,7 @@ describe("Expectation", function() {
       },
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers
     });
 
@@ -20,18 +20,18 @@ describe("Expectation", function() {
       },
       expectation;
 
-    j$.Expectation.addCoreMatchers(coreMatchers);
+    jasmineUnderTest.Expectation.addCoreMatchers(coreMatchers);
 
-    expectation = new j$.Expectation({});
+    expectation = new jasmineUnderTest.Expectation({});
 
     expect(expectation.toQuux).toBeDefined();
   });
 
   it("Factory builds an expectation/negative expectation", function() {
-    var builtExpectation = j$.Expectation.Factory();
+    var builtExpectation = jasmineUnderTest.Expectation.Factory();
 
-    expect(builtExpectation instanceof j$.Expectation).toBe(true);
-    expect(builtExpectation.not instanceof j$.Expectation).toBe(true);
+    expect(builtExpectation instanceof jasmineUnderTest.Expectation).toBe(true);
+    expect(builtExpectation.not instanceof jasmineUnderTest.Expectation).toBe(true);
     expect(builtExpectation.not.isNot).toBe(true);
   });
 
@@ -46,7 +46,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       util: util,
       customMatchers: matchers,
       customEqualityTesters: customEqualityTesters,
@@ -74,7 +74,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       util: util,
       customMatchers: matchers,
       actual: "an actual",
@@ -100,7 +100,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       util: util,
       actual: "an actual",
@@ -132,7 +132,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       util: util,
       actual: "an actual",
@@ -166,7 +166,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       actual: "an actual",
       customMatchers: matchers,
       addExpectationResult: addExpectationResult
@@ -199,7 +199,7 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult
@@ -231,7 +231,7 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
@@ -264,7 +264,7 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       util: util,
@@ -300,7 +300,7 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
@@ -331,7 +331,7 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
@@ -367,7 +367,7 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    expectation = new j$.Expectation({
+    expectation = new jasmineUnderTest.Expectation({
       customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,

spec/core/JsApiReporterSpec.js

@@ -5,7 +5,7 @@ xdescribe('JsApiReporter (integration specs)', function() {
     var suite, nestedSuite, nestedSpec;
 
     beforeEach(function() {
-      env = new j$.Env();
+      env = new jasmineUnderTest.Env();
 
       suite = env.describe("top-level suite", function() {
         spec1 = env.it("spec 1", function() {
@@ -25,7 +25,7 @@ xdescribe('JsApiReporter (integration specs)', function() {
 
       });
 
-      reporter = new j$.JsApiReporter({});
+      reporter = new jasmineUnderTest.JsApiReporter({});
       env.addReporter(reporter);
 
       env.execute();
@@ -82,7 +82,7 @@ xdescribe('JsApiReporter (integration specs)', function() {
 describe("JsApiReporter", function() {
 
   it("knows when a full environment is started", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.started).toBe(false);
     expect(reporter.finished).toBe(false);
@@ -94,7 +94,7 @@ describe("JsApiReporter", function() {
   });
 
   it("knows when a full environment is done", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.started).toBe(false);
     expect(reporter.finished).toBe(false);
@@ -106,13 +106,13 @@ describe("JsApiReporter", function() {
   });
 
   it("defaults to 'loaded' status", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.status()).toEqual('loaded');
   });
 
   it("reports 'started' when Jasmine has started", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.jasmineStarted();
 
@@ -120,7 +120,7 @@ describe("JsApiReporter", function() {
   });
 
   it("reports 'done' when Jasmine is done", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.jasmineDone({});
 
@@ -128,7 +128,7 @@ describe("JsApiReporter", function() {
   });
 
   it("tracks a suite", function() {
-    var reporter = new j$.JsApiReporter({});
+    var reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.suiteStarted({
       id: 123,
@@ -151,7 +151,7 @@ describe("JsApiReporter", function() {
   describe("#specResults", function() {
     var reporter, specResult1, specResult2;
     beforeEach(function() {
-      reporter = new j$.JsApiReporter({});
+      reporter = new jasmineUnderTest.JsApiReporter({});
       specResult1 = {
         id: 1,
         description: "A spec"
@@ -181,7 +181,7 @@ describe("JsApiReporter", function() {
   describe("#suiteResults", function(){
     var reporter, suiteResult1, suiteResult2;
     beforeEach(function() {
-      reporter = new j$.JsApiReporter({});
+      reporter = new jasmineUnderTest.JsApiReporter({});
       suiteStarted1 = {
         id: 1
       };
@@ -218,7 +218,7 @@ describe("JsApiReporter", function() {
   describe("#executionTime", function() {
     it("should start the timer when jasmine starts", function() {
       var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-          reporter = new j$.JsApiReporter({
+          reporter = new jasmineUnderTest.JsApiReporter({
             timer: timerSpy
           });
 
@@ -228,7 +228,7 @@ describe("JsApiReporter", function() {
 
     it("should return the time it took the specs to run, in ms", function() {
       var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-          reporter = new j$.JsApiReporter({
+          reporter = new jasmineUnderTest.JsApiReporter({
             timer: timerSpy
           });
 
@@ -240,7 +240,7 @@ describe("JsApiReporter", function() {
     describe("when the specs haven't finished being run", function() {
       it("should return undefined", function() {
         var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-            reporter = new j$.JsApiReporter({
+            reporter = new jasmineUnderTest.JsApiReporter({
               timer: timerSpy
             });
 
@@ -248,4 +248,12 @@ describe("JsApiReporter", function() {
       });
     });
   });
+
+  describe('#runDetails', function() {
+    it('should have details about the run', function() {
+      var reporter = new jasmineUnderTest.JsApiReporter({});
+      reporter.jasmineDone({some: {run: 'details'}});
+      expect(reporter.runDetails).toEqual({some: {run: 'details'}});
+    });
+  });
 });

spec/core/MockDateSpec.js

@@ -1,7 +1,7 @@
 describe("FakeDate", function() {
   it("does not fail if no global date is found", function() {
     var fakeGlobal = {},
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     expect(function() {
       mockDate.install();
@@ -17,7 +17,7 @@ describe("FakeDate", function() {
         }
       }),
       fakeGlobal = { Date: globalDate },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     expect(fakeGlobal.Date).toEqual(globalDate);
     mockDate.install();
@@ -32,7 +32,7 @@ describe("FakeDate", function() {
         }
       }),
       fakeGlobal = { Date: globalDate },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
     mockDate.uninstall();
@@ -49,7 +49,7 @@ describe("FakeDate", function() {
         }
       }),
       fakeGlobal = { Date: globalDate },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -60,7 +60,7 @@ describe("FakeDate", function() {
 
   it("can accept a date as time base when installing", function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal),
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal),
       baseDate = new Date();
 
     spyOn(baseDate, 'getTime').and.returnValue(123);
@@ -71,7 +71,7 @@ describe("FakeDate", function() {
 
   it("makes real dates", function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
     expect(new fakeGlobal.Date()).toEqual(jasmine.any(Date));
@@ -89,7 +89,7 @@ describe("FakeDate", function() {
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new j$.MockDate(fakeGlobal);
+    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -105,7 +105,7 @@ describe("FakeDate", function() {
         }
       }),
       fakeGlobal = { Date: globalDate },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -123,7 +123,7 @@ describe("FakeDate", function() {
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new j$.MockDate(fakeGlobal);
+    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -147,7 +147,7 @@ describe("FakeDate", function() {
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new j$.MockDate(fakeGlobal);
+    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -160,7 +160,7 @@ describe("FakeDate", function() {
 
   it("allows creation of a Date in a different time than the mocked time", function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -170,7 +170,7 @@ describe("FakeDate", function() {
 
   it("allows creation of a Date that isn't fully specified", function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -180,7 +180,7 @@ describe("FakeDate", function() {
 
   it('allows creation of a Date with millis', function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal),
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal),
       now = new Date(2014, 3, 15).getTime();
 
     mockDate.install();
@@ -191,7 +191,7 @@ describe("FakeDate", function() {
 
   it("copies all Date properties to the mocked date", function() {
     var fakeGlobal = { Date: Date },
-      mockDate = new j$.MockDate(fakeGlobal);
+      mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 

spec/core/ObjectContainingSpec.js

@@ -1,70 +0,0 @@
-describe("ObjectContaining", function() {
-
-  it("matches any actual to an empty object", function() {
-    var containing = new j$.ObjectContaining({});
-
-    expect(containing.jasmineMatches("foo")).toBe(true);
-  });
-
-  it("does not match an empty object actual", function() {
-    var containing = new j$.ObjectContaining("foo");
-
-    expect(function() {
-      containing.jasmineMatches({})
-    }).toThrowError(/not 'foo'/)
-  });
-
-  it("matches when the key/value pair is present in the actual", function() {
-    var containing = new j$.ObjectContaining({foo: "fooVal"});
-
-    expect(containing.jasmineMatches({foo: "fooVal", bar: "barVal"})).toBe(true);
-  });
-
-  it("does not match when the key/value pair is not present in the actual", function() {
-    var containing = new j$.ObjectContaining({foo: "fooVal"});
-
-    expect(containing.jasmineMatches({bar: "barVal", quux: "quuxVal"})).toBe(false);
-  });
-
-  it("does not match when the key is present but the value is different in the actual", function() {
-    var containing = new j$.ObjectContaining({foo: "other"});
-
-    expect(containing.jasmineMatches({foo: "fooVal", bar: "barVal"})).toBe(false);
-  });
-  
-  it("mismatchValues parameter must return array with mismatched reason", function() {
-    var containing = new j$.ObjectContaining({foo: "other"});
-    
-    var mismatchKeys = [];
-    var mismatchValues = [];
-
-    containing.jasmineMatches({foo: "fooVal", bar: "barVal"}, mismatchKeys, mismatchValues);
-    
-    expect(mismatchValues.length).toBe(1);
-    expect(mismatchValues[0]).toEqual("'foo' was 'fooVal' in actual, but was 'other' in expected.");
-  });
-
-  it("adds keys in expected but not actual to the mismatchKeys parameter", function() {
-    var containing = new j$.ObjectContaining({foo: "fooVal"});
-
-    var mismatchKeys = [];
-    var mismatchValues = [];
-
-    containing.jasmineMatches({bar: "barVal"}, mismatchKeys, mismatchValues);
-
-    expect(mismatchKeys.length).toBe(1);
-    expect(mismatchKeys[0]).toEqual("expected has key 'foo', but missing from actual.");
-  });
-
-  it("jasmineToString's itself", function() {
-    var containing = new j$.ObjectContaining({});
-
-    expect(containing.jasmineToString()).toMatch("<jasmine.objectContaining");
-  });
-
-  it("matches recursively", function() {
-    var containing = new j$.ObjectContaining({one: new j$.ObjectContaining({two: {}})});
-
-    expect(containing.jasmineMatches({one: {two: {}}})).toBe(true);
-  });
-});

spec/core/PrettyPrintSpec.js

@@ -1,70 +1,112 @@
-describe("j$.pp", function () {
+describe("jasmineUnderTest.pp", function () {
   it("should wrap strings in single quotes", function() {
-    expect(j$.pp("some string")).toEqual("'some string'");
-    expect(j$.pp("som' string")).toEqual("'som' string'");
+    expect(jasmineUnderTest.pp("some string")).toEqual("'some string'");
+    expect(jasmineUnderTest.pp("som' string")).toEqual("'som' string'");
   });
 
   it("should stringify primitives properly", function() {
-    expect(j$.pp(true)).toEqual("true");
-    expect(j$.pp(false)).toEqual("false");
-    expect(j$.pp(null)).toEqual("null");
-    expect(j$.pp(jasmine.undefined)).toEqual("undefined");
-    expect(j$.pp(3)).toEqual("3");
-    expect(j$.pp(-3.14)).toEqual("-3.14");
-    expect(j$.pp(-0)).toEqual("-0");
+    expect(jasmineUnderTest.pp(true)).toEqual("true");
+    expect(jasmineUnderTest.pp(false)).toEqual("false");
+    expect(jasmineUnderTest.pp(null)).toEqual("null");
+    expect(jasmineUnderTest.pp(jasmine.undefined)).toEqual("undefined");
+    expect(jasmineUnderTest.pp(3)).toEqual("3");
+    expect(jasmineUnderTest.pp(-3.14)).toEqual("-3.14");
+    expect(jasmineUnderTest.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', {  }, undefined, null ]");
-  });
+  describe('stringify arrays', function() {
+    it("should stringify arrays properly", function() {
+      expect(jasmineUnderTest.pp([1, 2])).toEqual("[ 1, 2 ]");
+      expect(jasmineUnderTest.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 jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
+      var originalMaxLength = jasmineUnderTest.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 {
+        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
+        expect(jasmineUnderTest.pp(array)).toEqual("[ 1, 2, ... ]");
+      } finally {
+        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
+      }
+    });
+
+    it("should stringify arrays with properties properly", function() {
+      var arr = [1, 2];
+      arr.foo = 'bar';
+      arr.baz = {};
+      expect(jasmineUnderTest.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(jasmineUnderTest.pp(empty)).toEqual("[ foo: 'bar', baz: Object({  }) ]");
+    });
+
+    it("should stringify long arrays with properties properly", function() {
+      var originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      var long = [1,2,3];
+      long.foo = 'bar';
+      long.baz = {};
+
+      try {
+        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
+        expect(jasmineUnderTest.pp(long)).toEqual("[ 1, 2, ..., foo: 'bar', baz: Object({  }) ]");
+      } finally {
+        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
+      }
+    });
+
+    it("should indicate circular array references", function() {
+      var array1 = [1, 2];
+      var array2 = [array1];
+      array1.push(array2);
+      expect(jasmineUnderTest.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
+    });
+
+    it("should not indicate circular references incorrectly", function() {
+      var array = [ [1] ];
+      expect(jasmineUnderTest.pp(array)).toEqual("[ [ 1 ] ]");
+    });
   });
 
   it("should stringify objects properly", function() {
-    expect(j$.pp({foo: 'bar'})).toEqual("{ foo: 'bar' }");
-    expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo: 'bar', baz: 3, nullValue: null, undefinedValue: undefined }");
-    expect(j$.pp({foo: function () {
-    }, bar: [1, 2, 3]})).toEqual("{ foo: Function, bar: [ 1, 2, 3 ] }");
+    expect(jasmineUnderTest.pp({foo: 'bar'})).toEqual("Object({ foo: 'bar' })");
+    expect(jasmineUnderTest.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("Object({ foo: 'bar', baz: 3, nullValue: null, undefinedValue: undefined })");
+    expect(jasmineUnderTest.pp({foo: function () {
+    }, bar: [1, 2, 3]})).toEqual("Object({ foo: Function, bar: [ 1, 2, 3 ] })");
   });
 
   it("should not include inherited properties when stringifying an object", function() {
-    var SomeClass = function() {};
+    var SomeClass = function SomeClass() {};
     SomeClass.prototype.foo = "inherited foo";
     var instance = new SomeClass();
     instance.bar = "my own bar";
-    expect(j$.pp(instance)).toEqual("{ bar: 'my own bar' }");
+    expect(jasmineUnderTest.pp(instance)).toEqual("SomeClass({ bar: 'my own bar' })");
   });
 
-  it("should not recurse objects and arrays more deeply than j$.MAX_PRETTY_PRINT_DEPTH", function() {
-    var originalMaxDepth = j$.MAX_PRETTY_PRINT_DEPTH;
+  it("should not recurse objects and arrays more deeply than jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH", function() {
+    var originalMaxDepth = jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH;
     var nestedObject = { level1: { level2: { level3: { level4: "leaf" } } } };
     var nestedArray  = [1, [2, [3, [4, "leaf"]]]];
 
     try {
-      j$.MAX_PRETTY_PRINT_DEPTH = 2;
-      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: Object } }");
-      expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
+      jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH = 2;
+      expect(jasmineUnderTest.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object }) })");
+      expect(jasmineUnderTest.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
 
-      j$.MAX_PRETTY_PRINT_DEPTH = 3;
-      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: Object } } }");
-      expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, Array ] ] ]");
+      jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH = 3;
+      expect(jasmineUnderTest.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object({ level3: Object }) }) })");
+      expect(jasmineUnderTest.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, Array ] ] ]");
 
-      j$.MAX_PRETTY_PRINT_DEPTH = 4;
-      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: { level4: 'leaf' } } } }");
-      expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
+      jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH = 4;
+      expect(jasmineUnderTest.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object({ level3: Object({ level4: 'leaf' }) }) }) })");
+      expect(jasmineUnderTest.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
     } finally {
-      j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
+      jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
     }
   });
 
@@ -73,30 +115,18 @@ describe("j$.pp", function () {
       var frozenObject = {foo: {bar: 'baz'}};
       frozenObject.circular = frozenObject;
       frozenObject = Object.freeze(frozenObject);
-      expect(j$.pp(frozenObject)).toEqual("{ foo: { bar: 'baz' }, circular: <circular reference: Object> }");
-    }
-  });
-
-  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;
+      expect(jasmineUnderTest.pp(frozenObject)).toEqual("Object({ foo: Object({ bar: 'baz' }), circular: <circular reference: Object> })");
     }
   });
 
   it("should stringify RegExp objects properly", function() {
-    expect(j$.pp(/x|y|z/)).toEqual("/x|y|z/");
+    expect(jasmineUnderTest.pp(/x|y|z/)).toEqual("/x|y|z/");
   });
 
   it("should indicate circular object references", function() {
     var sampleValue = {foo: 'hello'};
     sampleValue.nested = sampleValue;
-    expect(j$.pp(sampleValue)).toEqual("{ foo: 'hello', nested: <circular reference: Object> }");
+    expect(jasmineUnderTest.pp(sampleValue)).toEqual("Object({ foo: 'hello', nested: <circular reference: Object> })");
   });
 
   it("should indicate getters on objects as such", function() {
@@ -108,39 +138,39 @@ describe("j$.pp", function () {
       });
     }
     if (sampleValue.__defineGetter__) {
-      expect(j$.pp(sampleValue)).toEqual("{ id: 1, calculatedValue: <getter> }");
+      expect(jasmineUnderTest.pp(sampleValue)).toEqual("Object({ id: 1, calculatedValue: <getter> })");
     }
     else {
-      expect(j$.pp(sampleValue)).toEqual("{ id: 1 }");
+      expect(jasmineUnderTest.pp(sampleValue)).toEqual("Object({ id: 1 })");
     }
   });
 
 
   it('should not do HTML escaping of strings', function() {
-    expect(j$.pp('some <b>html string</b> &', false)).toEqual('\'some <b>html string</b> &\'');
+    expect(jasmineUnderTest.pp('some <b>html string</b> &', false)).toEqual('\'some <b>html string</b> &\'');
   });
 
   it("should abbreviate the global (usually window) object", function() {
-    expect(j$.pp(jasmine.getGlobal())).toEqual("<global>");
+    expect(jasmineUnderTest.pp(jasmine.getGlobal())).toEqual("<global>");
   });
 
   it("should stringify Date objects properly", function() {
     var now = new Date();
-    expect(j$.pp(now)).toEqual("Date(" + now.toString() + ")");
+    expect(jasmineUnderTest.pp(now)).toEqual("Date(" + now.toString() + ")");
   });
 
   it("should stringify spy objects properly", function() {
     var TestObject = {
           someFunction: function() {}
         },
-        env = new j$.Env();
+        env = new jasmineUnderTest.Env();
 
-    var spyRegistry = new j$.SpyRegistry({currentSpies: function() {return [];}});
+    var spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() {return [];}});
 
     spyRegistry.spyOn(TestObject, 'someFunction');
-    expect(j$.pp(TestObject.someFunction)).toEqual("spy on someFunction");
+    expect(jasmineUnderTest.pp(TestObject.someFunction)).toEqual("spy on someFunction");
 
-    expect(j$.pp(j$.createSpy("something"))).toEqual("spy on something");
+    expect(jasmineUnderTest.pp(jasmineUnderTest.createSpy("something"))).toEqual("spy on something");
   });
 
   it("should stringify objects that implement jasmineToString", function () {
@@ -148,7 +178,24 @@ describe("j$.pp", function () {
       jasmineToString: function () { return "strung"; }
     };
 
-    expect(j$.pp(obj)).toEqual("strung");
+    expect(jasmineUnderTest.pp(obj)).toEqual("strung");
+  });
+
+  it("should stringify objects that implement custom toString", function () {
+    var obj = {
+      toString: function () { return "my toString"; }
+    };
+
+    expect(jasmineUnderTest.pp(obj)).toEqual("my toString");
+  });
+
+  it("should stringify objects from anonymous constructors with custom toString", function () {
+    var MyAnonymousConstructor = (function() { return function () {}; })();
+    MyAnonymousConstructor.toString = function () { return ''; };
+
+    var a = new MyAnonymousConstructor();
+
+    expect(jasmineUnderTest.pp(a)).toEqual("<anonymous>({  })");
   });
 
   it("should handle objects with null prototype", function() {
@@ -157,6 +204,6 @@ describe("j$.pp", function () {
     var obj = Object.create(null);
     obj.foo = 'bar';
 
-    expect(j$.pp(obj)).toEqual("{ foo: 'bar' }");
+    expect(jasmineUnderTest.pp(obj)).toEqual("null({ foo: 'bar' })");
   });
 });

spec/core/QueueRunnerSpec.js

@@ -4,7 +4,7 @@ describe("QueueRunner", function() {
     var calls = [],
       queueableFn1 = { fn: jasmine.createSpy('fn1') },
       queueableFn2 = { fn: jasmine.createSpy('fn2') },
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn1, queueableFn2]
       });
     queueableFn1.fn.and.callFake(function() {
@@ -23,7 +23,7 @@ describe("QueueRunner", function() {
     var queueableFn1 = { fn: jasmine.createSpy('fn1') },
         queueableFn2 = { fn: jasmine.createSpy('fn2') },
         queueableFn3 = { fn: function(done) { asyncContext = this; done(); } },
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [queueableFn1, queueableFn2, queueableFn3]
         }),
         asyncContext;
@@ -65,7 +65,7 @@ describe("QueueRunner", function() {
           afterCallback();
           setTimeout(done, 100);
         } },
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [queueableFn1, queueableFn2, queueableFn3],
           onComplete: onComplete
         });
@@ -99,7 +99,7 @@ describe("QueueRunner", function() {
         } },
         queueableFn2 = { fn: jasmine.createSpy('fn2') },
         failFn = jasmine.createSpy('fail'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [queueableFn1, queueableFn2],
           fail: failFn
         });
@@ -121,7 +121,7 @@ describe("QueueRunner", function() {
         queueableFn = { fn: jasmine.createSpy('fn'), type: 'queueable' },
         onComplete = jasmine.createSpy('onComplete'),
         onException = jasmine.createSpy('onException'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [beforeFn, queueableFn],
           onComplete: onComplete,
           onException: onException
@@ -142,7 +142,7 @@ describe("QueueRunner", function() {
         queueableFn = { fn: jasmine.createSpy('fn') },
         onComplete = jasmine.createSpy('onComplete'),
         onException = jasmine.createSpy('onException'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [beforeFn, queueableFn],
           onComplete: onComplete,
           onException: onException,
@@ -151,7 +151,7 @@ describe("QueueRunner", function() {
       queueRunner.execute();
       expect(queueableFn.fn).not.toHaveBeenCalled();
 
-      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      jasmine.clock().tick(jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL);
 
       expect(onException).not.toHaveBeenCalled();
       expect(queueableFn.fn).not.toHaveBeenCalled();
@@ -162,7 +162,7 @@ describe("QueueRunner", function() {
        var queueableFn = { fn: function(done) { throw new Error("error!"); } },
         onComplete = jasmine.createSpy('onComplete'),
         onException = jasmine.createSpy('onException'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [queueableFn],
           onComplete: onComplete,
           onException: onException
@@ -173,7 +173,7 @@ describe("QueueRunner", function() {
       expect(onComplete).toHaveBeenCalled();
       expect(onException).toHaveBeenCalled();
 
-      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      jasmine.clock().tick(jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL);
       expect(onException.calls.count()).toEqual(1);
     });
 
@@ -181,7 +181,7 @@ describe("QueueRunner", function() {
       var queueableFn = { fn: function(done) { done(); } },
         onComplete = jasmine.createSpy('onComplete'),
         onException = jasmine.createSpy('onException'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [queueableFn],
           onComplete: onComplete,
           onException: onException
@@ -191,14 +191,14 @@ describe("QueueRunner", function() {
 
       expect(onComplete).toHaveBeenCalled();
 
-      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      jasmine.clock().tick(jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL);
       expect(onException).not.toHaveBeenCalled();
     });
 
     it("only moves to the next spec the first time you call done", function() {
       var queueableFn = { fn: function(done) {done(); done();} },
         nextQueueableFn = { fn: jasmine.createSpy('nextFn') };
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn, nextQueueableFn]
       });
 
@@ -212,7 +212,7 @@ describe("QueueRunner", function() {
          throw new Error('error!');
        } },
         nextQueueableFn = { fn: jasmine.createSpy('nextFn') };
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn, nextQueueableFn]
       });
 
@@ -220,6 +220,20 @@ describe("QueueRunner", function() {
       jasmine.clock().tick(1);
       expect(nextQueueableFn.fn.calls.count()).toEqual(1);
     });
+
+    it("should return a null when you call done", function () {
+      // Some promises want handlers to return anything but undefined to help catch "forgotten returns".
+      var doneReturn,
+        queueableFn = { fn: function(done) {
+          doneReturn = done();
+        } },
+        queueRunner = new jasmineUnderTest.QueueRunner({
+          queueableFns: [queueableFn]
+        });
+
+      queueRunner.execute();
+      expect(doneReturn).toBe(null);
+    });
   });
 
   it("calls exception handlers when an exception is thrown in a fn", function() {
@@ -228,7 +242,7 @@ describe("QueueRunner", function() {
         throw new Error('fake error');
       } },
       onExceptionCallback = jasmine.createSpy('on exception callback'),
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn],
         onException: onExceptionCallback
       });
@@ -242,7 +256,7 @@ describe("QueueRunner", function() {
     var queueableFn = { fn: function() {
         throw new Error('fake error');
       } },
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn],
         catchException: function(e) { return false; }
       });
@@ -255,7 +269,7 @@ describe("QueueRunner", function() {
   it("continues running the functions even after an exception is thrown in an async spec", function() {
     var queueableFn = { fn: function(done) { throw new Error("error"); } },
       nextQueueableFn = { fn: jasmine.createSpy("nextFunction") },
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn, nextQueueableFn]
       });
 
@@ -266,7 +280,7 @@ describe("QueueRunner", function() {
   it("calls a provided complete callback when done", function() {
     var queueableFn = { fn: jasmine.createSpy('fn') },
       completeCallback = jasmine.createSpy('completeCallback'),
-      queueRunner = new j$.QueueRunner({
+      queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn],
         onComplete: completeCallback
       });
@@ -281,7 +295,7 @@ describe("QueueRunner", function() {
         afterFn = { fn: jasmine.createSpy('afterFn') },
         completeCallback = jasmine.createSpy('completeCallback'),
         clearStack = jasmine.createSpy('clearStack'),
-        queueRunner = new j$.QueueRunner({
+        queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [asyncFn, afterFn],
           clearStack: clearStack,
           onComplete: completeCallback

spec/core/ReportDispatcherSpec.js

@@ -1,7 +1,7 @@
 describe("ReportDispatcher", function() {
 
   it("builds an interface of requested methods", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo', 'bar', 'baz']);
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar', 'baz']);
 
     expect(dispatcher.foo).toBeDefined();
     expect(dispatcher.bar).toBeDefined();
@@ -9,7 +9,7 @@ describe("ReportDispatcher", function() {
   });
 
   it("dispatches requested methods to added reporters", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo', 'bar']),
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar']),
       reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
       anotherReporter = jasmine.createSpyObj('reporter', ['foo', 'bar']);
 
@@ -28,7 +28,7 @@ describe("ReportDispatcher", function() {
   });
 
   it("does not dispatch to a reporter if the reporter doesn't accept the method", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo']),
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo']),
       reporter = jasmine.createSpyObj('reporter', ['baz']);
 
     dispatcher.addReporter(reporter);
@@ -37,4 +37,43 @@ describe("ReportDispatcher", function() {
       dispatcher.foo(123, 456);
     }).not.toThrow();
   });
+
+  it("allows providing a fallback reporter in case there's no other report", function() {
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar']),
+      reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']);
+
+    dispatcher.provideFallbackReporter(reporter);
+    dispatcher.foo(123, 456);
+    expect(reporter.foo).toHaveBeenCalledWith(123, 456);
+  });
+
+  it("does not call fallback reporting methods when another report is provided", function() {
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar']),
+      reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
+      fallbackReporter = jasmine.createSpyObj('otherReporter', ['foo', 'bar']);
+
+    dispatcher.provideFallbackReporter(fallbackReporter);
+    dispatcher.addReporter(reporter);
+    dispatcher.foo(123, 456);
+
+    expect(reporter.foo).toHaveBeenCalledWith(123, 456);
+    expect(fallbackReporter.foo).not.toHaveBeenCalledWith(123, 456);
+  });
+
+  it("allows registered reporters to be cleared", function() {
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar']),
+        reporter1 = jasmine.createSpyObj('reporter1', ['foo', 'bar']),
+        reporter2 = jasmine.createSpyObj('reporter2', ['foo', 'bar']);
+
+    dispatcher.addReporter(reporter1);
+    dispatcher.foo(123);
+    expect(reporter1.foo).toHaveBeenCalledWith(123);
+
+    dispatcher.clearReporters();
+    dispatcher.addReporter(reporter2);
+    dispatcher.bar(456);
+
+    expect(reporter1.bar).not.toHaveBeenCalled();
+    expect(reporter2.bar).toHaveBeenCalledWith(456);
+  });
 });

spec/core/SpecSpec.js

@@ -1,32 +1,36 @@
 describe("Spec", function() {
 
   it("#isPendingSpecException returns true for a pending spec exception", function() {
-    var e = new Error(j$.Spec.pendingSpecExceptionMessage);
+    var e = new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage);
 
-    expect(j$.Spec.isPendingSpecException(e)).toBe(true);
+    expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(true);
   });
 
   it("#isPendingSpecException returns true for a pending spec exception (even when FF bug is present)", function() {
     var fakeError = {
-      toString: function() { return "Error: " + j$.Spec.pendingSpecExceptionMessage; }
+      toString: function() { return "Error: " + jasmineUnderTest.Spec.pendingSpecExceptionMessage; }
     };
 
-    expect(j$.Spec.isPendingSpecException(fakeError)).toBe(true);
+    expect(jasmineUnderTest.Spec.isPendingSpecException(fakeError)).toBe(true);
+  });
+
+  it("#isPendingSpecException returns true for a pending spec exception with a custom message", function() {
+    expect(jasmineUnderTest.Spec.isPendingSpecException(jasmineUnderTest.Spec.pendingSpecExceptionMessage + 'foo')).toBe(true);
   });
 
   it("#isPendingSpecException returns false for not a pending spec exception", function() {
     var e = new Error("foo");
 
-    expect(j$.Spec.isPendingSpecException(e)).toBe(false);
+    expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(false);
   });
 
   it("#isPendingSpecException returns false for thrown values that don't have toString", function() {
-    expect(j$.Spec.isPendingSpecException(void 0)).toBe(false);
+    expect(jasmineUnderTest.Spec.isPendingSpecException(void 0)).toBe(false);
   });
 
   it("delegates execution to a QueueRunner", function() {
     var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         description: 'my test',
         id: 'some-id',
         queueableFn: { fn: function() {} },
@@ -41,7 +45,7 @@ describe("Spec", function() {
   it("should call the start callback on execution", function() {
     var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       startCallback = jasmine.createSpy('startCallback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         id: 123,
         description: 'foo bar',
         queueableFn: { fn: function() {} },
@@ -65,7 +69,7 @@ describe("Spec", function() {
       startCallback = jasmine.createSpy('start-callback').and.callFake(function() {
         expect(beforesWereCalled).toBe(false);
       }),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
         beforeFns: function() {
           return [function() {
@@ -89,7 +93,7 @@ describe("Spec", function() {
         expect(before).toHaveBeenCalled();
         expect(after).not.toHaveBeenCalled();
       }) },
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         queueableFn: queueableFn,
         beforeAndAfterFns: function() {
           return {befores: [before], afters: [after]}
@@ -108,14 +112,13 @@ describe("Spec", function() {
 
       startCallback = jasmine.createSpy('startCallback'),
       resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         onStart: startCallback,
         queueableFn: { fn: null },
         resultCallback: resultCallback,
         queueRunnerFactory: fakeQueueRunner
       });
 
-
     expect(spec.status()).toBe('pending');
   });
 
@@ -124,7 +127,7 @@ describe("Spec", function() {
       startCallback = jasmine.createSpy('startCallback'),
       specBody = jasmine.createSpy('specBody'),
       resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         onStart:startCallback,
         queueableFn: { fn: specBody },
         resultCallback: resultCallback,
@@ -144,11 +147,34 @@ 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 jasmineUnderTest.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'),
       resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         onStart: startCallback,
         resultCallback: resultCallback,
         description: "with a spec",
@@ -174,13 +200,14 @@ describe("Spec", function() {
       description: 'with a spec',
       fullName: 'a suite with a spec',
       failedExpectations: [],
-      passedExpectations: []
+      passedExpectations: [],
+      pendingReason: ''
     });
   });
 
   it("should call the done callback on execution complete", function() {
     var done = jasmine.createSpy('done callback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
         catchExceptions: function() { return false; },
         resultCallback: function() {},
@@ -193,18 +220,18 @@ describe("Spec", function() {
   });
 
   it("#status returns passing by default", function() {
-    var spec = new j$.Spec({queueableFn: { fn: jasmine.createSpy("spec body")} });
+    var spec = new jasmineUnderTest.Spec({queueableFn: { fn: jasmine.createSpy("spec body")} });
     expect(spec.status()).toBe('passed');
   });
 
   it("#status returns passed if all expectations in the spec have passed", function() {
-    var spec = new j$.Spec({queueableFn: { fn: jasmine.createSpy("spec body")} });
+    var spec = new jasmineUnderTest.Spec({queueableFn: { fn: jasmine.createSpy("spec body")} });
     spec.addExpectationResult(true);
     expect(spec.status()).toBe('passed');
   });
 
   it("#status returns failed if any expectations in the spec have failed", function() {
-    var spec = new j$.Spec({queueableFn: { fn: jasmine.createSpy("spec body") } });
+    var spec = new jasmineUnderTest.Spec({queueableFn: { fn: jasmine.createSpy("spec body") } });
     spec.addExpectationResult(true);
     spec.addExpectationResult(false);
     expect(spec.status()).toBe('failed');
@@ -212,7 +239,7 @@ describe("Spec", function() {
 
   it("keeps track of passed and failed expectations", function() {
     var resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
+      spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: jasmine.createSpy("spec body") },
         expectationResultFactory: function (data) { return data; },
         queueRunnerFactory: function(attrs) { attrs.onComplete(); },
@@ -227,10 +254,44 @@ 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 jasmineUnderTest.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(jasmineUnderTest.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 jasmineUnderTest.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');
 
-    var spec = new j$.Spec({
+    var spec = new jasmineUnderTest.Spec({
       getSpecName: specNameSpy,
       queueableFn: { fn: null }
     });
@@ -239,12 +300,12 @@ 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));
+          opts.onException(new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage));
         },
-        spec = new j$.Spec({
+        spec = new jasmineUnderTest.Spec({
           description: 'my test',
           id: 'some-id',
           queueableFn: { fn: function() { } },
@@ -254,6 +315,106 @@ describe("Spec", function() {
       spec.execute();
 
       expect(spec.status()).toEqual("pending");
+      expect(spec.result.pendingReason).toEqual('');
+    });
+
+    it("should set the pendingReason", function() {
+      var fakeQueueRunner = function(opts) {
+          opts.onException(new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage + 'custom message'));
+        },
+        spec = new jasmineUnderTest.Spec({
+          description: 'my test',
+          id: 'some-id',
+          queueableFn: { fn: function() { } },
+          queueRunnerFactory: fakeQueueRunner
+        });
+
+      spec.execute();
+
+      expect(spec.status()).toEqual("pending");
+      expect(spec.result.pendingReason).toEqual('custom message');
     });
   });
+
+  it("should log a failure when handling an exception", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new jasmineUnderTest.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 jasmineUnderTest.Spec({
+        queueableFn: { fn: function() {} },
+        expectationResultFactory: function(data) { return data; },
+        queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+        resultCallback: resultCallback
+      });
+
+    spec.onException(new jasmineUnderTest.errors.ExpectationFailed());
+    spec.execute();
+
+    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([]);
+  });
+
+  it("retrieves a result with updated status", function() {
+    var spec = new jasmineUnderTest.Spec({ queueableFn: { fn: function() {} } });
+
+    expect(spec.getResult().status).toBe('passed');
+  });
+
+  it("retrives a result with disabled status", function() {
+    var spec = new jasmineUnderTest.Spec({ queueableFn: { fn: function() {} } });
+    spec.disable();
+
+    expect(spec.getResult().status).toBe('disabled');
+  });
+
+  it("retrives a result with pending status", function() {
+    var spec = new jasmineUnderTest.Spec({ queueableFn: { fn: function() {} } });
+    spec.pend();
+
+    expect(spec.getResult().status).toBe('pending');
+  });
+
+  it("should not be executable when disabled", function() {
+    var spec = new jasmineUnderTest.Spec({
+      queueableFn: { fn: function() {} }
+    });
+    spec.disable();
+
+    expect(spec.isExecutable()).toBe(false);
+  });
+
+  it("should be executable when pending", function() {
+    var spec = new jasmineUnderTest.Spec({
+      queueableFn: { fn: function() {} }
+    });
+    spec.pend();
+
+    expect(spec.isExecutable()).toBe(true);
+  });
+
+  it("should be executable when not disabled or pending", function() {
+    var spec = new jasmineUnderTest.Spec({
+      queueableFn: { fn: function() {} }
+    });
+
+    expect(spec.isExecutable()).toBe(true);
+  });
 });

spec/core/SpyRegistrySpec.js

@@ -1,14 +1,23 @@
 describe("SpyRegistry", function() {
   describe("#spyOn", function() {
     it("checks for the existence of the object", function() {
-      var spyRegistry = new j$.SpyRegistry();
+      var spyRegistry = new jasmineUnderTest.SpyRegistry();
       expect(function() {
         spyRegistry.spyOn(void 0, 'pants');
       }).toThrowError(/could not find an object/);
     });
 
+    it("checks that a method name was passed", function() {
+      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+        subject = {};
+
+        expect(function() {
+          spyRegistry.spyOn(subject);
+        }).toThrowError(/No method name supplied/);
+    });
+
     it("checks for the existence of the method", function() {
-      var spyRegistry = new j$.SpyRegistry(),
+      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -18,7 +27,7 @@ describe("SpyRegistry", function() {
 
     it("checks if it has already been spied upon", function() {
       var spies = [],
-        spyRegistry = new j$.SpyRegistry({currentSpies: function() { return spies; }}),
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
         subject = { spiedFunc: function() {} };
 
       spyRegistry.spyOn(subject, 'spiedFunc');
@@ -28,9 +37,38 @@ describe("SpyRegistry", function() {
       }).toThrowError(/has already been spied upon/);
     });
 
+    it("checks if it can be spied upon", function() {
+      // IE 8 doesn't support `definePropery` on non-DOM nodes
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var scope = {};
+
+      function myFunc() {
+        return 1;
+      }
+
+      Object.defineProperty(scope, 'myFunc', {
+        get: function() {
+          return myFunc;
+        }
+      });
+
+      var spies = [],
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
+        subject = { spiedFunc: scope.myFunc };
+
+      expect(function() {
+        spyRegistry.spyOn(scope, 'myFunc');
+      }).toThrowError(/is not declared writable or has no setter/);
+
+      expect(function() {
+        spyRegistry.spyOn(subject, 'spiedFunc');
+      }).not.toThrowError(/is not declared writable or has no setter/);
+    });
+
     it("overrides the method on the object and returns the spy", function() {
       var originalFunctionWasCalled = false,
-        spyRegistry = new j$.SpyRegistry(),
+        spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = { spiedFunc: function() { originalFunctionWasCalled = true; } };
 
       var spy = spyRegistry.spyOn(subject, 'spiedFunc');
@@ -42,7 +80,7 @@ describe("SpyRegistry", function() {
   describe("#clearSpies", function() {
     it("restores the original functions on the spied-upon objects", function() {
       var spies = [],
-        spyRegistry = new j$.SpyRegistry({currentSpies: function() { return spies; }}),
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
         originalFunction = function() {},
         subject = { spiedFunc: originalFunction };
 
@@ -51,5 +89,67 @@ describe("SpyRegistry", function() {
 
       expect(subject.spiedFunc).toBe(originalFunction);
     });
+
+    it("restores the original functions, even when that spy has been replace and re-spied upon", function() {
+      var spies = [],
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
+        originalFunction = function() {},
+        subject = { spiedFunc: originalFunction };
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+
+      // replace the original spy with some other function
+      subject.spiedFunc = function() {};
+
+      // spy on the function in that location again
+      spyRegistry.spyOn(subject, 'spiedFunc');
+
+      spyRegistry.clearSpies();
+
+      expect(subject.spiedFunc).toBe(originalFunction);
+    });
+
+    it("does not add a property that the spied-upon object didn't originally have", function() {
+      // IE 8 doesn't support `Object.create`
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var spies = [],
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
+        originalFunction = function() {},
+        subjectParent = {spiedFunc: originalFunction};
+
+      var subject = Object.create(subjectParent);
+
+      expect(subject.hasOwnProperty('spiedFunc')).toBe(false);
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+      spyRegistry.clearSpies();
+
+      expect(subject.hasOwnProperty('spiedFunc')).toBe(false);
+      expect(subject.spiedFunc).toBe(originalFunction);
+    });
+
+    it("restores the original function when it\'s inherited and cannot be deleted", function() {
+      // IE 8 doesn't support `Object.create` or `Object.defineProperty`
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var spies = [],
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
+        originalFunction = function() {},
+        subjectParent = {spiedFunc: originalFunction};
+
+      var subject = Object.create(subjectParent);
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+
+      // simulate a spy that cannot be deleted
+      Object.defineProperty(subject, 'spiedFunc', {
+        configurable: false
+      });
+
+      spyRegistry.clearSpies();
+
+      expect(jasmineUnderTest.isSpy(subject.spiedFunc)).toBe(false);
+    });
   });
 });

spec/core/SpySpec.js

@@ -7,9 +7,9 @@ describe('Spies', function () {
       TestClass.prototype.someFunction = function() {};
       TestClass.prototype.someFunction.bob = "test";
     });
-    
+
     it("preserves the properties of the spied function", function() {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var spy = jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
 
       expect(spy.bob).toEqual("test");
     });
@@ -18,19 +18,19 @@ describe('Spies', function () {
       TestClass.prototype.someFunction.and = "turkey";
 
       expect(function() {
-        j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+        jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
       }).toThrowError("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon");
     });
 
     it("adds a spyStrategy and callTracker to the spy", function() {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var spy = jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
 
-      expect(spy.and).toEqual(jasmine.any(j$.SpyStrategy));
-      expect(spy.calls).toEqual(jasmine.any(j$.CallTracker));
+      expect(spy.and).toEqual(jasmine.any(jasmineUnderTest.SpyStrategy));
+      expect(spy.calls).toEqual(jasmine.any(jasmineUnderTest.CallTracker));
     });
 
     it("tracks the argument of calls", function () {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var spy = jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
       var trackSpy = spyOn(spy.calls, "track");
 
       spy("arg");
@@ -39,7 +39,7 @@ describe('Spies', function () {
     });
 
     it("tracks the context of calls", function () {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var spy = jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
       var trackSpy = spyOn(spy.calls, "track");
 
       var contextObject = { spyMethod: spy };
@@ -49,7 +49,7 @@ describe('Spies', function () {
     });
 
     it("tracks the return value of calls", function () {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var spy = jasmineUnderTest.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
       var trackSpy = spyOn(spy.calls, "track");
 
       spy.and.returnValue("return value");
@@ -61,16 +61,24 @@ describe('Spies', function () {
 
   describe("createSpyObj", function() {
     it("should create an object with a bunch of spy methods when you call jasmine.createSpyObj()", function() {
-      var spyObj = j$.createSpyObj('BaseName', ['method1', 'method2']);
+      var spyObj = jasmineUnderTest.createSpyObj('BaseName', ['method1', 'method2']);
 
       expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function)});
       expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
       expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
     });
 
+    it("should allow you to omit the baseName", function() {
+      var spyObj = jasmineUnderTest.createSpyObj(['method1', 'method2']);
+
+      expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function)});
+      expect(spyObj.method1.and.identity()).toEqual('unknown.method1');
+      expect(spyObj.method2.and.identity()).toEqual('unknown.method2');
+    });
+
     it("should throw if you do not pass an array argument", function() {
       expect(function() {
-        j$.createSpyObj('BaseName');
+        jasmineUnderTest.createSpyObj('BaseName');
       }).toThrow("createSpyObj requires a non-empty array of method names to create spies for");
     });
   });

spec/core/SpyStrategySpec.js

@@ -1,20 +1,20 @@
 describe("SpyStrategy", function() {
 
   it("defaults its name to unknown", function() {
-    var spyStrategy = new j$.SpyStrategy();
+    var spyStrategy = new jasmineUnderTest.SpyStrategy();
 
     expect(spyStrategy.identity()).toEqual("unknown");
   });
 
   it("takes a name", function() {
-    var spyStrategy = new j$.SpyStrategy({name: "foo"});
+    var spyStrategy = new jasmineUnderTest.SpyStrategy({name: "foo"});
 
     expect(spyStrategy.identity()).toEqual("foo");
   });
 
   it("stubs an original function, if provided", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.exec();
 
@@ -23,7 +23,7 @@ describe("SpyStrategy", function() {
 
   it("allows an original function to be called, passed through the params and returns it's value", function() {
     var originalFn = jasmine.createSpy("original").and.returnValue(42),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callThrough();
@@ -36,7 +36,7 @@ describe("SpyStrategy", function() {
 
   it("can return a specified value when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.returnValue(17);
@@ -48,7 +48,7 @@ describe("SpyStrategy", function() {
 
   it("can return specified values in order specified when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.returnValues('value1', 'value2', 'value3');
 
@@ -61,7 +61,7 @@ describe("SpyStrategy", function() {
 
   it("allows an exception to be thrown when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.throwError(new TypeError("bar"));
 
@@ -71,7 +71,7 @@ describe("SpyStrategy", function() {
 
   it("allows a non-Error to be thrown, wrapping it into an exception when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.throwError("bar");
 
@@ -82,7 +82,7 @@ describe("SpyStrategy", function() {
   it("allows a fake function to be called instead", function() {
     var originalFn = jasmine.createSpy("original"),
         fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callFake(fakeFn);
@@ -92,10 +92,22 @@ describe("SpyStrategy", function() {
     expect(returnValue).toEqual(67);
   });
 
+  it('throws an error when a non-function is passed to callFake strategy', function() {
+    var originalFn = jasmine.createSpy('original'),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
+        invalidFakes = [5, 'foo', {}, true, false, null, void 0, new Date(), /.*/];
+
+    spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false);
+
+    expect(function () {
+      spyStrategy.callFake(function() {});
+    }).toThrowError(/^Argument passed to callFake should be a function, got/);
+  });
+
   it("allows a return to plan stubbing after another strategy", function() {
     var originalFn = jasmine.createSpy("original"),
         fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callFake(fakeFn);
@@ -103,7 +115,7 @@ describe("SpyStrategy", function() {
 
     expect(originalFn).not.toHaveBeenCalled();
     expect(returnValue).toEqual(67);
-    
+
     spyStrategy.stub();
     returnValue = spyStrategy.exec();
 
@@ -113,12 +125,12 @@ describe("SpyStrategy", function() {
   it("returns the spy after changing the strategy", function(){
     var spy = {},
         spyFn = jasmine.createSpy('spyFn').and.returnValue(spy),
-        spyStrategy = new j$.SpyStrategy({getSpy: spyFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({getSpy: spyFn});
 
     expect(spyStrategy.callThrough()).toBe(spy);
     expect(spyStrategy.returnValue()).toBe(spy);
     expect(spyStrategy.throwError()).toBe(spy);
-    expect(spyStrategy.callFake()).toBe(spy);
+    expect(spyStrategy.callFake(function() {})).toBe(spy);
     expect(spyStrategy.stub()).toBe(spy);
   });
 });

spec/core/SuiteSpec.js

@@ -1,8 +1,8 @@
 describe("Suite", function() {
 
   it("keeps its id", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         id: 456,
         description: "I am a suite"
@@ -11,24 +11,24 @@ describe("Suite", function() {
     expect(suite.id).toEqual(456);
   });
 
-  it("returns its full name", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+  it("returns blank full name for top level suite", function() {
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       });
 
-    expect(suite.getFullName()).toEqual("I am a suite");
+    expect(suite.getFullName()).toEqual("");
   });
 
   it("returns its full name when it has parent suites", function() {
-    var env = new j$.Env(),
-      parentSuite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      parentSuite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a parent suite",
         parentSuite: jasmine.createSpy('pretend top level suite')
       }),
-      suite = new j$.Suite({
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite",
         parentSuite: parentSuite
@@ -38,8 +38,8 @@ describe("Suite", function() {
   });
 
   it("adds before functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       }),
@@ -52,34 +52,9 @@ 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({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       }),
@@ -92,218 +67,8 @@ 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("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 child specs to run", 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: []}));
-  });
-
-  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({
+    var suite = new jasmineUnderTest.Suite({
       expectationResultFactory: function() { return 'hi'; }
     });
     suite.addChild({ result: { status: 'done' } });
@@ -311,4 +76,85 @@ describe("Suite", function() {
     suite.addExpectationResult(false);
     expect(suite.status()).toBe('failed');
   });
+
+  it("retrieves a result with updated status", function() {
+    var suite = new jasmineUnderTest.Suite({});
+
+    expect(suite.getResult().status).toBe('finished');
+  });
+
+  it("retrieves a result with disabled status", function() {
+    var suite = new jasmineUnderTest.Suite({});
+    suite.disable();
+
+    expect(suite.getResult().status).toBe('disabled');
+  });
+
+  it("retrieves a result with pending status", function() {
+    var suite = new jasmineUnderTest.Suite({});
+    suite.pend();
+
+    expect(suite.getResult().status).toBe('pending');
+  });
+
+  it("priviledges a disabled status over pending status", function() {
+    var suite = new jasmineUnderTest.Suite({});
+    suite.disable();
+    suite.pend();
+
+    expect(suite.getResult().status).toBe('disabled');
+  });
+
+  it("is executable if not disabled", function() {
+    var suite = new jasmineUnderTest.Suite({});
+
+    expect(suite.isExecutable()).toBe(true);
+  });
+
+  it("is not executable if disabled", function() {
+    var suite = new jasmineUnderTest.Suite({});
+    suite.disable();
+
+    expect(suite.isExecutable()).toBe(false);
+  });
+
+  it("tells all children about expectation failures, even if one throws", function() {
+    var suite = new jasmineUnderTest.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 jasmineUnderTest.Suite({
+      expectationResultFactory: function(data) { return data; },
+      throwOnExpectationFailure: true
+    });
+    suite.addChild({ result: { status: 'done' } });
+
+    expect(function() {
+      suite.addExpectationResult(false, 'failed');
+    }).toThrowError(jasmineUnderTest.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 jasmineUnderTest.Suite({});
+    suite.addChild({ result: { status: 'done' } });
+
+    suite.onException(new jasmineUnderTest.errors.ExpectationFailed());
+
+    expect(suite.getResult().failedExpectations).toEqual([]);
+  })
 });

spec/core/TimerSpec.js

@@ -1,7 +1,7 @@
 describe("Timer", function() {
   it("reports the time elapsed", function() {
     var fakeNow = jasmine.createSpy('fake Date.now'),
-        timer = new j$.Timer({now: fakeNow});
+        timer = new jasmineUnderTest.Timer({now: fakeNow});
 
     fakeNow.and.returnValue(100);
     timer.start();
@@ -22,7 +22,7 @@ describe("Timer", function() {
     });
 
     it("does not throw even though Date was taken away", function() {
-      var timer = new j$.Timer();
+      var timer = new jasmineUnderTest.Timer();
 
       expect(timer.start).not.toThrow();
       expect(timer.elapsed()).toEqual(jasmine.any(Number));

spec/core/TreeProcessorSpec.js

@@ -0,0 +1,756 @@
+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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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], userContext: { root: 'context' } }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }),
+        treeComplete = jasmine.createSpy('treeComplete');
+
+    processor.execute(treeComplete);
+
+    expect(queueRunner).toHaveBeenCalledWith({
+      onComplete: treeComplete,
+      onException: jasmine.any(Function),
+      userContext: { root: 'context' },
+      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], userContext: { root: 'context' } }),
+        nodeStart = jasmine.createSpy('nodeStart'),
+        nodeComplete = jasmine.createSpy('nodeComplete'),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new jasmineUnderTest.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),
+      userContext: { root: 'context' },
+      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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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 jasmineUnderTest.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();
+  });
+
+  it("runs large segments of nodes in the order they were declared", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        leaf4 = new Leaf(),
+        leaf5 = new Leaf(),
+        leaf6 = new Leaf(),
+        leaf7 = new Leaf(),
+        leaf8 = new Leaf(),
+        leaf9 = new Leaf(),
+        leaf10 = new Leaf(),
+        leaf11 = new Leaf(),
+        root = new Node({ children: [leaf1, leaf2, leaf3, leaf4, leaf5, leaf6, leaf7, leaf8, leaf9, leaf10, leaf11] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new jasmineUnderTest.TreeProcessor({
+          tree: root,
+          runnableIds: [root.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(11);
+
+    queueableFns[0].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[2].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+
+    queueableFns[3].fn();
+    expect(leaf4.execute).toHaveBeenCalled();
+
+    queueableFns[4].fn();
+    expect(leaf5.execute).toHaveBeenCalled();
+
+    queueableFns[5].fn();
+    expect(leaf6.execute).toHaveBeenCalled();
+
+    queueableFns[6].fn();
+    expect(leaf7.execute).toHaveBeenCalled();
+
+    queueableFns[7].fn();
+    expect(leaf8.execute).toHaveBeenCalled();
+
+    queueableFns[8].fn();
+    expect(leaf9.execute).toHaveBeenCalled();
+
+    queueableFns[9].fn();
+    expect(leaf10.execute).toHaveBeenCalled();
+
+    queueableFns[10].fn();
+    expect(leaf11.execute).toHaveBeenCalled();
+  });
+
+  it("runs nodes in a custom order when orderChildren is overrided", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        leaf4 = new Leaf(),
+        leaf5 = new Leaf(),
+        leaf6 = new Leaf(),
+        leaf7 = new Leaf(),
+        leaf8 = new Leaf(),
+        leaf9 = new Leaf(),
+        leaf10 = new Leaf(),
+        leaf11 = new Leaf(),
+        root = new Node({ children: [leaf1, leaf2, leaf3, leaf4, leaf5, leaf6, leaf7, leaf8, leaf9, leaf10, leaf11] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new jasmineUnderTest.TreeProcessor({
+          tree: root,
+          runnableIds: [root.id],
+          queueRunnerFactory: queueRunner,
+          orderChildren: function(node) {
+            var children = node.children.slice();
+            return children.reverse();
+          }
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(11);
+
+    queueableFns[0].fn();
+    expect(leaf11.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+    expect(leaf10.execute).toHaveBeenCalled();
+
+    queueableFns[2].fn();
+    expect(leaf9.execute).toHaveBeenCalled();
+
+    queueableFns[3].fn();
+    expect(leaf8.execute).toHaveBeenCalled();
+
+    queueableFns[4].fn();
+    expect(leaf7.execute).toHaveBeenCalled();
+
+    queueableFns[5].fn();
+    expect(leaf6.execute).toHaveBeenCalled();
+
+    queueableFns[6].fn();
+    expect(leaf5.execute).toHaveBeenCalled();
+
+    queueableFns[7].fn();
+    expect(leaf4.execute).toHaveBeenCalled();
+
+    queueableFns[8].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+
+    queueableFns[9].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[10].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+  });
+});

spec/core/UtilSpec.js

@@ -1,28 +1,28 @@
-describe("j$.util", function() {
+describe("jasmineUnderTest.util", function() {
   describe("isArray_", function() {
     it("should return true if the argument is an array", function() {
-      expect(j$.isArray_([])).toBe(true);
-      expect(j$.isArray_(['a'])).toBe(true);
+      expect(jasmineUnderTest.isArray_([])).toBe(true);
+      expect(jasmineUnderTest.isArray_(['a'])).toBe(true);
     });
 
     it("should return false if the argument is not an array", function() {
-      expect(j$.isArray_(undefined)).toBe(false);
-      expect(j$.isArray_({})).toBe(false);
-      expect(j$.isArray_(function() {})).toBe(false);
-      expect(j$.isArray_('foo')).toBe(false);
-      expect(j$.isArray_(5)).toBe(false);
-      expect(j$.isArray_(null)).toBe(false);
+      expect(jasmineUnderTest.isArray_(undefined)).toBe(false);
+      expect(jasmineUnderTest.isArray_({})).toBe(false);
+      expect(jasmineUnderTest.isArray_(function() {})).toBe(false);
+      expect(jasmineUnderTest.isArray_('foo')).toBe(false);
+      expect(jasmineUnderTest.isArray_(5)).toBe(false);
+      expect(jasmineUnderTest.isArray_(null)).toBe(false);
     });
   });
 
   describe("isUndefined", function() {
     it("reports if a variable is defined", function() {
       var a;
-      expect(j$.util.isUndefined(a)).toBe(true);
-      expect(j$.util.isUndefined(undefined)).toBe(true);
+      expect(jasmineUnderTest.util.isUndefined(a)).toBe(true);
+      expect(jasmineUnderTest.util.isUndefined(undefined)).toBe(true);
 
       var undefined = "diz be undefined yo";
-      expect(j$.util.isUndefined(undefined)).toBe(false);
+      expect(jasmineUnderTest.util.isUndefined(undefined)).toBe(false);
     });
   });
 });

spec/core/asymmetric_equality/AnySpec.js

@@ -0,0 +1,52 @@
+describe("Any", function() {
+  it("matches a string", function() {
+    var any = new jasmineUnderTest.Any(String);
+
+    expect(any.asymmetricMatch("foo")).toBe(true);
+  });
+
+  it("matches a number", function() {
+    var any = new jasmineUnderTest.Any(Number);
+
+    expect(any.asymmetricMatch(1)).toBe(true);
+  });
+
+  it("matches a function", function() {
+    var any = new jasmineUnderTest.Any(Function);
+
+    expect(any.asymmetricMatch(function(){})).toBe(true);
+  });
+
+  it("matches an Object", function() {
+    var any = new jasmineUnderTest.Any(Object);
+
+    expect(any.asymmetricMatch({})).toBe(true);
+  });
+
+  it("matches a Boolean", function() {
+    var any = new jasmineUnderTest.Any(Boolean);
+
+    expect(any.asymmetricMatch(true)).toBe(true);
+  });
+
+  it("matches another constructed object", function() {
+    var Thing = function() {},
+      any = new jasmineUnderTest.Any(Thing);
+
+    expect(any.asymmetricMatch(new Thing())).toBe(true);
+  });
+
+  it("jasmineToString's itself", function() {
+    var any = new jasmineUnderTest.Any(Number);
+
+    expect(any.jasmineToString()).toEqual('<jasmine.any(Number)>');
+  });
+
+  describe("when called without an argument", function() {
+    it("tells the user to pass a constructor or use jasmine.anything()", function() {
+      expect(function() {
+        new jasmineUnderTest.Any();
+      }).toThrowError(TypeError, /constructor.*anything/);
+    });
+  });
+});

spec/core/asymmetric_equality/AnythingSpec.js

@@ -0,0 +1,44 @@
+describe("Anything", function() {
+  it("matches a string", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch('foo')).toBe(true);
+  });
+
+  it("matches a number", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch(42)).toBe(true);
+  });
+
+  it("matches an object", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch({ foo: 'bar' })).toBe(true);
+  });
+
+  it("matches an array", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch([1,2,3])).toBe(true);
+  });
+
+  it("doesn't match undefined", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch()).toBe(false);
+    expect(anything.asymmetricMatch(undefined)).toBe(false);
+  });
+
+  it("doesn't match null", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.asymmetricMatch(null)).toBe(false);
+  });
+
+  it("jasmineToString's itself", function() {
+    var anything = new jasmineUnderTest.Anything();
+
+    expect(anything.jasmineToString()).toEqual("<jasmine.anything>");
+  });
+});

spec/core/asymmetric_equality/ArrayContainingSpec.js

@@ -0,0 +1,39 @@
+describe("ArrayContaining", function() {
+  it("matches any actual to an empty array", function() {
+    var containing = new jasmineUnderTest.ArrayContaining([]);
+
+    expect(containing.asymmetricMatch("foo")).toBe(true);
+  });
+
+  it("does not work when not passed an array", function() {
+    var containing = new jasmineUnderTest.ArrayContaining("foo");
+
+    expect(function() {
+      containing.asymmetricMatch([]);
+    }).toThrowError(/not 'foo'/);
+  });
+
+  it("matches when the item is in the actual", function() {
+    var containing = new jasmineUnderTest.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["foo"])).toBe(true);
+  });
+
+  it("matches when additional items are in the actual", function() {
+    var containing = new jasmineUnderTest.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["foo", "bar"])).toBe(true);
+  });
+
+  it("does not match when the item is not in the actual", function() {
+    var containing = new jasmineUnderTest.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["bar"])).toBe(false);
+  });
+
+  it("jasmineToStrings itself", function() {
+    var containing = new jasmineUnderTest.ArrayContaining([]);
+
+    expect(containing.jasmineToString()).toMatch("<jasmine.arrayContaining");
+  });
+});

spec/core/asymmetric_equality/ObjectContainingSpec.js

@@ -0,0 +1,89 @@
+describe("ObjectContaining", function() {
+
+  it("matches any actual to an empty object", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({});
+
+    expect(containing.asymmetricMatch("foo")).toBe(true);
+  });
+
+  it("does not match an empty object actual", function() {
+    var containing = new jasmineUnderTest.ObjectContaining("foo");
+
+    expect(function() {
+      containing.asymmetricMatch({})
+    }).toThrowError(/not 'foo'/)
+  });
+
+  it("matches when the key/value pair is present in the actual", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({foo: "fooVal"});
+
+    expect(containing.asymmetricMatch({foo: "fooVal", bar: "barVal"})).toBe(true);
+  });
+
+  it("does not match when the key/value pair is not present in the actual", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({foo: "fooVal"});
+
+    expect(containing.asymmetricMatch({bar: "barVal", quux: "quuxVal"})).toBe(false);
+  });
+
+  it("does not match when the key is present but the value is different in the actual", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({foo: "other"});
+
+    expect(containing.asymmetricMatch({foo: "fooVal", bar: "barVal"})).toBe(false);
+  });
+
+  it("jasmineToString's itself", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({});
+
+    expect(containing.jasmineToString()).toMatch("<jasmine.objectContaining");
+  });
+
+  it("matches recursively", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({one: new jasmineUnderTest.ObjectContaining({two: {}})});
+
+    expect(containing.asymmetricMatch({one: {two: {}}})).toBe(true);
+  });
+
+  it("matches when key is present with undefined value", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({ one: undefined });
+
+    expect(containing.asymmetricMatch({ one: undefined })).toBe(true);
+  });
+
+  it("does not match when key with undefined value is not present", function() {
+    var containing = new jasmineUnderTest.ObjectContaining({ one: undefined });
+
+    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 jasmineUnderTest.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 jasmineUnderTest.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);
+  });
+});

spec/core/asymmetric_equality/StringMatchingSpec.js

@@ -0,0 +1,27 @@
+describe("StringMatching", function() {
+  it("matches a string against a provided regexp", function() {
+    var matcher = new jasmineUnderTest.StringMatching(/foo/);
+
+    expect(matcher.asymmetricMatch('barfoobaz')).toBe(true);
+    expect(matcher.asymmetricMatch('barbaz')).toBe(false);
+  });
+
+  it("matches a string against provided string", function() {
+    var matcher = new jasmineUnderTest.StringMatching('foo');
+
+    expect(matcher.asymmetricMatch('barfoobaz')).toBe(true);
+    expect(matcher.asymmetricMatch('barbaz')).toBe(false);
+  });
+
+  it("raises an Error when the expected is not a String or RegExp", function() {
+    expect(function() {
+      new jasmineUnderTest.StringMatching({});
+    }).toThrowError(/not a String or a RegExp/);
+  });
+
+  it("jasmineToString's itself", function() {
+    var matching = new jasmineUnderTest.StringMatching(/^foo/);
+
+    expect(matching.jasmineToString()).toEqual("<jasmine.stringMatching(/^foo/)>");
+  });
+});

spec/core/formatErrorMsgSpec.js

@@ -0,0 +1,13 @@
+describe('formatErrorMsg', function () {
+  it('should format an error with a domain', function() {
+    var formator = jasmineUnderTest.formatErrorMsg('api');
+    expect(formator('message')).toBe('api : message');
+    expect(formator('message2')).toBe('api : message2');
+  });
+
+  it('should format an error with a domain and usage', function() {
+    var formator = jasmineUnderTest.formatErrorMsg('api', 'with a param');
+    expect(formator('message')).toBe('api : message\nUsage: with a param');
+    expect(formator('message2')).toBe('api : message2\nUsage: with a param');
+  });
+});

spec/core/integration/CustomMatchersSpec.js

@@ -3,7 +3,7 @@ describe("Custom Matchers (Integration)", function() {
   var fakeTimer;
 
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmineUnderTest.Env();
   });
 
   it("allows adding more matchers local to a spec", function(done) {
@@ -142,7 +142,7 @@ describe("Custom Matchers (Integration)", function() {
     });
 
     var specExpectations = function() {
-      expect(argumentSpy).toHaveBeenCalledWith(j$.matchersUtil, [customEqualityFn]);
+      expect(argumentSpy).toHaveBeenCalledWith(jasmineUnderTest.matchersUtil, [customEqualityFn]);
     };
 
     env.addReporter({ specDone: specExpectations, jasmineDone: done });

spec/core/integration/EnvSpec.js

@@ -41,7 +41,7 @@ describe("Env integration", function() {
   });
 
   it("Suites execute as expected (no nesting)", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         calls = [];
 
     var assertions = function() {
@@ -68,7 +68,7 @@ describe("Env integration", function() {
   });
 
   it("Nested Suites execute as expected", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         calls = [];
 
     var assertions = function() {
@@ -100,23 +100,8 @@ describe("Env integration", function() {
     env.execute();
   });
 
-  it('Tells the reporter when the top-level suite has started and finished', function(done) {
-    var env = new j$.Env(),
-        reporter = jasmine.createSpyObj('reporter', ['suiteStarted', 'suiteDone', 'jasmineDone']);
-
-    reporter.jasmineDone.and.callFake(function() {
-      expect(reporter.suiteStarted).toHaveBeenCalled();
-      expect(reporter.suiteDone).toHaveBeenCalled();
-      done();
-    });
-
-    env.addReporter(reporter);
-
-    env.execute();
-  });
-
   it("Multiple top-level Suites execute as expected", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         calls = [];
 
     var assertions = function() {
@@ -157,7 +142,7 @@ describe("Env integration", function() {
   });
 
   it('explicitly fails a spec', function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         specDone = jasmine.createSpy('specDone');
 
     env.addReporter({
@@ -176,9 +161,24 @@ describe("Env integration", function() {
           })]
         }));
         expect(specDone).toHaveBeenCalledWith(jasmine.objectContaining({
-          description: 'has a message from an Error',
+          description: 'has a message and stack trace from an Error',
           failedExpectations: [jasmine.objectContaining({
-            message: 'Failed: error message'
+            message: 'Failed: error message',
+            stack: {
+              asymmetricMatch: function(other) {
+                if (!other) {
+                  // IE doesn't give us a stacktrace so just ignore it.
+                  return true;
+                }
+                var split = other.split('\n'),
+                    firstLine = split[0];
+                if (firstLine.indexOf('error message') >= 0) {
+                  // Chrome inserts the message and a newline before the first stacktrace line.
+                  firstLine = split[1];
+                }
+                return firstLine.indexOf('EnvSpec') >= 0;
+              }
+            }
           })]
         }));
         done();
@@ -194,7 +194,7 @@ describe("Env integration", function() {
         env.fail('messy message');
       });
 
-      env.it('has a message from an Error', function() {
+      env.it('has a message and stack trace from an Error', function() {
         env.fail(new Error('error message'));
       });
     });
@@ -204,10 +204,9 @@ describe("Env integration", function() {
 
 
   it("calls associated befores/specs/afters with the same 'this'", function(done) {
-    var env = new j$.Env();
+    var env = new jasmineUnderTest.Env();
 
     env.addReporter({jasmineDone: done});
-
     env.describe("tests", function() {
       var firstTimeThrough = true, firstSpecContext, secondSpecContext;
 
@@ -242,7 +241,7 @@ describe("Env integration", function() {
   });
 
   it("calls associated befores/its/afters with the same 'this' for an async spec", function(done) {
-    var env = new j$.Env();
+    var env = new jasmineUnderTest.Env();
 
     env.addReporter({jasmineDone: done});
 
@@ -268,7 +267,7 @@ describe("Env integration", function() {
   });
 
   it("calls associated beforeAlls/afterAlls only once per suite", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         before = jasmine.createSpy('beforeAll'),
         after = jasmine.createSpy('afterAll');
 
@@ -300,7 +299,7 @@ describe("Env integration", function() {
   });
 
   it("calls associated beforeAlls/afterAlls only once per suite for async", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         before = jasmine.createSpy('beforeAll'),
         after = jasmine.createSpy('afterAll');
 
@@ -339,7 +338,7 @@ describe("Env integration", function() {
   });
 
   it("calls associated beforeAlls/afterAlls with the cascaded 'this'", function(done) {
-    var env = new j$.Env();
+    var env = new jasmineUnderTest.Env();
 
     env.addReporter({jasmineDone: done});
 
@@ -393,7 +392,7 @@ describe("Env integration", function() {
   });
 
   it("fails all underlying specs when the beforeAll fails", function (done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       reporter = jasmine.createSpyObj('fakeReporter', [ "specDone", "jasmineDone" ]);
 
     reporter.jasmineDone.and.callFake(function() {
@@ -432,7 +431,7 @@ describe("Env integration", function() {
 
   describe('suiteDone reporting', function(){
     it("reports when an afterAll fails an expectation", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
       reporter.jasmineDone.and.callFake(function() {
@@ -459,35 +458,35 @@ describe("Env integration", function() {
     });
 
     it("if there are no specs, it still reports correctly", function(done) {
-        var env = new j$.Env(),
-          reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
+      var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
-        reporter.jasmineDone.and.callFake(function() {
-          expect(reporter.suiteDone).toHaveFailedExpecationsForRunnable('outer suite', [
-            'Expected 1 to equal 2.',
-            'Expected 2 to equal 3.'
-          ]);
-          done();
-        });
-
-        env.addReporter(reporter);
-
-        env.describe('outer suite', function() {
-          env.describe('inner suite', function() {
-            env.it('spec', function(){ });
-          });
-
-          env.afterAll(function() {
-            env.expect(1).toEqual(2);
-            env.expect(2).toEqual(3);
-          });
-        });
-
-        env.execute();
+      reporter.jasmineDone.and.callFake(function() {
+        expect(reporter.suiteDone).toHaveFailedExpecationsForRunnable('outer suite', [
+          'Expected 1 to equal 2.',
+          'Expected 2 to equal 3.'
+        ]);
+        done();
       });
 
+      env.addReporter(reporter);
+
+      env.describe('outer suite', function() {
+        env.describe('inner suite', function() {
+          env.it('spec', function(){ });
+        });
+
+        env.afterAll(function() {
+          env.expect(1).toEqual(2);
+          env.expect(2).toEqual(3);
+        });
+      });
+
+      env.execute();
+    });
+
     it("reports when afterAll throws an exception", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         error = new Error('After All Exception'),
         reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
@@ -513,7 +512,7 @@ describe("Env integration", function() {
     });
 
     it("reports when an async afterAll fails an expectation", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
       reporter.jasmineDone.and.callFake(function() {
@@ -539,7 +538,7 @@ describe("Env integration", function() {
     });
 
     it("reports when an async afterAll throws an exception", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         error = new Error('After All Exception'),
         reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
@@ -566,8 +565,55 @@ describe("Env integration", function() {
     });
   });
 
+  it('cascades expecatation failures in global beforeAll down to children', function(done) {
+    var env = new jasmineUnderTest.Env(),
+      reporter = jasmine.createSpyObj(['specDone', 'jasmineDone']);
+
+    reporter.jasmineDone.and.callFake(function(results) {
+      expect(results.failedExpectations).toEqual([]);
+      expect(reporter.specDone).toHaveFailedExpecationsForRunnable('is a spec', [
+        'Expected 1 to be 0.'
+      ]);
+      done();
+    });
+
+    env.beforeAll(function() {
+      env.expect(1).toBe(0);
+    });
+
+    env.it('is a spec', function() {
+      env.expect(true).toBe(true);
+    });
+
+    env.addReporter(reporter);
+
+    env.execute();
+  });
+
+  it('reports expectation failures in global afterAll', function(done) {
+    var env = new jasmineUnderTest.Env(),
+      reporter = jasmine.createSpyObj(['jasmineDone']);
+
+    reporter.jasmineDone.and.callFake(function(results) {
+      expect(results.failedExpectations).toEqual([jasmine.objectContaining({ message: 'Expected 1 to be 0.' })]);
+      done();
+    });
+
+    env.afterAll(function() {
+      env.expect(1).toBe(0);
+    });
+
+    env.it('is a spec', function() {
+      env.expect(true).toBe(true);
+    });
+
+    env.addReporter(reporter);
+
+    env.execute();
+  });
+
   it("Allows specifying which specs and suites to run", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         calls = [],
         suiteCallback = jasmine.createSpy('suite callback'),
         firstSpec,
@@ -603,7 +649,7 @@ describe("Env integration", function() {
   });
 
   it('runs before and after all functions for runnables provided to .execute()', function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       calls = [],
       first_spec,
       second_spec;
@@ -612,8 +658,6 @@ describe("Env integration", function() {
       expect(calls).toEqual([
         "before",
         "first spec",
-        "after",
-        "before",
         "second spec",
         "after"
       ]);
@@ -641,7 +685,7 @@ describe("Env integration", function() {
   });
 
   it("Functions can be spied on and have their calls tracked", function (done) {
-    var env = new j$.Env();
+    var env = new jasmineUnderTest.Env();
 
     var originalFunctionWasCalled = false;
     var subject = {
@@ -680,8 +724,33 @@ describe("Env integration", function() {
     env.execute();
   });
 
+  it('can be configured to allow respying on functions', function () {
+    var env = new jasmineUnderTest.Env(),
+        foo = {
+          bar: function () {
+            return 1;
+          }
+        };
+
+    env.allowRespy(true);
+
+    env.describe('test suite', function(){
+      env.it('spec 0', function(){
+        env.spyOn(foo,'bar');
+
+        var error = null;
+
+        expect(function() {
+          env.spyOn(foo, 'bar');
+        }).not.toThrow();
+      });
+    });
+
+    env.execute();
+  });
+
   it('removes all spies added in a spec after the spec is complete', function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       originalFoo = function() {},
       testObj = {
         foo: originalFoo
@@ -709,7 +778,7 @@ describe("Env integration", function() {
   });
 
   it('removes all spies added in a suite after the suite is complete', function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       originalFoo = function() {},
       testObj = {
         foo: originalFoo
@@ -719,17 +788,17 @@ describe("Env integration", function() {
         env.beforeAll(function() { env.spyOn(testObj, 'foo');})
 
         env.it('spec 0', function() {
-          expect(j$.isSpy(testObj.foo)).toBe(true);
+          expect(jasmineUnderTest.isSpy(testObj.foo)).toBe(true);
         });
 
         env.it('spec 1', function() {
-          expect(j$.isSpy(testObj.foo)).toBe(true);
+          expect(jasmineUnderTest.isSpy(testObj.foo)).toBe(true);
         });
       });
 
       env.describe('another suite', function() {
         env.it('spec 2', function() {
-          expect(j$.isSpy(testObj.foo)).toBe(false);
+          expect(jasmineUnderTest.isSpy(testObj.foo)).toBe(false);
         });
       });
 
@@ -738,11 +807,36 @@ describe("Env integration", function() {
     env.execute();
   });
 
+  it('removes a spy from the top suite after the run is complete', function(done) {
+    var env = new jasmineUnderTest.Env(),
+      originalFoo = function() {},
+      testObj = {
+        foo: originalFoo
+      };
+
+    env.beforeAll(function() {
+      env.spyOn(testObj, 'foo');
+    });
+
+    env.it('spec', function() {
+      expect(jasmineUnderTest.isSpy(testObj.foo)).toBe(true);
+    });
+
+    env.addReporter({
+      jasmineDone: function() {
+        expect(jasmineUnderTest.isSpy(testObj.foo)).toBe(false);
+        done();
+      }
+    });
+
+    env.execute();
+  });
+
   it("Mock clock can be installed and used in tests", function(done) {
     var globalSetTimeout = jasmine.createSpy('globalSetTimeout'),
         delayedFunctionForGlobalClock = jasmine.createSpy('delayedFunctionForGlobalClock'),
         delayedFunctionForMockClock = jasmine.createSpy('delayedFunctionForMockClock'),
-        env = new j$.Env({global: { setTimeout: globalSetTimeout }});
+        env = new jasmineUnderTest.Env({global: { setTimeout: globalSetTimeout }});
 
     var assertions = function() {
       expect(delayedFunctionForMockClock).toHaveBeenCalled();
@@ -772,7 +866,7 @@ describe("Env integration", function() {
   });
 
   it("should run async specs in order, waiting for them to complete", function(done) {
-    var env = new j$.Env(), mutatedVar;
+    var env = new jasmineUnderTest.Env(), mutatedVar;
 
     env.describe("tests", function() {
       env.beforeEach(function() {
@@ -799,17 +893,17 @@ describe("Env integration", function() {
     var originalTimeout;
 
     beforeEach(function() {
-      originalTimeout = j$.DEFAULT_TIMEOUT_INTERVAL;
+      originalTimeout = jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL;
       jasmine.clock().install();
     });
 
     afterEach(function() {
       jasmine.clock().uninstall();
-      j$.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
     it("should wait a specified interval before failing specs haven't called done yet", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
           reporter = jasmine.createSpyObj('fakeReporter', [ "specDone", "jasmineDone" ]);
 
       reporter.specDone.and.callFake(function() {
@@ -822,7 +916,7 @@ describe("Env integration", function() {
       });
 
       env.addReporter(reporter);
-      j$.DEFAULT_TIMEOUT_INTERVAL = 8414;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 8414;
 
       env.it("async spec that doesn't call done", function(underTestCallback) {
         env.expect(true).toBeTruthy();
@@ -833,7 +927,7 @@ describe("Env integration", function() {
     });
 
     it("should wait a specified interval before failing beforeAll's and their associated specs that haven't called done", function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         reporter = jasmine.createSpyObj('fakeReporter', [ "specDone", "jasmineDone" ]);
 
       reporter.jasmineDone.and.callFake(function() {
@@ -844,7 +938,7 @@ describe("Env integration", function() {
       });
 
       env.addReporter(reporter);
-      j$.DEFAULT_TIMEOUT_INTERVAL = 1290;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 1290;
 
       env.beforeAll(function(done) {
         jasmine.clock().tick(1290);
@@ -861,8 +955,38 @@ describe("Env integration", function() {
       env.execute();
     });
 
+    it("should not use the mock clock for asynchronous timeouts", function(){
+      var env = new jasmineUnderTest.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);
+      jasmineUnderTest.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(),
+      var env = new jasmineUnderTest.Env(),
       reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','suiteDone']);
 
       reporter.jasmineDone.and.callFake(function() {
@@ -873,7 +997,7 @@ describe("Env integration", function() {
       });
 
       env.addReporter(reporter);
-      j$.DEFAULT_TIMEOUT_INTERVAL = 3000;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 3000;
 
       env.describe('my suite', function() {
         env.it('my spec', function() {
@@ -889,7 +1013,7 @@ describe("Env integration", function() {
     });
 
     it('should wait a custom interval before reporting async functions that fail to call done', function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
           reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone', 'suiteDone', 'specDone']);
 
       reporter.jasmineDone.and.callFake(function() {
@@ -917,7 +1041,7 @@ describe("Env integration", function() {
       });
 
       env.addReporter(reporter);
-      j$.DEFAULT_TIMEOUT_INTERVAL = 10000;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
       env.describe('suite', function() {
         env.describe('beforeAll', function() {
@@ -966,14 +1090,11 @@ describe("Env integration", function() {
     });
 
     it('explicitly fails an async spec', function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
       specDone = jasmine.createSpy('specDone');
 
       env.addReporter({
         specDone: specDone,
-        specStarted: function() {
-          jasmine.clock().tick(1);
-        },
         jasmineDone: function() {
           expect(specDone).toHaveBeenCalledWith(jasmine.objectContaining({
             description: 'has a default message',
@@ -1033,12 +1154,16 @@ describe("Env integration", function() {
       });
 
       env.execute();
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
+      jasmine.clock().tick(1);
     });
   });
 
   describe('focused tests', function() {
     it('should only run the focused tests', function(done) {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         calls = [];
 
       var assertions = function() {
@@ -1062,7 +1187,7 @@ describe("Env integration", function() {
     });
 
     it('should only run focused suites', function(){
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         calls = [];
 
       var assertions = function() {
@@ -1086,10 +1211,82 @@ describe("Env integration", function() {
 
       env.execute();
     });
+
+    it('should run focused tests inside an xdescribe', function(done) {
+      var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [
+          "jasmineStarted",
+          "jasmineDone",
+          "suiteStarted",
+          "suiteDone",
+          "specStarted",
+          "specDone"
+        ]);
+
+      reporter.jasmineDone.and.callFake(function() {
+        expect(reporter.jasmineStarted).toHaveBeenCalledWith({
+          totalSpecsDefined: 1
+        });
+
+        expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+          description: 'with a fit spec',
+          status: 'failed'
+        }));
+
+        done();
+      });
+
+      env.addReporter(reporter);
+
+      env.xdescribe("xd suite", function() {
+        env.fit("with a fit spec", function() {
+          env.expect(true).toBe(false);
+        });
+      });
+
+      env.execute();
+    });
+
+    it('should run focused suites inside an xdescribe', function(done) {
+      var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [
+          "jasmineStarted",
+          "jasmineDone",
+          "suiteStarted",
+          "suiteDone",
+          "specStarted",
+          "specDone"
+        ]);
+
+      reporter.jasmineDone.and.callFake(function() {
+        expect(reporter.jasmineStarted).toHaveBeenCalledWith({
+          totalSpecsDefined: 1
+        });
+
+        expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+          description: 'with a spec',
+          status: 'failed'
+        }));
+
+        done();
+      });
+
+      env.addReporter(reporter);
+
+      env.xdescribe("xd suite", function() {
+        env.fdescribe("fd suite", function() {
+          env.it("with a spec", function() {
+            env.expect(true).toBe(false);
+          });
+        });
+      });
+
+      env.execute();
+    });
   });
 
   it("should report as expected", function(done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
         reporter = jasmine.createSpyObj('fakeReporter', [
           "jasmineStarted",
           "jasmineDone",
@@ -1101,9 +1298,32 @@ describe("Env integration", function() {
 
     reporter.jasmineDone.and.callFake(function() {
       expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-        totalSpecsDefined: 3
+        totalSpecsDefined: 5
       });
-      var suiteResult = reporter.suiteStarted.calls.argsFor(1)[0];
+
+      expect(reporter.specDone.calls.count()).toBe(5);
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'with a top level spec',
+        status: 'passed'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: "with an x'ed spec",
+        status: 'pending'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'with a spec',
+        status: 'failed'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'is pending',
+        status: 'pending'
+      }));
+
+      var suiteResult = reporter.suiteStarted.calls.argsFor(0)[0];
       expect(suiteResult.description).toEqual("A Suite");
 
       done();
@@ -1116,20 +1336,113 @@ describe("Env integration", function() {
         env.expect(true).toBe(true);
       });
       env.describe("with a nested suite", function() {
-        env.xit("with a pending spec", function() {
+        env.xit("with an x'ed spec", function() {
           env.expect(true).toBe(true);
         });
         env.it("with a spec", function() {
           env.expect(true).toBe(false);
         });
       });
+
+      env.describe('with only non-executable specs', function() {
+        env.it('is pending');
+        env.xit('is xed', function() {
+          env.expect(true).toBe(true);
+        });
+      });
+    });
+
+    env.execute();
+  });
+
+  it('should report pending spec messages', function(done) {
+    var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [
+          'specDone',
+          'jasmineDone'
+        ]);
+
+    reporter.jasmineDone.and.callFake(function() {
+      var specStatus = reporter.specDone.calls.argsFor(0)[0];
+
+      expect(specStatus.pendingReason).toBe('with a message');
+
+      done();
+    });
+
+    env.addReporter(reporter);
+
+    env.it('will be pending', function() {
+      env.pending('with a message');
+    });
+
+    env.execute();
+  });
+
+  it('should report using fallback reporter', function(done) {
+    var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [
+          'specDone',
+          'jasmineDone'
+        ]);
+
+    reporter.jasmineDone.and.callFake(function() {
+      expect(reporter.specDone).toHaveBeenCalled();
+
+      done();
+    });
+
+    env.provideFallbackReporter(reporter);
+
+    env.it('will be pending', function() {
+      env.pending('with a message');
+    });
+
+    env.execute();
+  });
+
+  it('should report xdescribes as expected', function(done) {
+    var env = new jasmineUnderTest.Env(),
+        reporter = jasmine.createSpyObj('fakeReporter', [
+          "jasmineStarted",
+          "jasmineDone",
+          "suiteStarted",
+          "suiteDone",
+          "specStarted",
+          "specDone"
+        ]);
+
+    reporter.jasmineDone.and.callFake(function() {
+      expect(reporter.jasmineStarted).toHaveBeenCalledWith({
+        totalSpecsDefined: 1
+      });
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({ status: 'pending' }));
+      expect(reporter.suiteDone).toHaveBeenCalledWith(jasmine.objectContaining({ description: 'xd out', status: 'pending' }));
+      expect(reporter.suiteDone.calls.count()).toBe(4);
+
+      done();
+    });
+
+    env.addReporter(reporter);
+
+    env.describe("A Suite", function() {
+      env.describe("nested", function() {
+        env.xdescribe("xd out", function() {
+          env.describe("nested again", function() {
+            env.it("with a spec", function() {
+              env.expect(true).toBe(false);
+            });
+          });
+        });
+      });
     });
 
     env.execute();
   });
 
   it("should be possible to get full name from a spec", function() {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         topLevelSpec, nestedSpec, doublyNestedSpec;
 
     env.describe("my tests", function() {
@@ -1151,7 +1464,7 @@ describe("Env integration", function() {
   });
 
   it("Custom equality testers should be per spec", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         reporter = jasmine.createSpyObj('fakeReporter', [
           "jasmineDone",
           "specDone"
@@ -1184,7 +1497,7 @@ describe("Env integration", function() {
   });
 
   it("Custom equality testers should be per suite", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         reporter = jasmine.createSpyObj('fakeReporter', [
           "jasmineDone",
           "specDone"
@@ -1226,7 +1539,7 @@ describe("Env integration", function() {
   });
 
   it("Custom equality testers for toContain should be per spec", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         reporter = jasmine.createSpyObj('fakeReporter', [
           "jasmineDone",
           "specDone"
@@ -1259,7 +1572,7 @@ describe("Env integration", function() {
   });
 
   it("produces an understandable error message when an 'expect' is used outside of a current spec", function(done) {
-    var env = new j$.Env();
+    var env = new jasmineUnderTest.Env();
 
     env.describe("A Suite", function() {
       env.it("an async spec that is actually synchronous", function(underTestCallback) {
@@ -1273,7 +1586,7 @@ describe("Env integration", function() {
   });
 
   it("Custom equality testers for toContain should be per suite", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         reporter = jasmine.createSpyObj('fakeReporter', [
           "jasmineDone",
           "specDone"
@@ -1315,7 +1628,7 @@ describe("Env integration", function() {
   });
 
   it("Custom matchers should be per spec", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         matchers = {
           toFoo: function() {}
         };
@@ -1337,7 +1650,7 @@ describe("Env integration", function() {
   });
 
   it("Custom matchers should be per suite", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
+    var env = new jasmineUnderTest.Env({global: { setTimeout: setTimeout }}),
         matchers = {
           toFoo: function() {}
         };
@@ -1366,7 +1679,7 @@ describe("Env integration", function() {
   });
 
   it('throws an exception if you try to create a spy outside of a runnable', function (done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       obj = {fn: function () {}},
       exception;
 
@@ -1389,7 +1702,7 @@ describe("Env integration", function() {
   });
 
   it('throws an exception if you try to add a matcher outside of a runnable', function (done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       obj = {fn: function () {}},
       exception;
 
@@ -1412,7 +1725,7 @@ describe("Env integration", function() {
   });
 
   it('throws an exception if you try to add a custom equality outside of a runnable', function (done) {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       obj = {fn: function () {}},
       exception;
 

spec/core/integration/SpecRunningSpec.js

@@ -1,9 +1,8 @@
 describe("jasmine spec running", function () {
   var env;
-  var fakeTimer;
 
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmineUnderTest.Env();
   });
 
   it('should assign spec ids sequentially', function() {
@@ -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) {
@@ -166,7 +169,7 @@ describe("jasmine spec running", function () {
     env.execute();
   });
 
-  it("should run multiple befores and afters in the order they are declared", function(done) {
+  it("should run multiple befores and afters ordered so functions declared later are treated as more specific", function(done) {
     var actions = [];
 
     env.beforeEach(function () {
@@ -228,7 +231,7 @@ describe("jasmine spec running", function () {
     env.execute();
   });
 
-  it('should run beforeAlls before beforeEachs and afterAlls after afterEachs', function() {
+  it('should run beforeAlls before beforeEachs and afterAlls after afterEachs', function(done) {
     var actions = [];
 
     env.beforeAll(function() {
@@ -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() {
+  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,31 @@ 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){
+    var actions = [];
+
+    env.fdescribe('Suite', function() {
+      env.beforeAll(function(){
+        actions.push('beforeAll');
+      });
+      env.it('should run beforeAll once', function() {
+        actions.push('spec');
+      });
+      env.afterAll(function(){
+        actions.push('afterAll');
+      });
+    });
+
+    var assertions = function() {
+      expect(actions).toEqual(['beforeAll', 'spec', 'afterAll']);
+      done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+    env.execute();
   });
 
   describe('focused runnables', function() {
@@ -392,9 +415,7 @@ describe("jasmine spec running", function () {
           'beforeEach',
           'spec in fdescribe',
           'afterEach',
-          'afterAll',
 
-          'beforeAll',
           'beforeEach',
           'focused spec',
           'afterEach',
@@ -525,21 +546,34 @@ 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();
-    });
-  });
-
-  // TODO: is this useful? It doesn't catch syntax errors
-  xit("should recover gracefully when there are errors in describe functions", function() {
-    var specs = [];
-    var superSimpleReporter = new j$.Reporter();
-    superSimpleReporter.reportSpecResults = function(result) {
-      specs.push("Spec: " + result.fullName);
     };
 
-    try {
+    env.addReporter({jasmineDone: assertions});
+
+    env.execute();
+  });
+
+  it("should recover gracefully when there are errors in describe functions", function(done) {
+    var specs = [],
+      reporter = jasmine.createSpyObj(['specDone', 'jasmineDone']);
+
+    reporter.specDone.and.callFake(function(result) {
+      specs.push(result.fullName);
+    });
+
+    reporter.jasmineDone.and.callFake(function() {
+      expect(specs).toContain('outer1 inner1 should thingy');
+      expect(specs).toContain('outer1 inner1 encountered a declaration exception');
+      expect(specs).toContain('outer1 inner2 should other thingy');
+      expect(specs).toContain('outer1 encountered a declaration exception');
+      expect(specs).toContain('outer2 should xxx');
+      done();
+    });
+
+    expect(function() {
       env.describe("outer1", function() {
         env.describe("inner1", function() {
           env.it("should thingy", function() {
@@ -558,8 +592,7 @@ describe("jasmine spec running", function () {
         throw new Error("fake error");
 
       });
-    } catch(e) {
-    }
+    }).not.toThrow();
 
     env.describe("outer2", function() {
       env.it("should xxx", function() {
@@ -567,16 +600,198 @@ describe("jasmine spec running", function () {
       });
     });
 
-    env.addReporter(superSimpleReporter);
+    env.addReporter(reporter);
     env.execute();
-
-    expect(specs.join('')).toMatch(new RegExp(
-      'Spec: outer1 inner1 should thingy.' +
-      'Spec: outer1 inner1 encountered a declaration exception.' +
-      'Spec: outer1 inner2 should other thingy.' +
-      'Spec: outer1 encountered a declaration exception.' +
-      'Spec: outer2 should xxx.'
-    ));
-
   });
+
+  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/);
+  });
+
+  it("should run the tests in a consistent order when a seed is supplied", function(done) {
+    var actions = [];
+    env.randomizeTests(true);
+    env.seed('123456');
+
+    env.beforeEach(function () {
+      actions.push('topSuite beforeEach');
+    });
+
+    env.afterEach(function () {
+      actions.push('topSuite afterEach');
+    });
+
+    env.describe('Something', function() {
+      env.beforeEach(function() {
+        actions.push('outer beforeEach');
+      });
+
+      env.afterEach(function() {
+        actions.push('outer afterEach');
+      });
+
+      env.it('does it 1', function() {
+        actions.push('outer it 1');
+      });
+
+      env.describe('Inner 1', function() {
+        env.beforeEach(function() {
+          actions.push('inner 1 beforeEach');
+        });
+
+        env.afterEach(function() {
+          actions.push('inner 1 afterEach');
+        });
+
+        env.it('does it 2', function() {
+          actions.push('inner 1 it');
+        });
+      });
+
+      env.it('does it 3', function() {
+        actions.push('outer it 2');
+      });
+
+      env.describe('Inner 2', function() {
+        env.beforeEach(function() {
+          actions.push('inner 2 beforeEach');
+        });
+
+        env.afterEach(function() {
+          actions.push('inner 2 afterEach');
+        });
+
+        env.it('does it 2', function() {
+          actions.push('inner 2 it');
+        });
+      });
+    });
+
+    var assertions = function() {
+      var expected = [
+        'topSuite beforeEach',
+        'outer beforeEach',
+        'outer it 2',
+        'outer afterEach',
+        'topSuite afterEach',
+
+        'topSuite beforeEach',
+        'outer beforeEach',
+        'inner 2 beforeEach',
+        'inner 2 it',
+        'inner 2 afterEach',
+        'outer afterEach',
+        'topSuite afterEach',
+
+        'topSuite beforeEach',
+        'outer beforeEach',
+        'inner 1 beforeEach',
+        'inner 1 it',
+        'inner 1 afterEach',
+        'outer afterEach',
+        'topSuite afterEach',
+
+        'topSuite beforeEach',
+        'outer beforeEach',
+        'outer it 1',
+        'outer afterEach',
+        'topSuite afterEach'
+      ];
+      expect(actions).toEqual(expected);
+      done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+
+    env.execute();
+  });
+
 });

spec/core/matchers/matchersUtilSpec.js

@@ -1,85 +1,119 @@
 describe("matchersUtil", function() {
   describe("equals", function() {
     it("passes for literals that are triple-equal", function() {
-      expect(j$.matchersUtil.equals(null, null)).toBe(true);
-      expect(j$.matchersUtil.equals(void 0, void 0)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(null, null)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(void 0, void 0)).toBe(true);
     });
 
     it("fails for things that are not equivalent", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, 1)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals({a: "foo"}, 1)).toBe(false);
     });
 
     it("passes for Strings that are equivalent", function() {
-      expect(j$.matchersUtil.equals("foo", "foo")).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals("foo", "foo")).toBe(true);
     });
 
     it("fails for Strings that are not equivalent", function() {
-      expect(j$.matchersUtil.equals("foo", "bar")).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals("foo", "bar")).toBe(false);
     });
 
     it("passes for Numbers that are equivalent", function() {
-      expect(j$.matchersUtil.equals(123, 123)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(123, 123)).toBe(true);
     });
 
     it("fails for Numbers that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(123, 456)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(123, 456)).toBe(false);
     });
 
     it("passes for Dates that are equivalent", function() {
-      expect(j$.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Jan 1, 1970"))).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Jan 1, 1970"))).toBe(true);
     });
 
     it("fails for Dates that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Feb 3, 1991"))).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Feb 3, 1991"))).toBe(false);
     });
 
     it("passes for Booleans that are equivalent", function() {
-      expect(j$.matchersUtil.equals(true, true)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(true, true)).toBe(true);
     });
 
     it("fails for Booleans that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(true, false)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(true, false)).toBe(false);
     });
 
     it("passes for RegExps that are equivalent", function() {
-      expect(j$.matchersUtil.equals(/foo/, /foo/)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(/foo/, /foo/)).toBe(true);
     });
 
     it("fails for RegExps that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(/foo/, /bar/)).toBe(false);
-      expect(j$.matchersUtil.equals(new RegExp("foo", "i"), new RegExp("foo"))).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(/foo/, /bar/)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(new RegExp("foo", "i"), new RegExp("foo"))).toBe(false);
     });
 
     it("passes for Arrays that are equivalent", function() {
-      expect(j$.matchersUtil.equals([1, 2], [1, 2])).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals([1, 2], [1, 2])).toBe(true);
+    });
+
+    it("passes for Arrays that are equivalent, with elements added by changing length", function() {
+      var foo = [];
+      foo.length = 1;
+
+      expect(jasmineUnderTest.matchersUtil.equals(foo, [undefined])).toBe(true);
     });
 
     it("fails for Arrays that are not equivalent", function() {
-      expect(j$.matchersUtil.equals([1, 2], [1, 2, 3])).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals([1, 2], [1, 2, 3])).toBe(false);
+    });
+
+    it("fails for Arrays whose contents are equivalent, but have differing properties", function() {
+      var one = [1,2,3],
+          two = [1,2,3];
+
+      one.foo = 'bar';
+      two.foo = 'baz';
+
+      expect(jasmineUnderTest.matchersUtil.equals(one, two)).toBe(false);
+    });
+
+    it("passes for Arrays with equivalent contents and properties", function() {
+      var one = [1,2,3],
+          two = [1,2,3];
+
+      one.foo = 'bar';
+      two.foo = 'bar';
+
+      expect(jasmineUnderTest.matchersUtil.equals(one, two)).toBe(true);
     });
 
     it("passes for Errors that are the same type and have the same message", function() {
-      expect(j$.matchersUtil.equals(new Error("foo"), new Error("foo"))).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(new Error("foo"), new Error("foo"))).toBe(true);
     });
 
     it("fails for Errors that are the same type and have different messages", function() {
-      expect(j$.matchersUtil.equals(new Error("foo"), new Error("bar"))).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(new Error("foo"), new Error("bar"))).toBe(false);
+    });
+
+    it("fails for objects with different constructors", function() {
+      function One() {}
+      function Two() {}
+
+      expect(jasmineUnderTest.matchersUtil.equals(new One(), new Two())).toBe(false);
     });
 
     it("passes for Objects that are equivalent (simple case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, {a: "foo"})).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals({a: "foo"}, {a: "foo"})).toBe(true);
     });
 
     it("fails for Objects that are not equivalent (simple case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, {a: "bar"})).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals({a: "foo"}, {a: "bar"})).toBe(false);
     });
 
     it("passes for Objects that are equivalent (deep case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo", b: { c: "bar"}}, {a: "foo", b: { c: "bar"}})).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals({a: "foo", b: { c: "bar"}}, {a: "foo", b: { c: "bar"}})).toBe(true);
     });
 
     it("fails for Objects that are not equivalent (deep case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo", b: { c: "baz"}}, {a: "foo", b: { c: "bar"}})).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals({a: "foo", b: { c: "baz"}}, {a: "foo", b: { c: "bar"}})).toBe(false);
     });
 
     it("passes for Objects that are equivalent (with cycles)", function() {
@@ -89,7 +123,7 @@ describe("matchersUtil", function() {
       actual.b = actual;
       expected.b = actual;
 
-      expect(j$.matchersUtil.equals(actual, expected)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(actual, expected)).toBe(true);
     });
 
     it("fails for Objects that are not equivalent (with cycles)", function() {
@@ -99,15 +133,15 @@ describe("matchersUtil", function() {
       actual.b = actual;
       expected.b = actual;
 
-      expect(j$.matchersUtil.equals(actual, expected)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(actual, expected)).toBe(false);
     });
 
     it("fails when comparing an empty object to an empty array (issue #114)", function() {
       var emptyObject = {},
         emptyArray = [];
 
-      expect(j$.matchersUtil.equals(emptyObject, emptyArray)).toBe(false);
-      expect(j$.matchersUtil.equals(emptyArray, emptyObject)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(emptyObject, emptyArray)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(emptyArray, emptyObject)).toBe(false);
     });
 
     it("passes for equivalent frozen objects (GitHub issue #266)", function() {
@@ -119,93 +153,246 @@ describe("matchersUtil", function() {
       Object.freeze(a);
       Object.freeze(b);
 
-      expect(j$.matchersUtil.equals(a,b)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
+    });
+
+    describe("when running in a browser", function() {
+      function isNotRunningInBrowser() {
+        return typeof document === 'undefined'
+      }
+
+      it("passes for equivalent DOM nodes", function() {
+        if (isNotRunningInBrowser()) {
+          return;
+        }
+        var a = document.createElement("div");
+        a.setAttribute("test-attr", "attr-value");
+        a.appendChild(document.createTextNode('test'));
+
+        var b = document.createElement("div");
+        b.setAttribute("test-attr", "attr-value");
+        b.appendChild(document.createTextNode('test'));
+
+        expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
+      });
+
+      it("passes for equivalent objects from different frames", function() {
+        if (isNotRunningInBrowser()) {
+          return;
+        }
+        // iframe.contentWindow.eval isn't supported in ie8
+        if (jasmine.getEnv().ieVersion < 9) {
+          return;
+        }
+        var iframe = document.createElement('iframe');
+        document.body.appendChild(iframe);
+        iframe.contentWindow.eval('window.testObject = {}');
+        expect(jasmineUnderTest.matchersUtil.equals({}, iframe.contentWindow.testObject)).toBe(true);
+        document.body.removeChild(iframe);
+      });
+
+      it("fails for DOM nodes with different attributes or child nodes", function() {
+        if (isNotRunningInBrowser()) {
+          return;
+        }
+        var a = document.createElement("div");
+        a.setAttribute("test-attr", "attr-value")
+        a.appendChild(document.createTextNode('test'));
+
+        var b = document.createElement("div");
+        b.setAttribute("test-attr", "attr-value2")
+        b.appendChild(document.createTextNode('test'));
+
+        expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(false);
+
+        b.setAttribute("test-attr", "attr-value");
+        expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
+
+        b.appendChild(document.createTextNode('2'));
+        expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(false);
+
+        a.appendChild(document.createTextNode('2'));
+        expect(jasmineUnderTest.matchersUtil.equals(a,b)).toBe(true);
+      });
+    });
+
+    describe("when running in Node", function() {
+      function isNotRunningInNode() {
+        return typeof require !== 'function'
+      }
+
+      it("passes for equivalent objects from different vm contexts", function() {
+        if (isNotRunningInNode()) {
+          return;
+        }
+        var vm = require('vm');
+        var sandbox = {
+          obj: null
+        };
+        vm.runInNewContext('obj = {a: 1, b: 2}', sandbox);
+
+        expect(jasmineUnderTest.matchersUtil.equals(sandbox.obj, {a: 1, b: 2})).toBe(true);
+      });
+
+      it("passes for equivalent arrays from different vm contexts", function() {
+        if (isNotRunningInNode()) {
+          return;
+        }
+        var vm = require('vm');
+        var sandbox = {
+          arr: null
+        };
+        vm.runInNewContext('arr = [1, 2]', sandbox);
+
+        expect(jasmineUnderTest.matchersUtil.equals(sandbox.arr, [1, 2])).toBe(true);
+      });
     });
 
     it("passes when Any is used", function() {
       var number = 3,
-        anyNumber = new j$.Any(Number);
+        anyNumber = new jasmineUnderTest.Any(Number);
 
-      expect(j$.matchersUtil.equals(number, anyNumber)).toBe(true);
-      expect(j$.matchersUtil.equals(anyNumber, number)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(number, anyNumber)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(anyNumber, number)).toBe(true);
     });
 
     it("fails when Any is compared to something unexpected", function() {
       var number = 3,
-        anyString = new j$.Any(String);
+        anyString = new jasmineUnderTest.Any(String);
 
-      expect(j$.matchersUtil.equals(number, anyString)).toBe(false);
-      expect(j$.matchersUtil.equals(anyString, number)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(number, anyString)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(anyString, number)).toBe(false);
     });
 
     it("passes when ObjectContaining is used", function() {
       var obj = {
         foo: 3,
         bar: 7
-      };
+      },
+      containing = new jasmineUnderTest.ObjectContaining({foo: 3});
 
-      expect(j$.matchersUtil.equals(obj, new j$.ObjectContaining({foo: 3}))).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(obj, containing)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(containing, obj)).toBe(true);
+    });
+
+    it("passes when an asymmetric equality tester returns true", function() {
+      var tester = { asymmetricMatch: function(other) { return true; } };
+
+      expect(jasmineUnderTest.matchersUtil.equals(false, tester)).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(tester, false)).toBe(true);
+    });
+
+    it("fails when an asymmetric equality tester returns false", function() {
+      var tester = { asymmetricMatch: function(other) { return false; } };
+
+      expect(jasmineUnderTest.matchersUtil.equals(true, tester)).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(tester, true)).toBe(false);
+    });
+
+    it("passes when ArrayContaining is used", function() {
+      var arr = ["foo", "bar"];
+
+      expect(jasmineUnderTest.matchersUtil.equals(arr, new jasmineUnderTest.ArrayContaining(["bar"]))).toBe(true);
     });
 
     it("passes when a custom equality matcher returns true", function() {
       var tester = function(a, b) { return true; };
 
-      expect(j$.matchersUtil.equals(1, 2, [tester])).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(1, 2, [tester])).toBe(true);
     });
 
     it("passes for two empty Objects", function () {
-      expect(j$.matchersUtil.equals({}, {})).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals({}, {})).toBe(true);
     });
 
     describe("when a custom equality matcher is installed that returns 'undefined'", function () {
       var tester = function(a, b) { return jasmine.undefined; };
 
       it("passes for two empty Objects", function () {
-        expect(j$.matchersUtil.equals({}, {}, [tester])).toBe(true);
+        expect(jasmineUnderTest.matchersUtil.equals({}, {}, [tester])).toBe(true);
       });
     });
 
     it("fails for equivalents when a custom equality matcher returns false", function() {
       var tester = function(a, b) { return false; };
 
-      expect(j$.matchersUtil.equals(1, 1, [tester])).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.equals(1, 1, [tester])).toBe(false);
+    });
+
+    it("passes for an asymmetric equality tester that returns true when a custom equality tester return false", function() {
+      var asymmetricTester = { asymmetricMatch: function(other) { return true; } },
+          symmetricTester = function(a, b) { return false; };
+
+      expect(jasmineUnderTest.matchersUtil.equals(asymmetricTester, true, [symmetricTester])).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.equals(true, asymmetricTester, [symmetricTester])).toBe(true);
+    });
+
+    it("passes when an Any is compared to an Any that checks for the same type", function() {
+      var any1 = new jasmineUnderTest.Any(Function),
+          any2 = new jasmineUnderTest.Any(Function);
+
+      expect(jasmineUnderTest.matchersUtil.equals(any1, any2)).toBe(true);
+    });
+
+    it("passes for null prototype objects with same properties", function () {
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var objA = Object.create(null),
+          objB = Object.create(null);
+
+      objA.name = 'test';
+      objB.name = 'test';
+
+      expect(jasmineUnderTest.matchersUtil.equals(objA, objB)).toBe(true);
+    });
+
+    it("fails for null prototype objects with different properties", function () {
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var objA = Object.create(null),
+          objB = Object.create(null);
+
+      objA.name = 'test';
+      objB.test = 'name';
+
+      expect(jasmineUnderTest.matchersUtil.equals(objA, objB)).toBe(false);
     });
   });
 
   describe("contains", function() {
     it("passes when expected is a substring of actual", function() {
-      expect(j$.matchersUtil.contains("ABC", "BC")).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains("ABC", "BC")).toBe(true);
     });
 
     it("fails when expected is a not substring of actual", function() {
-      expect(j$.matchersUtil.contains("ABC", "X")).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.contains("ABC", "X")).toBe(false);
     });
 
     it("passes when expected is an element in an actual array", function() {
-      expect(j$.matchersUtil.contains(['foo', 'bar'], 'foo')).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains(['foo', 'bar'], 'foo')).toBe(true);
     });
 
     it("fails when expected is not an element in an actual array", function() {
-      expect(j$.matchersUtil.contains(['foo', 'bar'], 'baz')).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.contains(['foo', 'bar'], 'baz')).toBe(false);
     });
 
     it("passes with mixed-element arrays", function() {
-      expect(j$.matchersUtil.contains(["foo", {some: "bar"}], "foo")).toBe(true);
-      expect(j$.matchersUtil.contains(["foo", {some: "bar"}], {some: "bar"})).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains(["foo", {some: "bar"}], "foo")).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains(["foo", {some: "bar"}], {some: "bar"})).toBe(true);
     });
 
     it("uses custom equality testers if passed in and actual is an Array", function() {
       var customTester = function(a, b) {return true;};
 
-      expect(j$.matchersUtil.contains([1, 2], 2, [customTester])).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains([1, 2], 2, [customTester])).toBe(true);
     });
 
     it("fails when actual is undefined", function() {
-      expect(j$.matchersUtil.contains(undefined, 'A')).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.contains(undefined, 'A')).toBe(false);
     });
 
     it("fails when actual is null", function() {
-      expect(j$.matchersUtil.contains(null, 'A')).toBe(false);
+      expect(jasmineUnderTest.matchersUtil.contains(null, 'A')).toBe(false);
     });
 
     it("passes with array-like objects", function() {
@@ -214,7 +401,7 @@ describe("matchersUtil", function() {
         capturedArgs = arguments;
       }
       testFunction('foo', 'bar');
-      expect(j$.matchersUtil.contains(capturedArgs, 'bar')).toBe(true);
+      expect(jasmineUnderTest.matchersUtil.contains(capturedArgs, 'bar')).toBe(true);
     });
   });
 
@@ -223,7 +410,7 @@ describe("matchersUtil", function() {
     it("builds an English sentence for a failure case", function() {
       var actual = "foo",
         name = "toBar",
-        message = j$.matchersUtil.buildFailureMessage(name, false, actual);
+        message = jasmineUnderTest.matchersUtil.buildFailureMessage(name, false, actual);
 
       expect(message).toEqual("Expected 'foo' to bar.");
     });
@@ -232,7 +419,7 @@ describe("matchersUtil", function() {
       var actual = "foo",
         name = "toBar",
         isNot = true,
-        message = message = j$.matchersUtil.buildFailureMessage(name, isNot, actual);
+        message = message = jasmineUnderTest.matchersUtil.buildFailureMessage(name, isNot, actual);
 
       expect(message).toEqual("Expected 'foo' not to bar.");
     });
@@ -240,7 +427,7 @@ describe("matchersUtil", function() {
     it("builds an English sentence for an arbitrary array of expected arguments", function() {
       var actual = "foo",
         name = "toBar",
-        message = j$.matchersUtil.buildFailureMessage(name, false, actual, "quux", "corge");
+        message = jasmineUnderTest.matchersUtil.buildFailureMessage(name, false, actual, "quux", "corge");
 
       expect(message).toEqual("Expected 'foo' to bar 'quux', 'corge'.");
     });

spec/core/matchers/toBeCloseToSpec.js

@@ -1,6 +1,6 @@
 describe("toBeCloseTo", function() {
   it("passes when within two decimal places by default", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
+    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
       result;
 
     result = matcher.compare(0, 0);
@@ -11,7 +11,7 @@ describe("toBeCloseTo", function() {
   });
 
   it("fails when not within two decimal places by default", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
+    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
       result;
 
     result = matcher.compare(0, 0.01);
@@ -19,7 +19,7 @@ describe("toBeCloseTo", function() {
   });
 
   it("accepts an optional precision argument", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
+    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
       result;
 
     result = matcher.compare(0, 0.1, 0);
@@ -30,7 +30,7 @@ describe("toBeCloseTo", function() {
   });
 
   it("rounds expected values", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
+    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
       result;
 
     result = matcher.compare(1.23, 1.229);

spec/core/matchers/toBeDefinedSpec.js

@@ -1,6 +1,6 @@
 describe("toBeDefined", function() {
   it("matches for defined values", function() {
-    var matcher = j$.matchers.toBeDefined(),
+    var matcher = jasmineUnderTest.matchers.toBeDefined(),
       result;
 
 
@@ -9,7 +9,7 @@ describe("toBeDefined", function() {
   });
 
   it("fails when matching undefined values", function() {
-    var matcher = j$.matchers.toBeDefined(),
+    var matcher = jasmineUnderTest.matchers.toBeDefined(),
       result;
 
     result = matcher.compare(void 0);

spec/core/matchers/toBeFalsySpec.js

@@ -1,6 +1,6 @@
 describe("toBeFalsy", function() {
   it("passes for 'falsy' values", function() {
-    var matcher = j$.matchers.toBeFalsy(),
+    var matcher = jasmineUnderTest.matchers.toBeFalsy(),
       result;
 
     result = matcher.compare(false);
@@ -20,7 +20,7 @@ describe("toBeFalsy", function() {
   });
 
   it("fails for 'truthy' values", function() {
-    var matcher = j$.matchers.toBeFalsy(),
+    var matcher = jasmineUnderTest.matchers.toBeFalsy(),
       result;
 
     result = matcher.compare(true);

spec/core/matchers/toBeGreaterThanOrEqualSpec.js

@@ -0,0 +1,29 @@
+describe("toBeGreaterThanOrEqual", function() {
+  it("passes when actual >= expected", function() {
+    var matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(),
+      result;
+
+    result = matcher.compare(2, 1);
+    expect(result.pass).toBe(true);
+
+    result = matcher.compare(1, 1);
+    expect(result.pass).toBe(true);
+
+    result = matcher.compare(1.0000001, 1);
+    expect(result.pass).toBe(true);
+
+    result = matcher.compare(1.0, 1.0);
+    expect(result.pass).toBe(true);
+  })
+
+  it("fails when actual < expected", function() {
+    var matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(),
+      result;
+
+    result = matcher.compare(1, 2);
+    expect(result.pass).toBe(false);
+
+    result = matcher.compare(1, 1.0000001);
+    expect(result.pass).toBe(false);
+  })
+});

spec/core/matchers/toBeGreaterThanSpec.js

@@ -1,6 +1,6 @@
 describe("toBeGreaterThan", function() {
   it("passes when actual > expected", function() {
-    var matcher = j$.matchers.toBeGreaterThan(),
+    var matcher = jasmineUnderTest.matchers.toBeGreaterThan(),
       result;
 
     result = matcher.compare(2, 1);
@@ -8,7 +8,7 @@ describe("toBeGreaterThan", function() {
   });
 
   it("fails when actual <= expected", function() {
-    var matcher = j$.matchers.toBeGreaterThan(),
+    var matcher = jasmineUnderTest.matchers.toBeGreaterThan(),
       result;
 
     result = matcher.compare(1, 1);

spec/core/matchers/toBeLessThanOrEqualSpec.js

@@ -0,0 +1,29 @@
+describe("toBeLessThanOrEqual", function() {
+  it("passes when actual <= expected", function() {
+    var matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(),
+      result;
+
+    result = matcher.compare(1, 2);
+    expect(result.pass).toBe(true);
+
+    result = matcher.compare(1, 1);
+    expect(result.pass).toBe(true);
+
+    result = matcher.compare(1, 1.0000001);
+    expect(result.pass).toBe(true);
+    
+    result = matcher.compare(1.0, 1.0);
+    expect(result.pass).toBe(true);
+  });
+
+  it("fails when actual < expected", function() {
+    var matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(),
+      result;
+
+    result = matcher.compare(2, 1);
+    expect(result.pass).toBe(false);
+
+    result = matcher.compare(1.0000001, 1);
+    expect(result.pass).toBe(false);
+  });
+});

spec/core/matchers/toBeLessThanSpec.js

@@ -1,6 +1,6 @@
 describe("toBeLessThan", function() {
   it("passes when actual < expected", function() {
-    var matcher = j$.matchers.toBeLessThan(),
+    var matcher = jasmineUnderTest.matchers.toBeLessThan(),
       result;
 
     result = matcher.compare(1, 2);
@@ -8,7 +8,7 @@ describe("toBeLessThan", function() {
   });
 
   it("fails when actual <= expected", function() {
-    var matcher = j$.matchers.toBeLessThan(),
+    var matcher = jasmineUnderTest.matchers.toBeLessThan(),
       result;
 
     result = matcher.compare(1, 1);

spec/core/matchers/toBeNaNSpec.js

@@ -1,6 +1,6 @@
 describe("toBeNaN", function() {
   it("passes for NaN with a custom .not fail", function() {
-    var matcher = j$.matchers.toBeNaN(),
+    var matcher = jasmineUnderTest.matchers.toBeNaN(),
       result;
 
     result = matcher.compare(Number.NaN);
@@ -9,7 +9,7 @@ describe("toBeNaN", function() {
   });
 
   it("fails for anything not a NaN", function() {
-    var matcher = j$.matchers.toBeNaN(),
+    var matcher = jasmineUnderTest.matchers.toBeNaN(),
       result;
 
     result = matcher.compare(1);
@@ -29,7 +29,7 @@ describe("toBeNaN", function() {
   });
 
   it("has a custom message on failure", function() {
-    var matcher = j$.matchers.toBeNaN(),
+    var matcher = jasmineUnderTest.matchers.toBeNaN(),
       result = matcher.compare(0);
 
     expect(result.message()).toEqual("Expected 0 to be NaN.");

spec/core/matchers/toBeNullSpec.js

@@ -1,6 +1,6 @@
 describe("toBeNull", function() {
   it("passes for null", function() {
-    var matcher = j$.matchers.toBeNull(),
+    var matcher = jasmineUnderTest.matchers.toBeNull(),
       result;
 
     result = matcher.compare(null);
@@ -8,7 +8,7 @@ describe("toBeNull", function() {
   });
 
   it("fails for non-null", function() {
-    var matcher = j$.matchers.toBeNull(),
+    var matcher = jasmineUnderTest.matchers.toBeNull(),
       result;
 
     result = matcher.compare('foo');