Attempt to use selenium runner from source, to fix dependency loop

[#54582902]

.gitignore

@@ -15,5 +15,10 @@ pkg/*
 .sass-cache/*
 src/html/.sass-cache/*
 node_modules/
+*.pyc
 sauce_connect.log
 *.swp
+build/
+*.egg-info/
+dist/*.tar.gz
+nbproject/

.jshintrc

@@ -1,9 +1,9 @@
 {
   "bitwise": true,
   "curly": true,
-  "freeze": true,
   "immed": true,
   "newcap": true,
   "trailing": true,
-  "loopfunc": true
+  "loopfunc": true,
+  "quotmark": "single"
 }

.npmignore

@@ -0,0 +1,21 @@
+dist/
+grunt/
+node_modules
+release_notes/
+spec/
+src/
+Gemfile
+Gemfile.lock
+Rakefile
+jasmine-core.gemspec
+.rspec
+.travis.yml
+.jshintrc
+.gitignore
+*.sh
+Gruntfile.js
+lib/jasmine-core.rb
+lib/jasmine-core/boot/
+lib/jasmine-core/spec
+lib/jasmine-core/version.rb
+lib/jasmine-core/*.py

.travis.yml

@@ -1,6 +1,7 @@
 ---
 script: $TEST_COMMAND
 language: ruby
+cache: bundler
 rvm: 1.9.3
 env:
   global:

CONTRIBUTING.md

@@ -7,6 +7,11 @@ We welcome your contributions - Thanks for helping make Jasmine a better project
 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`)
@@ -95,7 +100,7 @@ Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to te
 
 ...and then visit `http://localhost:8888` to run specs.
 
-Jasmine uses Node.js with a custom runner to test outside of a browser.
+Jasmine uses the [Jasmine NPM package](http://github.com/pivotal/jasmine-npm) to test itself in a Node.js/npm environment.
 
     $ grunt execSpecsInNode
 
@@ -104,7 +109,7 @@ Jasmine uses Node.js with a custom runner to test outside of a browser.
 ## Before Committing or Submitting a Pull Request
 
 1. Ensure all specs are green in browser *and* node
-1. Ensure JSHint is green with `grunt jsHint`
+1. Ensure JSHint is green with `grunt jshint`
 1. Build `jasmine.js` with `grunt buildDistribution` and run all specs again - this ensures that your changes self-test well
 
 ## Submitting a Pull Request

Gemfile

@@ -1,14 +1,9 @@
 source 'https://rubygems.org'
 gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git'
-# gem "jasmine", path: "/Users/pivotal/workspace/jasmine-gem"
-unless ENV["TRAVIS"]
-  group :debug do
-    gem 'debugger'
-  end
-end
+# gem "jasmine", path: "../jasmine-gem"
 
 gemspec
 
-gem "jasmine_selenium_runner", :git => 'https://github.com/jasmine/jasmine_selenium_runner.git'
+gem "jasmine_selenium_runner", :github => 'jasmine/jasmine_selenium_runner'
 
 gem "anchorman"

Gruntfile.js

@@ -10,10 +10,7 @@ module.exports = function(grunt) {
     compress: require('./grunt/config/compress.js')
   });
 
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-compass');
-  grunt.loadNpmTasks('grunt-contrib-compress');
+  require('load-grunt-tasks')(grunt);
 
   grunt.loadTasks('grunt/tasks');
 
@@ -37,12 +34,29 @@ module.exports = function(grunt) {
     ]
   );
 
-
-  var spec = require('./grunt/tasks/spec.js');
-
   grunt.registerTask("execSpecsInNode",
-  "Run Jasmine core specs in Node.js",
-    spec.execSpecsInNode
+    "Run Jasmine core specs in Node.js",
+    function() {
+      var done = this.async(),
+          Jasmine = require('jasmine'),
+          jasmineCore = require('./lib/jasmine-core.js'),
+          jasmine = new Jasmine({jasmineCore: jasmineCore});
+
+      jasmine.loadConfigFile('./spec/support/jasmine.json');
+      jasmine.configureDefaultReporter({
+        onComplete: function(passed) {
+          done(passed);
+        }
+      });
+
+      jasmine.execute();
+    }
   );
 
+  grunt.registerTask("execSpecsInNode:performance",
+    "Run Jasmine performance specs in Node.js",
+    function() {
+      require("shelljs").exec("node_modules/.bin/jasmine JASMINE_CONFIG_PATH=spec/support/jasmine-performance.json");
+    }
+  );
 };

MANIFEST.in

@@ -0,0 +1,5 @@
+recursive-include . *.py
+include lib/jasmine-core/*.js
+include lib/jasmine-core/*.css
+include images/*.png
+include package.json

MIT.LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2011 Pivotal Labs
+Copyright (c) 2008-2014 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,31 +1,65 @@
-<a name="README">[Jasmine](http://pivotal.github.com/jasmine/)</a> [![Build Status](https://travis-ci.org/pivotal/jasmine.png?branch=master)](https://travis-ci.org/pivotal/jasmine) [![Code Climate](https://codeclimate.com/repos/5269970a13d6374b6c01d632/badges/8bc25526da64e02065f4/gpa.png)](https://codeclimate.com/repos/5269970a13d6374b6c01d632/feed)
+<a name="README">[<img src="https://rawgithub.com/pivotal/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)
 
 =======
+
 **A JavaScript Testing Framework**
 
 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).
 
 ## Contributing
 
 Please read the [contributors' guide](https://github.com/pivotal/jasmine/blob/master/CONTRIBUTING.md)
 
+## Installation
+
+To install Jasmine on your local box:
+
+* Clone Jasmine - `git clone https://github.com/pivotal/jasmine.git`
+* 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`
+* 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"> 
+
+    <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)
+
+
+
 ## Support
 
 * Search past discussions: [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js)
-* Send an email to the list: [jasmine-js@googlegroups.com](jasmine-js@googlegroups.com)
+* Send an email to the list: [jasmine-js@googlegroups.com](mailto:jasmine-js@googlegroups.com)
 * View the project backlog at Pivotal Tracker: [http://www.pivotaltracker.com/projects/10606](http://www.pivotaltracker.com/projects/10606)
 * Follow us on Twitter: [@JasmineBDD](http://twitter.com/JasmineBDD)
 
 ## Maintainers
 
-* [Davis W. Frank](mailto:dwfrank@pivotallabs.com), Pivotal Labs
-* [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
-* [Sheel Choksi](mailto:schoksi@pivotallabs.com), Pivotal Labs
+* [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
 
 ### Maintainers Emeritus
 
-* [Christian Williams](mailto:antixian666@gmail.com), Square
+* [Christian Williams](mailto:antixian666@gmail.com), Cloud Foundry
+* Sheel Choksi
 
-Copyright (c) 2008-2013 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2014 Pivotal Labs. This software is licensed under the MIT License.

RELEASE.md

@@ -20,14 +20,6 @@ The current version lives in the file `/package.json`. This file should be set t
 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.
-                 
-### Update the Github Pages (as needed)
-
-___Note: This is going to change right after 2.0___
-
-Github pages have to exist in a branch called `gh-pages` in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks.
-
-If you want to submit changes to this repo and aren't a Pivotal Labs employee, you can fork and work in the `gh-pages` branch. You won't be able to edit the pages in the submodule off of master.
 
 ## Release
 
@@ -36,14 +28,43 @@ When ready to release - specs are all green and the stories are done:
 1. Update the release notes in `release_notes` - use the Anchorman gem to generate the markdown file and edit accordingly
 1. Update the version in `package.json` to a release candidate
 1. Update any links or top-level landing page for the Github Pages
+
+### 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
+
+1. `python setup.py register sdist upload` You will need pypi credentials to upload the egg.
+
+### Release the Ruby gem
+
 1. Copy version to the Ruby gem with `grunt build:copyVersionToGem`
 1. __NOTE__: You will likely need to point to a local jasmine gem in order to run tests locally. _Do not_ push this version of the Gemfile.
 1. __NOTE__: You will likely need to push a new jasmine gem with a dependent version right after this release.
 1. Push these changes to GitHub and verify that this SHA is green
 1. `rake release` - tags the repo with the version, builds the `jasmine-core` gem, pushes the gem to Rubygems.org. In order to release you will have to ensure you have rubygems creds locally.
-1. Visit the [Releases page for Jasmine](https://github.com/pivotal/jasmine/releases), find the tag just pushed. 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. If it is a pre-release, mark it as such.
+
+### Release the NPM
+
+1. `npm adduser` to save your credentials locally
+1. `npm publish .` to publish what's in `package.json`
+
+### Release the docs
+
+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. 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. 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
 
 
 There should be a post to Pivotal Labs blog and a tweet to that link.

Rakefile

@@ -15,3 +15,4 @@ end
 
 task "jasmine:configure" => "jasmine:set_env"
 
+task :default => "jasmine:ci"

grunt/config/concat.js

@@ -39,6 +39,10 @@ module.exports = {
     src: ['lib/jasmine-core/boot/boot.js'],
     dest: 'lib/jasmine-core/boot.js'
   },
+  nodeBoot: {
+    src: ['lib/jasmine-core/boot/node_boot.js'],
+    dest: 'lib/jasmine-core/node_boot.js'
+  },
   console: {
     src: [
       'src/console/requireConsole.js',

grunt/tasks/spec.js

@@ -1,11 +0,0 @@
-var shell = require('shelljs');
-var grunt = require('grunt');
-
-module.exports = {
-  execSpecsInNode: function() {
-    var exit_code = shell.exec("node spec/node_suite.js --color=true").code;
-    if (exit_code !== 0) {
-      grunt.fail.fatal("Specs Failed", exit_code);
-    }
-  }
-};

grunt/templates/SpecRunner.html.jst

@@ -1,23 +1,23 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta charset="utf-8">
   <title>Jasmine Spec Runner v<%= jasmineVersion %></title>
 
   <link rel="shortcut icon" type="image/png" href="lib/jasmine-<%= jasmineVersion %>/jasmine_favicon.png">
-  <link rel="stylesheet" type="text/css" href="lib/jasmine-<%= jasmineVersion %>/jasmine.css">
+  <link rel="stylesheet" href="lib/jasmine-<%= jasmineVersion %>/jasmine.css">
 
-  <script type="text/javascript" src="lib/jasmine-<%= jasmineVersion %>/jasmine.js"></script>
-  <script type="text/javascript" src="lib/jasmine-<%= jasmineVersion %>/jasmine-html.js"></script>
-  <script type="text/javascript" src="lib/jasmine-<%= jasmineVersion %>/boot.js"></script>
+  <script src="lib/jasmine-<%= jasmineVersion %>/jasmine.js"></script>
+  <script src="lib/jasmine-<%= jasmineVersion %>/jasmine-html.js"></script>
+  <script src="lib/jasmine-<%= jasmineVersion %>/boot.js"></script>
 
   <!-- include source files here... -->
-  <script type="text/javascript" src="src/Player.js"></script>
-  <script type="text/javascript" src="src/Song.js"></script>
+  <script src="src/Player.js"></script>
+  <script src="src/Song.js"></script>
 
   <!-- include spec files here... -->
-  <script type="text/javascript" src="spec/SpecHelper.js"></script>
-  <script type="text/javascript" src="spec/PlayerSpec.js"></script>
+  <script src="spec/SpecHelper.js"></script>
+  <script src="spec/PlayerSpec.js"></script>
 
 </head>
 

images/jasmine-horizontal.svg

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="681.96252"
+   height="187.5"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"><path
+         d="M 0,1500 0,0 l 5455.74,0 0,1500 L 0,1500 z"
+         inkscape:connector-curvature="0"
+         id="path20" /></clipPath></defs><g
+     transform="matrix(1.25,0,0,-1.25,0,187.5)"
+     id="g10"><g
+       transform="scale(0.1,0.1)"
+       id="g12"><g
+         id="g14"><g
+           clip-path="url(#clipPath18)"
+           id="g16"><path
+             d="m 1544,599.434 c 0.92,-40.352 25.68,-81.602 71.53,-81.602 27.51,0 47.68,12.832 61.44,35.754 12.83,22.93 12.83,56.852 12.83,82.527 l 0,329.184 -71.52,0 0,104.543 266.83,0 0,-104.543 -70.6,0 0,-344.77 c 0,-58.691 -3.68,-104.531 -44.93,-152.218 -36.68,-42.18 -96.28,-66.02 -153.14,-66.02 -117.37,0 -207.24,77.941 -202.64,197.145 l 130.2,0"
+             inkscape:connector-curvature="0"
+             id="path22"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 2301.4,662.695 c 0,80.703 -66.94,145.813 -147.63,145.813 -83.44,0 -147.63,-68.781 -147.63,-151.301 0,-79.785 66.94,-145.801 145.8,-145.801 84.35,0 149.46,67.852 149.46,151.289 z m -1.83,-181.547 c -35.77,-54.097 -93.53,-78.859 -157.72,-78.859 -140.3,0 -251.24,116.449 -251.24,254.918 0,142.129 113.7,260.41 256.74,260.41 63.27,0 118.29,-29.336 152.22,-82.523 l 0,69.687 175.14,0 0,-104.527 -61.44,0 0,-280.598 61.44,0 0,-104.527 -175.14,0 0,66.019"
+             inkscape:connector-curvature="0"
+             id="path24"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 2622.33,557.258 c 3.67,-44.016 33.01,-73.348 78.86,-73.348 33.93,0 66.93,23.824 66.93,60.504 0,48.606 -45.84,56.856 -83.44,66.941 -85.28,22.004 -178.81,48.606 -178.81,155.879 0,93.536 78.86,147.633 165.98,147.633 44,0 83.43,-9.176 110.94,-44.008 l 0,33.922 82.53,0 0,-132.965 -108.21,0 c -1.83,34.856 -28.42,57.774 -63.26,57.774 -30.26,0 -62.35,-17.422 -62.35,-51.348 0,-45.847 44.93,-55.93 80.69,-64.18 88.02,-20.175 182.47,-47.695 182.47,-157.734 0,-99.027 -83.44,-154.039 -175.13,-154.039 -49.53,0 -94.46,15.582 -126.55,53.18 l 0,-40.34 -85.27,0 0,142.129 114.62,0"
+             inkscape:connector-curvature="0"
+             id="path26"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 2988.18,800.254 -63.26,0 0,104.527 165.05,0 0,-73.355 c 31.18,51.347 78.86,85.277 141.21,85.277 67.85,0 124.71,-41.258 152.21,-102.699 26.6,62.351 92.62,102.699 160.47,102.699 53.19,0 105.46,-22 141.21,-62.351 38.52,-44.938 38.52,-93.532 38.52,-149.457 l 0,-185.239 63.27,0 0,-104.527 -238.42,0 0,104.527 63.28,0 0,157.715 c 0,32.102 0,60.527 -14.67,88.957 -18.34,26.582 -48.61,40.344 -79.77,40.344 -30.26,0 -63.28,-12.844 -82.53,-36.672 -22.93,-29.355 -22.93,-56.863 -22.93,-92.629 l 0,-157.715 63.27,0 0,-104.527 -238.41,0 0,104.527 63.28,0 0,150.383 c 0,29.348 0,66.023 -14.67,91.699 -15.59,29.336 -47.69,44.934 -80.7,44.934 -31.18,0 -57.77,-11.008 -77.94,-35.774 -24.77,-30.253 -26.6,-62.343 -26.6,-99.941 l 0,-151.301 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,280.598"
+             inkscape:connector-curvature="0"
+             id="path28"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 3998.66,951.547 -111.87,0 0,118.293 111.87,0 0,-118.293 z m 0,-431.891 63.27,0 0,-104.527 -239.33,0 0,104.527 64.19,0 0,280.598 -63.27,0 0,104.527 175.14,0 0,-385.125"
+             inkscape:connector-curvature="0"
+             id="path30"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 4159.12,800.254 -63.27,0 0,104.527 175.14,0 0,-69.687 c 29.35,54.101 84.36,80.699 144.87,80.699 53.19,0 105.45,-22.016 141.22,-60.527 40.34,-44.934 41.26,-88.032 41.26,-143.957 l 0,-191.653 63.27,0 0,-104.527 -238.4,0 0,104.527 63.26,0 0,158.637 c 0,30.262 0,61.434 -19.26,88.035 -20.17,26.582 -53.18,39.414 -86.19,39.414 -33.93,0 -68.77,-13.75 -88.94,-41.25 -21.09,-27.5 -21.09,-69.687 -21.09,-102.707 l 0,-142.129 63.26,0 0,-104.527 -238.4,0 0,104.527 63.27,0 0,280.598"
+             inkscape:connector-curvature="0"
+             id="path32"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 5082.48,703.965 c -19.24,70.605 -81.6,115.547 -154.04,115.547 -66.04,0 -129.3,-51.348 -143.05,-115.547 l 297.09,0 z m 85.27,-144.883 c -38.51,-93.523 -129.27,-156.793 -231.05,-156.793 -143.07,0 -257.68,111.871 -257.68,255.836 0,144.883 109.12,261.328 254.91,261.328 67.87,0 135.72,-30.258 183.39,-78.863 48.62,-51.344 68.79,-113.695 68.79,-183.383 l -3.67,-39.434 -396.13,0 c 14.67,-67.863 77.03,-117.363 146.72,-117.363 48.59,0 90.76,18.328 118.28,58.672 l 116.44,0"
+             inkscape:connector-curvature="0"
+             id="path34"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 690.895,850.703 90.75,0 22.543,31.035 0,243.122 -135.829,0 0,-243.141 22.536,-31.016"
+             inkscape:connector-curvature="0"
+             id="path36"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 632.395,742.258 28.039,86.304 -22.551,31.04 -231.223,75.128 -41.976,-129.183 231.257,-75.137 36.454,11.848"
+             inkscape:connector-curvature="0"
+             id="path38"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 717.449,653.105 -73.41,53.36 -36.488,-11.875 -142.903,-196.692 109.883,-79.828 142.918,196.703 0,38.332"
+             inkscape:connector-curvature="0"
+             id="path40"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 828.52,706.465 -73.426,-53.34 0.011,-38.359 L 898.004,418.07 1007.9,497.898 864.973,694.609 828.52,706.465"
+             inkscape:connector-curvature="0"
+             id="path42"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 812.086,828.586 28.055,-86.32 36.484,-11.836 231.225,75.117 -41.97,129.183 -231.239,-75.14 -22.555,-31.004"
+             inkscape:connector-curvature="0"
+             id="path44"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 736.301,1335.88 c -323.047,0 -585.875,-262.78 -585.875,-585.782 0,-323.118 262.828,-585.977 585.875,-585.977 323.019,0 585.809,262.859 585.809,585.977 0,323.002 -262.79,585.782 -585.809,585.782 l 0,0 z m 0,-118.61 c 257.972,0 467.189,-209.13 467.189,-467.172 0,-258.129 -209.217,-467.348 -467.189,-467.348 -258.074,0 -467.254,209.219 -467.254,467.348 0,258.042 209.18,467.172 467.254,467.172"
+             inkscape:connector-curvature="0"
+             id="path46"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 1091.13,619.883 -175.771,57.121 11.629,35.808 175.762,-57.121 -11.62,-35.808"
+             inkscape:connector-curvature="0"
+             id="path48"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="M 866.957,902.074 836.5,924.199 945.121,1073.73 975.586,1051.61 866.957,902.074"
+             inkscape:connector-curvature="0"
+             id="path50"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="M 607.465,903.445 498.855,1052.97 529.32,1075.1 637.93,925.566 607.465,903.445"
+             inkscape:connector-curvature="0"
+             id="path52"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 380.688,622.129 -11.626,35.801 175.758,57.09 11.621,-35.801 -175.753,-57.09"
+             inkscape:connector-curvature="0"
+             id="path54"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m 716.289,376.59 37.6406,0 0,184.816 -37.6406,0 0,-184.816 z"
+             inkscape:connector-curvature="0"
+             id="path56"
+             style="fill:#8a4182;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></svg>

jasmine-core.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name = "jasmine-core"
   s.version = Jasmine::Core::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Rajan Agaskar", "Davis W. Frank", "Christian Williams"]
+  s.authors = ["Rajan Agaskar", "Davis W. Frank", "Gregg Van Hove"]
   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}
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_development_dependency "rake"
   s.add_development_dependency "sauce-connect"
-  s.add_development_dependency "jasmine_selenium_runner"
   s.add_development_dependency "compass"
+  s.add_development_dependency "jasmine_selenium_runner", ">= 0.2.0"
 end

lib/console/console.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2013 Pivotal Labs
+Copyright (c) 2008-2014 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 function getJasmineRequireObj() {
-  if (typeof module !== "undefined" && module.exports) {
+  if (typeof module !== 'undefined' && module.exports) {
     return exports;
   } else {
     window.jasmineRequire = window.jasmineRequire || {};
@@ -54,13 +54,16 @@ getJasmineRequireObj().ConsoleReporter = function() {
         red: '\x1B[31m',
         yellow: '\x1B[33m',
         none: '\x1B[0m'
-      };
+      },
+      failedSuites = [];
+
+    print('ConsoleReporter is deprecated and will be removed in a future version.');
 
     this.jasmineStarted = function() {
       specCount = 0;
       failureCount = 0;
       pendingCount = 0;
-      print("Started");
+      print('Started');
       printNewline();
       timer.start();
     };
@@ -71,50 +74,65 @@ getJasmineRequireObj().ConsoleReporter = function() {
         specFailureDetails(failedSpecs[i]);
       }
 
-      printNewline();
-      var specCounts = specCount + " " + plural("spec", specCount) + ", " +
-        failureCount + " " + plural("failure", failureCount);
+      if(specCount > 0) {
+        printNewline();
 
-      if (pendingCount) {
-        specCounts += ", " + pendingCount + " pending " + plural("spec", pendingCount);
+        var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' +
+          failureCount + ' ' + plural('failure', failureCount);
+
+        if (pendingCount) {
+          specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount);
+        }
+
+        print(specCounts);
+      } else {
+        print('No specs found');
       }
 
-      print(specCounts);
-
       printNewline();
       var seconds = timer.elapsed() / 1000;
-      print("Finished in " + seconds + " " + plural("second", seconds));
-
+      print('Finished in ' + seconds + ' ' + plural('second', seconds));
       printNewline();
 
+      for(i = 0; i < failedSuites.length; i++) {
+        suiteFailureDetails(failedSuites[i]);
+      }
+
       onComplete(failureCount === 0);
     };
 
     this.specDone = function(result) {
       specCount++;
 
-      if (result.status == "pending") {
+      if (result.status == 'pending') {
         pendingCount++;
-        print(colored("yellow", "*"));
+        print(colored('yellow', '*'));
         return;
       }
 
-      if (result.status == "passed") {
-        print(colored("green", '.'));
+      if (result.status == 'passed') {
+        print(colored('green', '.'));
         return;
       }
 
-      if (result.status == "failed") {
+      if (result.status == 'failed') {
         failureCount++;
         failedSpecs.push(result);
-        print(colored("red", 'F'));
+        print(colored('red', 'F'));
+      }
+    };
+
+    this.suiteDone = function(result) {
+      if (result.failedExpectations && result.failedExpectations.length > 0) {
+        failureCount++;
+        failedSuites.push(result);
       }
     };
 
     return this;
 
     function printNewline() {
-      print("\n");
+      print('\n');
     }
 
     function colored(color, str) {
@@ -122,7 +140,7 @@ getJasmineRequireObj().ConsoleReporter = function() {
     }
 
     function plural(str, count) {
-      return count == 1 ? str : str + "s";
+      return count == 1 ? str : str + 's';
     }
 
     function repeat(thing, times) {
@@ -134,12 +152,12 @@ getJasmineRequireObj().ConsoleReporter = function() {
     }
 
     function indent(str, spaces) {
-      var lines = (str || '').split("\n");
+      var lines = (str || '').split('\n');
       var newArr = [];
       for (var i = 0; i < lines.length; i++) {
-        newArr.push(repeat(" ", spaces).join("") + lines[i]);
+        newArr.push(repeat(' ', spaces).join('') + lines[i]);
       }
-      return newArr.join("\n");
+      return newArr.join('\n');
     }
 
     function specFailureDetails(result) {
@@ -149,11 +167,23 @@ getJasmineRequireObj().ConsoleReporter = function() {
       for (var i = 0; i < result.failedExpectations.length; i++) {
         var failedExpectation = result.failedExpectations[i];
         printNewline();
+        print(indent(failedExpectation.message, 2));
         print(indent(failedExpectation.stack, 2));
       }
 
       printNewline();
     }
+
+    function suiteFailureDetails(result) {
+      for (var i = 0; i < result.failedExpectations.length; i++) {
+        printNewline();
+        print(colored('red', 'An error was thrown in an afterAll'));
+        printNewline();
+        print(colored('red', 'AfterAll ' + result.failedExpectations[i].message));
+
+      }
+      printNewline();
+    }
   }
 
   return ConsoleReporter;

lib/jasmine-core.js

@@ -0,0 +1,37 @@
+module.exports = require("./jasmine-core/jasmine.js");
+module.exports.boot = require('./jasmine-core/node_boot.js');
+
+var path = require('path'),
+    fs = require('fs');
+
+var rootPath = path.join(__dirname, "jasmine-core"),
+    bootFiles = ['boot.js'],
+    nodeBootFiles = ['node_boot.js'],
+    cssFiles = [],
+    jsFiles = [],
+    jsFilesToSkip = ['jasmine.js'].concat(bootFiles, nodeBootFiles);
+
+fs.readdirSync(rootPath).forEach(function(file) {
+  if(fs.statSync(path.join(rootPath, file)).isFile()) {
+    switch(path.extname(file)) {
+      case '.css':
+        cssFiles.push(file);
+      break;
+      case '.js':
+        if (jsFilesToSkip.indexOf(file) < 0) {
+        jsFiles.push(file);
+      }
+      break;
+    }
+  }
+});
+
+module.exports.files = {
+  path: rootPath,
+  bootDir: rootPath,
+  bootFiles: bootFiles,
+  nodeBootFiles: nodeBootFiles,
+  cssFiles: cssFiles,
+  jsFiles: ['jasmine.js'].concat(jsFiles),
+  imagesDir: path.join(__dirname, '../images')
+};

lib/jasmine-core.rb

@@ -6,7 +6,7 @@ module Jasmine
       end
 
       def js_files
-        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq - boot_files
+        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq - boot_files - node_boot_files
       end
 
       SPEC_TYPES = ["core", "html", "node"]
@@ -27,8 +27,12 @@ module Jasmine
         ["boot.js"]
       end
 
+      def node_boot_files
+        ["node_boot.js"]
+      end
+
       def boot_dir
-        File.join(path, 'boot')
+        path
       end
 
       def spec_files(type)

lib/jasmine-core/__init__.py

@@ -0,0 +1 @@
+from .core import Core

lib/jasmine-core/boot.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2013 Pivotal Labs
+Copyright (c) 2008-2014 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 /**
- Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
+ Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
 
  If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms.
 
@@ -54,47 +54,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    *
    * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
    */
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    jsApiReporter: new jasmine.JsApiReporter({
-      timer: new jasmine.Timer()
-    })
-  };
+  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`.
@@ -105,27 +65,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     extend(window, jasmineInterface);
   }
 
-  /**
-   * Expose the interface for adding custom equality testers.
-   */
-  jasmine.addCustomEqualityTester = function(tester) {
-    env.addCustomEqualityTester(tester);
-  };
-
-  /**
-   * Expose the interface for adding custom expectation matchers
-   */
-  jasmine.addMatchers = function(matchers) {
-    return env.addMatchers(matchers);
-  };
-
-  /**
-   * Expose the mock interface for the JavaScript timeout functions
-   */
-  jasmine.clock = function() {
-    return env.clock;
-  };
-
   /**
    * ## Runner Parameters
    *

lib/jasmine-core/boot/boot.js

@@ -1,5 +1,5 @@
 /**
- Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
+ Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
 
  If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms.
 
@@ -32,47 +32,7 @@
    *
    * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
    */
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    jsApiReporter: new jasmine.JsApiReporter({
-      timer: new jasmine.Timer()
-    })
-  };
+  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`.
@@ -83,27 +43,6 @@
     extend(window, jasmineInterface);
   }
 
-  /**
-   * Expose the interface for adding custom equality testers.
-   */
-  jasmine.addCustomEqualityTester = function(tester) {
-    env.addCustomEqualityTester(tester);
-  };
-
-  /**
-   * Expose the interface for adding custom expectation matchers
-   */
-  jasmine.addMatchers = function(matchers) {
-    return env.addMatchers(matchers);
-  };
-
-  /**
-   * Expose the mock interface for the JavaScript timeout functions
-   */
-  jasmine.clock = function() {
-    return env.clock;
-  };
-
   /**
    * ## Runner Parameters
    *

lib/jasmine-core/boot/node_boot.js

@@ -0,0 +1,19 @@
+module.exports = function(jasmineRequire) {
+  var jasmine = jasmineRequire.core(jasmineRequire);
+
+  var consoleFns = require('../console/console.js');
+  consoleFns.console(consoleFns, jasmine);
+
+  var env = jasmine.getEnv();
+
+  var jasmineInterface = jasmineRequire.interface(jasmine, env);
+
+  extend(global, jasmineInterface);
+
+  function extend(destination, source) {
+    for (var property in source) destination[property] = source[property];
+    return destination;
+  }
+
+  return jasmine;
+};

lib/jasmine-core/core.py

@@ -0,0 +1,60 @@
+import pkg_resources
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
+class Core(object):
+    @classmethod
+    def js_package(cls):
+        return __package__
+
+    @classmethod
+    def css_package(cls):
+        return __package__
+
+    @classmethod
+    def image_package(cls):
+        return __package__ + ".images"
+
+    @classmethod
+    def js_files(cls):
+        js_files = sorted(list(filter(lambda x: '.js' in x, pkg_resources.resource_listdir(cls.js_package(), '.'))))
+
+        # jasmine.js needs to be first
+        js_files.insert(0, 'jasmine.js')
+
+        # boot needs to be last
+        js_files.remove('boot.js')
+        js_files.append('boot.js')
+
+        return cls._uniq(js_files)
+
+    @classmethod
+    def css_files(cls):
+        return cls._uniq(sorted(filter(lambda x: '.css' in x, pkg_resources.resource_listdir(cls.css_package(), '.'))))
+
+    @classmethod
+    def favicon(cls):
+        return 'jasmine_favicon.png'
+
+    @classmethod
+    def _uniq(self, items, idfun=None):
+        # order preserving
+
+        if idfun is None:
+            def idfun(x): return x
+        seen = {}
+        result = []
+        for item in items:
+            marker = idfun(item)
+            # in old Python versions:
+            # if seen.has_key(marker)
+            # but in new ones:
+            if marker in seen:
+                continue
+
+            seen[marker] = 1
+            result.append(item)
+        return result

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

@@ -0,0 +1,60 @@
+describe("Player", function() {
+  var Player = require('../src/Player.js');
+  var Song = require('../src/Song.js');
+  var player;
+  var song;
+
+  beforeEach(function() {
+    player = new Player();
+    song = new Song();
+  });
+
+  it("should be able to play a Song", function() {
+    player.play(song);
+    expect(player.currentlyPlayingSong).toEqual(song);
+
+    //demonstrates use of custom matcher
+    expect(player).toBePlaying(song);
+  });
+
+  describe("when song has been paused", function() {
+    beforeEach(function() {
+      player.play(song);
+      player.pause();
+    });
+
+    it("should indicate that the song is currently paused", function() {
+      expect(player.isPlaying).toBeFalsy();
+
+      // demonstrates use of 'not' with a custom matcher
+      expect(player).not.toBePlaying(song);
+    });
+
+    it("should be possible to resume", function() {
+      player.resume();
+      expect(player.isPlaying).toBeTruthy();
+      expect(player.currentlyPlayingSong).toEqual(song);
+    });
+  });
+
+  // demonstrates use of spies to intercept and test method calls
+  it("tells the current song if the user has made it a favorite", function() {
+    spyOn(song, 'persistFavoriteStatus');
+
+    player.play(song);
+    player.makeFavorite();
+
+    expect(song.persistFavoriteStatus).toHaveBeenCalledWith(true);
+  });
+
+  //demonstrates use of expected exceptions
+  describe("#resume", function() {
+    it("should throw an exception if song is already playing", function() {
+      player.play(song);
+
+      expect(function() {
+        player.resume();
+      }).toThrowError("song is already playing");
+    });
+  });
+});

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

@@ -0,0 +1,15 @@
+beforeEach(function () {
+  jasmine.addMatchers({
+    toBePlaying: function () {
+      return {
+        compare: function (actual, expected) {
+          var player = actual;
+
+          return {
+            pass: player.currentlyPlayingSong === expected && player.isPlaying
+          }
+        }
+      };
+    }
+  });
+});

lib/jasmine-core/example/node_example/src/Player.js

@@ -0,0 +1,24 @@
+function Player() {
+}
+Player.prototype.play = function(song) {
+  this.currentlyPlayingSong = song;
+  this.isPlaying = true;
+};
+
+Player.prototype.pause = function() {
+  this.isPlaying = false;
+};
+
+Player.prototype.resume = function() {
+  if (this.isPlaying) {
+    throw new Error("song is already playing");
+  }
+
+  this.isPlaying = true;
+};
+
+Player.prototype.makeFavorite = function() {
+  this.currentlyPlayingSong.persistFavoriteStatus(true);
+};
+
+module.exports = Player;

lib/jasmine-core/example/node_example/src/Song.js

@@ -0,0 +1,9 @@
+function Song() {
+}
+
+Song.prototype.persistFavoriteStatus = function(value) {
+  // something complicated
+  throw new Error("not yet implemented");
+};
+
+module.exports = Song;

lib/jasmine-core/jasmine-html.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2013 Pivotal Labs
+Copyright (c) 2008-2014 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -46,23 +46,25 @@ jasmineRequire.HtmlReporter = function(j$) {
       failureCount = 0,
       pendingSpecCount = 0,
       htmlReporterMain,
-      symbols;
+      symbols,
+      failedSuites = [];
 
     this.initialize = function() {
-      htmlReporterMain = createDom("div", {className: "html-reporter"},
-        createDom("div", {className: "banner"},
-          createDom("span", {className: "title"}, "Jasmine"),
-          createDom("span", {className: "version"}, j$.version)
+      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("ul", {className: "symbol-summary"}),
-        createDom("div", {className: "alert"}),
-        createDom("div", {className: "results"},
-          createDom("div", {className: "failures"})
+        createDom('ul', {className: 'symbol-summary'}),
+        createDom('div', {className: 'alert'}),
+        createDom('div', {className: 'results'},
+          createDom('div', {className: 'failures'})
         )
       );
       getContainer().appendChild(htmlReporterMain);
 
-      symbols = find(".symbol-summary");
+      symbols = find('.symbol-summary');
     };
 
     var totalSpecsDefined;
@@ -71,17 +73,21 @@ jasmineRequire.HtmlReporter = function(j$) {
       timer.start();
     };
 
-    var summary = createDom("div", {className: "summary"});
+    var summary = createDom('div', {className: 'summary'});
 
-    var topResults = new j$.ResultsNode({}, "", null),
+    var topResults = new j$.ResultsNode({}, '', null),
       currentParent = topResults;
 
     this.suiteStarted = function(result) {
-      currentParent.addChild(result, "suite");
+      currentParent.addChild(result, 'suite');
       currentParent = currentParent.last();
     };
 
     this.suiteDone = function(result) {
+      if (result.status == 'failed') {
+        failedSuites.push(result);
+      }
+
       if (currentParent == topResults) {
         return;
       }
@@ -90,82 +96,103 @@ jasmineRequire.HtmlReporter = function(j$) {
     };
 
     this.specStarted = function(result) {
-      currentParent.addChild(result, "spec");
+      currentParent.addChild(result, 'spec');
     };
 
     var failures = [];
     this.specDone = function(result) {
-      if (result.status != "disabled") {
+      if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') {
+        console.error('Spec \'' + result.fullName + '\' has no expectations.');
+      }
+
+      if (result.status != 'disabled') {
         specsExecuted++;
       }
 
-      symbols.appendChild(createDom("li", {
-          className: result.status,
-          id: "spec_" + result.id,
+      symbols.appendChild(createDom('li', {
+          className: noExpectations(result) ? 'empty' : result.status,
+          id: 'spec_' + result.id,
           title: result.fullName
         }
       ));
 
-      if (result.status == "failed") {
+      if (result.status == 'failed') {
         failureCount++;
 
         var failure =
-          createDom("div", {className: "spec-detail failed"},
-            createDom("div", {className: "description"},
-              createDom("a", {title: result.fullName, href: specHref(result)}, result.fullName)
+          createDom('div', {className: 'spec-detail failed'},
+            createDom('div', {className: 'description'},
+              createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName)
             ),
-            createDom("div", {className: "messages"})
+            createDom('div', {className: '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: 'result-message'}, expectation.message));
+          messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack));
         }
 
         failures.push(failure);
       }
 
-      if (result.status == "pending") {
+      if (result.status == 'pending') {
         pendingSpecCount++;
       }
     };
 
     this.jasmineDone = function() {
-      var banner = find(".banner");
-      banner.appendChild(createDom("span", {className: "duration"}, "finished in " + timer.elapsed() / 1000 + "s"));
+      var banner = find('.banner');
+      banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));
 
-      var alert = find(".alert");
+      var alert = find('.alert');
 
-      alert.appendChild(createDom("span", { className: "exceptions" },
-        createDom("label", { className: "label", 'for': "raise-exceptions" }, "raise exceptions"),
-        createDom("input", {
-          className: "raise",
-          id: "raise-exceptions",
-          type: "checkbox"
+      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("input");
+      var checkbox = find('#raise-exceptions');
 
       checkbox.checked = !env.catchingExceptions();
       checkbox.onclick = onRaiseExceptionsClick;
 
       if (specsExecuted < totalSpecsDefined) {
-        var skippedMessage = "Ran " + specsExecuted + " of " + totalSpecsDefined + " specs - run all";
+        var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
         alert.appendChild(
-          createDom("span", {className: "bar skipped"},
-            createDom("a", {href: "?", title: "Run all specs"}, skippedMessage)
+          createDom('span', {className: 'bar skipped'},
+            createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage)
           )
         );
       }
-      var statusBarMessage = "" + pluralize("spec", specsExecuted) + ", " + pluralize("failure", failureCount);
-      if (pendingSpecCount) { statusBarMessage += ", " + pluralize("pending spec", pendingSpecCount); }
+      var statusBarMessage = '';
+      var statusBarClassName = 'bar ';
 
-      var statusBarClassName = "bar " + ((failureCount > 0) ? "failed" : "passed");
-      alert.appendChild(createDom("span", {className: statusBarClassName}, statusBarMessage));
+      if (totalSpecsDefined > 0) {
+        statusBarMessage += pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount);
+        if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); }
+        statusBarClassName += (failureCount > 0) ? 'failed' : 'passed';
+      } else {
+        statusBarClassName += 'skipped';
+        statusBarMessage += 'No specs found';
+      }
 
-      var results = find(".results");
+      alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage));
+
+      for(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));
+        }
+      }
+
+      var results = find('.results');
       results.appendChild(summary);
 
       summaryList(topResults, summary);
@@ -174,27 +201,31 @@ jasmineRequire.HtmlReporter = function(j$) {
         var specListNode;
         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"},
-                createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description)
+          if (resultNode.type == 'suite') {
+            var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id},
+              createDom('li', {className: 'suite-detail'},
+                createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description)
               )
             );
 
             summaryList(resultNode, suiteListNode);
             domParent.appendChild(suiteListNode);
           }
-          if (resultNode.type == "spec") {
-            if (domParent.getAttribute("class") != "specs") {
-              specListNode = createDom("ul", {className: "specs"});
+          if (resultNode.type == 'spec') {
+            if (domParent.getAttribute('class') != 'specs') {
+              specListNode = createDom('ul', {className: 'specs'});
               domParent.appendChild(specListNode);
             }
+            var specDescription = resultNode.result.description;
+            if(noExpectations(resultNode.result)) {
+              specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription;
+            }
             specListNode.appendChild(
-              createDom("li", {
+              createDom('li', {
                   className: resultNode.result.status,
-                  id: "spec-" + resultNode.result.id
+                  id: 'spec-' + resultNode.result.id
                 },
-                createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description)
+                createDom('a', {href: specHref(resultNode.result)}, specDescription)
               )
             );
           }
@@ -203,24 +234,24 @@ jasmineRequire.HtmlReporter = function(j$) {
 
       if (failures.length) {
         alert.appendChild(
-          createDom('span', {className: "menu bar spec-list"},
-            createDom("span", {}, "Spec List | "),
-            createDom('a', {className: "failures-menu", href: "#"}, "Failures")));
+          createDom('span', {className: 'menu bar spec-list'},
+            createDom('span', {}, 'Spec List | '),
+            createDom('a', {className: 'failures-menu', href: '#'}, 'Failures')));
         alert.appendChild(
-          createDom('span', {className: "menu bar failure-list"},
-            createDom('a', {className: "spec-list-menu", href: "#"}, "Spec List"),
-            createDom("span", {}, " | Failures ")));
+          createDom('span', {className: 'menu bar failure-list'},
+            createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'),
+            createDom('span', {}, ' | Failures ')));
 
-        find(".failures-menu").onclick = function() {
+        find('.failures-menu').onclick = function() {
           setMenuModeTo('failure-list');
         };
-        find(".spec-list-menu").onclick = function() {
+        find('.spec-list-menu').onclick = function() {
           setMenuModeTo('spec-list');
         };
 
         setMenuModeTo('failure-list');
 
-        var failureNode = find(".failures");
+        var failureNode = find('.failures');
         for (var i = 0; i < failures.length; i++) {
           failureNode.appendChild(failures[i]);
         }
@@ -230,7 +261,16 @@ jasmineRequire.HtmlReporter = function(j$) {
     return this;
 
     function find(selector) {
-      return getContainer().querySelector(selector);
+      return getContainer().querySelector('.jasmine_html-reporter ' + selector);
+    }
+
+    function clearPrior() {
+      // return the reporter
+      var oldReporter = find('');
+      
+      if(oldReporter) {
+        getContainer().removeChild(oldReporter);
+      }
     }
 
     function createDom(type, attrs, childrenVarArgs) {
@@ -249,7 +289,7 @@ jasmineRequire.HtmlReporter = function(j$) {
       }
 
       for (var attr in attrs) {
-        if (attr == "className") {
+        if (attr == 'className') {
           el[attr] = attrs[attr];
         } else {
           el.setAttribute(attr, attrs[attr]);
@@ -260,17 +300,22 @@ jasmineRequire.HtmlReporter = function(j$) {
     }
 
     function pluralize(singular, count) {
-      var word = (count == 1 ? singular : singular + "s");
+      var word = (count == 1 ? singular : singular + 's');
 
-      return "" + count + " " + word;
+      return '' + count + ' ' + word;
     }
 
     function specHref(result) {
-      return "?spec=" + encodeURIComponent(result.fullName);
+      return '?spec=' + encodeURIComponent(result.fullName);
     }
 
     function setMenuModeTo(mode) {
-      htmlReporterMain.setAttribute("class", "html-reporter " + mode);
+      htmlReporterMain.setAttribute('class', 'jasmine_html-reporter ' + mode);
+    }
+
+    function noExpectations(result) {
+      return (result.failedExpectations.length + result.passedExpectations.length) === 0 &&
+        result.status === 'passed';
     }
   }
 
@@ -279,7 +324,7 @@ jasmineRequire.HtmlReporter = function(j$) {
 
 jasmineRequire.HtmlSpecFilter = function() {
   function HtmlSpecFilter(options) {
-    var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
     var filterPattern = new RegExp(filterString);
 
     this.matches = function(specName) {
@@ -328,9 +373,9 @@ jasmineRequire.QueryString = function() {
     function toQueryString(paramMap) {
       var qStrPairs = [];
       for (var prop in paramMap) {
-        qStrPairs.push(encodeURIComponent(prop) + "=" + encodeURIComponent(paramMap[prop]));
+        qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop]));
       }
-      return "?" + qStrPairs.join('&');
+      return '?' + qStrPairs.join('&');
     }
 
     function queryStringToParamMap() {
@@ -343,7 +388,7 @@ jasmineRequire.QueryString = function() {
         for (var i = 0; i < params.length; i++) {
           var p = params[i].split('=');
           var value = decodeURIComponent(p[1]);
-          if (value === "true" || value === "false") {
+          if (value === 'true' || value === 'false') {
             value = JSON.parse(value);
           }
           paramMap[decodeURIComponent(p[0])] = value;

lib/jasmine-core/json2.js

@@ -1,6 +1,6 @@
 /*
-    http://www.JSON.org/json2.js
-    2009-08-17
+    json2.js
+    2014-02-04
 
     Public Domain.
 
@@ -8,6 +8,14 @@
 
     See http://www.JSON.org/js.html
 
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
     This file creates a global JSON object containing two methods: stringify
     and parse.
 
@@ -136,15 +144,9 @@
 
     This is a reference implementation. You are free to copy, modify, or
     redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
 */
 
-/*jslint evil: true */
+/*jslint evil: true, regexp: true */
 
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
@@ -153,16 +155,16 @@
     test, toJSON, toString, valueOf
 */
 
-"use strict";
 
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
-if (!this.JSON) {
-    this.JSON = {};
+if (typeof JSON !== 'object') {
+    JSON = {};
 }
 
 (function () {
+    'use strict';
 
     function f(n) {
         // Format integers to have at least two digits.
@@ -171,37 +173,30 @@ if (!this.JSON) {
 
     if (typeof Date.prototype.toJSON !== 'function') {
 
-        Date.prototype.toJSON = function (key) {
+        Date.prototype.toJSON = function () {
 
-            return isFinite(this.valueOf()) ?
-                   this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z' : null;
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
         };
 
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function () {
+                return this.valueOf();
+            };
     }
 
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+    var cx,
+        escapable,
         gap,
         indent,
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        },
+        meta,
         rep;
 
 
@@ -213,17 +208,17 @@ if (!this.JSON) {
 // sequences.
 
         escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
     }
 
 
     function str(key, holder) {
+
 // Produce a string from holder[key].
 
         var i,          // The loop counter.
@@ -301,11 +296,11 @@ if (!this.JSON) {
 // Join all of the elements together, separated with commas, and wrap them in
 // brackets.
 
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
                 gap = mind;
                 return v;
             }
@@ -315,8 +310,8 @@ if (!this.JSON) {
             if (rep && typeof rep === 'object') {
                 length = rep.length;
                 for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -328,7 +323,7 @@ if (!this.JSON) {
 // Otherwise, iterate through all of the keys in the object.
 
                 for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -340,9 +335,11 @@ if (!this.JSON) {
 // Join all of the member texts together, separated with commas,
 // and wrap them in braces.
 
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
             gap = mind;
             return v;
         }
@@ -351,7 +348,18 @@ if (!this.JSON) {
 // If the JSON object does not yet have a stringify method, give it one.
 
     if (typeof JSON.stringify !== 'function') {
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        };
         JSON.stringify = function (value, replacer, space) {
+
 // The stringify method takes a value and an optional replacer, and an optional
 // space parameter, and returns a JSON text. The replacer can be a function
 // that can replace values, or an array of strings that will select the keys.
@@ -382,7 +390,7 @@ if (!this.JSON) {
             rep = replacer;
             if (replacer && typeof replacer !== 'function' &&
                     (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
+                    typeof replacer.length !== 'number')) {
                 throw new Error('JSON.stringify');
             }
 
@@ -397,6 +405,7 @@ if (!this.JSON) {
 // If the JSON object does not yet have a parse method, give it one.
 
     if (typeof JSON.parse !== 'function') {
+        cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
         JSON.parse = function (text, reviver) {
 
 // The parse method takes a text and an optional reviver function, and returns
@@ -412,7 +421,7 @@ if (!this.JSON) {
                 var k, v, value = holder[key];
                 if (value && typeof value === 'object') {
                     for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
                             v = walk(value, k);
                             if (v !== undefined) {
                                 value[k] = v;
@@ -430,6 +439,7 @@ if (!this.JSON) {
 // Unicode characters with escape sequences. JavaScript handles many characters
 // incorrectly, either silently deleting them, or treating them as line endings.
 
+            text = String(text);
             cx.lastIndex = 0;
             if (cx.test(text)) {
                 text = text.replace(cx, function (a) {
@@ -451,10 +461,10 @@ if (!this.JSON) {
 // we look to see that the remaining characters are only whitespace or ']' or
 // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
 
-            if (/^[\],:{}\s]*$/.
-test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 
 // In the third stage we use the eval function to compile the text into a
 // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
@@ -466,8 +476,9 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 // In the optional fourth stage, we recursively walk the new structure, passing
 // each name/value pair to a reviver function for possible transformation.
 
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
             }
 
 // If the text is not JSON parseable, then a SyntaxError is thrown.

lib/jasmine-core/node_boot.js

@@ -0,0 +1,41 @@
+/*
+Copyright (c) 2008-2014 Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+module.exports = function(jasmineRequire) {
+  var jasmine = jasmineRequire.core(jasmineRequire);
+
+  var consoleFns = require('../console/console.js');
+  consoleFns.console(consoleFns, jasmine);
+
+  var env = jasmine.getEnv();
+
+  var jasmineInterface = jasmineRequire.interface(jasmine, env);
+
+  extend(global, jasmineInterface);
+
+  function extend(destination, source) {
+    for (var property in source) destination[property] = source[property];
+    return destination;
+  }
+
+  return jasmine;
+};

lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

package.json

@@ -1,17 +1,23 @@
 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/pivotal/jasmine.git"
   },
+  "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"
+    "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"
   }
 }

release_notes/1.3.0.md

@@ -0,0 +1,22 @@
+# Jasmine Core 1.3.0 Release Notes
+
+## Summary
+This version was a very incremental release that merged in some pull requests for bug fixes.
+
+## Features
+
+* HTML Runner exposes UI to not swallow Exceptions, instead raising as soon as thrown
+* Migrated homepage content to Wiki
+* Made a far more useful [tutorial page](http://pivotal.github.com/jasmine)
+* Added a `toBeNaN` matcher
+
+## Fixes
+
+* Better detection of in-browser vs. not
+* `afterEach` functions will run now even when there is a timeout
+* `toBeCloseTo` matcher is more accurate
+* More explicit matcher messages for spies
+* Better equality comparisons for regular expressions
+* Improvements to the Pretty Printer: controllable recursion depth, don't include inherited properties
+* Fix where `for` was being used as a property on an object (failed on IE)
+

release_notes/1.3.1.md

@@ -0,0 +1,12 @@
+# Jasmine Core 1.3.1 Release Notes
+
+## Summary
+
+This release is for browser compatibility fixes
+
+## Changes
+
+### Features
+
+Fixing test runner failures in IE 6/7/8
+

release_notes/2.0.1.md

@@ -0,0 +1,70 @@
+# Jasmine Core 2.0.1 Release Notes
+
+## Summary
+
+This release is for small bug fixes and enhancements ahead of a real-soon-now 2.1.
+
+## Changes
+
+### Features
+
+* NodeJS is now supported with a jasmine-core npm
+* [Support browsers that don't supply a `Date.now()` by having a `mockDate` object](http://www.pivotaltracker.com/story/66606132) - Closes #361
+* [Show message if no specs where loaded](http://www.pivotaltracker.com/story/12784235)
+* When using `jasmine.any`, the `class` will now be included in the error message
+* Reporters now receive the number of passed expectations in a spec
+* Use default failure message for `toBeNaN`
+* Use the latest `jasmine_selenium_runner` so we use the fix for printing objects with cycles
+* Add jasmine logo image to HTML runner
+* Stop Jasmine's CSS affecting the style of the body tag - Closes #600
+* Standardized location of the standalone distributions - they now live in the repo in `/dist` as well as on the Releases page
+
+### Bugs
+
+* Don't allow calling the same done callback multiple times - Fixes #523
+* [Remove 'empty' as an option as a spec result](http://www.pivotaltracker.com/story/73741032) as this was a breaking change
+    * Instead, we determine if a spec has no expectations using the added
+key of `passedExpectations` in combination of the `failedExpectations`
+to determine that there a spec is 'empty'
+* Fix build in IE8 (IE8 doesn't support `Object.freeze`)
+* Fix `ObjectContaining` to match recursively
+
+### Documentation
+
+* Update release doc to use GitHub releases
+* Add installation instructions to README - Merges #621
+* Add Ruby Gem and Python Egg to docs
+* Add detailed steps on how to contribute - Merges #580 from @pablofiu
+
+## Pull Requests and Issues
+
+* Contains is explicitly false if actual is `undefined` or `null` - Fixes #627
+* namespace `html-reporter` -> `jasmine_html-reporter` - Fixes #600
+* Throw a more specific error when `expect` is used without a `currentSpec` - Fixes #602
+* Reduced size of logo with PNG Gauntlet - Merges #588
+* HTML Reporter resets previous DOM when re-initialized -  Merges #594 from @plukevdh
+* Narrow down raise exceptions query selector; Finding by any input tag is a little bit broad - Closes #605
+* Pass through custom equality testers in toHaveBeenCalledWith - Fixes #536
+* Fix outdated copyright year (update to 2014) - Merges #550 from @slothmonster
+* [Add package.json to Python egg to get correct version number](http://www.pivotaltracker.com/story/67556148) - Fixes #551
+* Allow users to set the maximum length of array that the pretty-printer
+will print out - Fixes #323 @mikemoraned and #374 @futuraprime
+* `matchersUtil.equals()` does not expect a matcher as its first argument,
+so send the "actual" value first and the "expected" value second. - Merges #538 from @cbandy
+* Add single quote check to `jshint` and fix src files for that - Closes #522
+* Remove an `eval` in order to support running jasmine within CSP - Closes #503
+* Allow matcher custom failure messages to be a function - Closes #520
+* More color blind friendly CSS from @dleppik - Closes #463 & #509
+* Use `load-grunt-tasks` Merges #521 from @robinboehm
+* Special case printing `-0` - Closes #496
+* Allow stub or spy Date object safely using a closure to get a clean copy - Closes #506
+* [Use `\d7` instead of plain 'x' for more square appearance](http://www.pivotaltracker.com/story/48434179)
+* Better support in pretty printer when an object has null prototype - Fixes #500
+* Update link at top of README to improve access to Jasmine 2.0 docs - Merges #486 from @nextmat
+* Force query selector to seek within the html-reporter element - Merges #479 from @shprink
+* Netbeans files are in gitignore - Merges #478 from @shprink
+
+
+------
+
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_

release_notes/2.0.2.md

@@ -0,0 +1,25 @@
+# Release Notes
+
+## Summary
+
+## Changes
+
+* keep the files for running in a webpage around in the npm package
+* Expose files and paths necessary to embed jasmine in an html page for nodejs
+* Pull out the building of the jasmine interface so node and web both get the same one.
+* Show a dot with color of pending spec when no expectations
+* Console reporter prints out failed expectation's message
+
+### Bugs
+
+* Allow mocked Date constructor to be called with a subset of full params
+
+## Pull Requests and Issues
+
+* a disabled suite should call resultCallback with status being disabled
+* disabled suite should still call onStart callback
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/2.1.0.md

@@ -0,0 +1,83 @@
+# Jasmine Core 2.1.0 Release Notes
+
+## Summary
+
+This is the release of Jasmine 2.1.
+
+## Features
+
+- Support for focused specs via `fit` and `fdescribe`
+- Support for `beforeAll` and `afterAll`
+- Support for an explicit `fail` function, both in synchronous and asynchronous specs
+- Allow custom timeout for `beforeEach`, `afterEach`, `beforeAll`, `afterAll` and `it`
+- Spies now track return values
+- Specs can now specify their own timeouts
+- Testing in Node.js via the official Jasmine Node Module
+- Spec results now have `suiteResults` method that behaves similarly to to `specResults`
+- HtmlReporter shows error alerts for afterAllExceptions
+
+## Bugs
+
+- CI now works for IE8 (this was releated to `ConsoleReporter` below)
+- Detect global object properly when getting the jasmine require obj
+  - Fixes Issue #[569][issue_569]  - [Tracker Story #73684570](http://www.pivotaltracker.com/story/73684570)
+
+## Deprecations
+
+### `ConsoleReporter` as part of Jasmine core
+
+The Console Reporter exists nearly entirely for the old manner of running Jasmine's own specs in node.js. As we are now supporting node.js officially, this reporter code no longer needs to be in this repo and instead will be in the Jasmine npm.
+
+For now you will see a deprecation message. It will be removed entirely in Jasmine 3.0.
+
+## Documentation
+
+- Release Notes from previous releases now live at [Jasmine's GitHub release page][releases]. See Tracker Story #[54582902][tracker_1]
+- Better instructions for releasing new documentation
+
+[releases]: https://github.com/pivotal/jasmine/releases
+[tracker_1]: http://www.pivotaltracker.com/story/54582902
+
+
+## Pull Requests and Issues
+
+- Simplification of HTMLtags in SpecRunner.html
+    - Merges #[700][issue_700] from @tkrotoff
+- `toContain` works with array-like objects (Arguments, HTMLCollections, etc)
+    - Merges #[699][issue_699] from @charleshansen
+- Fixed isPendingSpecException test title
+    - Merges #[691][issue_691] from @ertrzyiks
+- Fixed an issue with example code in the npm
+    - Merges #[686][issue_686] from @akoptsov
+- When the Jasmine clock is installed and date is mocked, `new Date() instanceof Date` should equal `true` Issue #[678][issue_678] & Issue #[679][issue_679] from @chernetsov
+- Support for an explicit `fail` function, both in synchronous and asynchronous specs
+    - Fixes Issue #[567][issue_567], Issue #[568][issue_568], and Issue #[563][issue_563]
+- Allow custom timeout for `beforeEach`, `afterEach`, `beforeAll`, `afterAll` and `it`
+    - Fixes Issue #[483][issue_483] - specs can now specify their own timeouts
+- Spies can track return values
+    - Fixes Issue #[660][issue_660], Merged Issue #[669][issue_669] from @mkhanal
+- Interval handlers can now clear their interval
+    - Fixes Issue #[655][issue_655] Merged Issue #[658][issue_658] from @tgirardi
+- Updated to the latest `json2.js`
+    - Merges #[616][issue_616] from @apaladox2015
+
+------
+
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_
+
+[issue_569]: http://github.com/pivotal/jasmine/issues/569
+[issue_700]: http://github.com/pivotal/jasmine/issues/700
+[issue_699]: http://github.com/pivotal/jasmine/issues/699
+[issue_691]: http://github.com/pivotal/jasmine/issues/691
+[issue_678]: http://github.com/pivotal/jasmine/issues/678
+[issue_679]: http://github.com/pivotal/jasmine/issues/679
+[issue_567]: http://github.com/pivotal/jasmine/issues/567
+[issue_568]: http://github.com/pivotal/jasmine/issues/568
+[issue_563]: http://github.com/pivotal/jasmine/issues/563
+[issue_483]: http://github.com/pivotal/jasmine/issues/483
+[issue_660]: http://github.com/pivotal/jasmine/issues/660
+[issue_669]: http://github.com/pivotal/jasmine/issues/669
+[issue_655]: http://github.com/pivotal/jasmine/issues/655
+[issue_658]: http://github.com/pivotal/jasmine/issues/658
+[issue_616]: http://github.com/pivotal/jasmine/issues/616
+[issue_686]: http://github.com/pivotal/jasmine/issues/686

release_notes/older_versions.md

@@ -0,0 +1,110 @@
+# Release 1.0.1.1 — November 9, 2010
+
+## Jasmine Gem
+
+## Bugs fixed
+*  Rails 3.0 and RSpec 2.0 are now supported.
+
+
+## Known issues
+*  Rails 3 generators are not yet implemented -- coming soon!
+
+
+-----
+# Release 1.0.1 — October 5, 2010
+-----
+
+## Jasmine Core
+
+## Bugs fixed
+*  Bug fixes for Internet Explorer (thanks fschwiet, fabiomcosta, and jfirebaugh).
+
+
+## Jasmine Gem
+
+## Bugs fixed
+*  Bug fix for Windows (thanks jfirebaugh).
+
+
+-----
+# Release 1.0 — September 14, 2010
+-----
+
+## Jasmine Core
+
+## Features
+*  `waitsFor()` arguments can now be specified in any order. Timeout and message are optional.
+*  The default `waitsFor()` timeout period is now specified in `env.defaultTimeoutInterval`; the default value is 5 seconds.
+*  Added link to jasmine site from html runner.
+*  Added license file to standalone distribution.
+*  New friendly version number.
+
+
+## Bugs fixed
+*  `waitsFor()` hanged forever if latch function never returned true.
+*  The `not.toThrow()` matcher threw an exception when used with no args.
+*  The `toThrow()` matcher, when inverted, gave misleading failure messages.
+*  Spy matchers, when inverted, gave misleading failure messages.
+
+
+## Deprecations
+*  Deprecated `waits()` block in favor of `waitsFor()`; `waits()` will be removed in a future release.
+*  Deprecated `toNotBe()`, `toNotEqual()`, `toNotMatch()`, and `toNotContain()` matchers; they will be removed in a future release.
+*  Console X was removed from the distribution as it was no longer used.
+*  To give us some flexibility for future features, wrapped matcher functions now return `undefined` (they previously returned `true` or `false`, but this was undocumented).
+
+
+## Jasmine Gem
+
+## Features
+*  Jasmine now supports JRuby.
+*  Jasmine now supports Ruby 1.9.
+
+
+## Bugs fixed
+*  Various generator issues fixed.
+
+
+## Known issues
+*  Rails 3 and RSpec 2 are not yet fully supported.
+
+
+-----
+# Release 0.11.1 — June 25, 2010
+-----
+
+## Jasmine Core
+
+### Features
+*  Jasmine no longer logs "Jasmine Running…" messages to the log by default. This can be enabled in runner.html by adding 'trivialReporter.logRunningSpecs = true;'.
+*  The `wasCalled()`, `wasCalledWith()`, `wasNotCalled()` and `wasNotCalledWith()` matchers have been deprecated. The new matchers `toHaveBeenCalled()` and `toHaveBeenCalledWith()` have been added. You can use the `not` prefix to achieve equivalent of the `wasNot…()` expectation (e.g. `not.toHaveBeenCalled()`).
+
+
+## Notables
+*  A barebones version of Jasmine is now available on <a href="http://pivotal.github.com/jasmine/">http://pivotal.github.com/jasmine/</a>.
+
+
+-----
+# Release 0.11.0 — June 23, 2010
+-----
+## Jasmine Core
+
+## Features
+*  The version number has been removed from the generated single-file /lib/jasmine.js. We're also now uploading this file, with the version number in the filename, to github's Downloads page.
+*  Old-style matchers (those using this.report(), from before 0.10.x) are no longer supported. See the <span class="caps">README</span> for instructions on writing new-style matchers.
+*  <strong>jasmine.log</strong> pretty-prints its parameters to the spec's output.
+*  Jasmine no longer depends on 'window'.
+*  <span class="caps">HTML</span> runner should show number of passes/fails by spec, not expectation.
+*  Small modification to JsApiReporter data format.
+
+
+## Bugs fixed:
+*  If multiple beforeEach blocks were declared, they were executed in reverse order.
+*  Specs with duplicate names confused TrivialReporter output.
+*  Errors in describe functions caused later tests to be weirdly nested.
+*  Nested specs weren't reported properly by the JsApiReporter.
+
+
+## Known issues:
+*  If you turn on the mock clock, you'll get a spurious log message at the end of your spec.
+

requirements.txt

@@ -0,0 +1 @@
+ordereddict==1.1

setup.py

@@ -0,0 +1,47 @@
+from setuptools import setup, find_packages, os
+import json
+
+with open('package.json') as packageFile:
+  version = json.load(packageFile)['version']
+
+setup(
+    name="jasmine-core",
+    version=version,
+    url="http://pivotal.github.io/jasmine/",
+    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 '+
+                 'browsers, DOM, or any JavaScript framework. Thus it\'s suited for websites, '+
+                 'Node.js (http://nodejs.org) projects, or anywhere that JavaScript can run.'),
+    license='MIT',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: Implementation :: PyPy',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Software Development :: Build Tools',
+        'Topic :: Software Development :: Quality Assurance',
+        'Topic :: Software Development :: Testing',
+    ],
+
+    packages=['jasmine_core', 'jasmine_core.images'],
+    package_dir={'jasmine_core': 'lib/jasmine-core', 'jasmine_core.images': 'images'},
+    package_data={'jasmine_core': ['*.js', '*.css'], 'jasmine_core.images': ['*.png']},
+
+    include_package_data=True,
+
+    install_requires=['glob2>=0.4.1', 'ordereddict==1.1']
+)

spec/console/ConsoleReporterSpec.js

@@ -9,7 +9,7 @@ describe("ConsoleReporter", function() {
           output += str;
         },
         getOutput: function() {
-          return output;
+          return output.replace('ConsoleReporter is deprecated and will be removed in a future version.', '');
         },
         clear: function() {
           output = "";
@@ -80,6 +80,18 @@ describe("ConsoleReporter", function() {
     expect(out.getOutput()).toEqual("*");
   });
 
+  it("alerts user if there are no specs", function(){
+    var reporter = new j$.ConsoleReporter({
+          print: out.print
+        });
+
+    reporter.jasmineStarted();
+    out.clear();
+    reporter.jasmineDone();
+
+    expect(out.getOutput()).toMatch(/No specs found/);
+  });
+
   it("reports a summary when done (singular spec and time)", function() {
     var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
         reporter = new j$.ConsoleReporter({
@@ -159,26 +171,44 @@ describe("ConsoleReporter", function() {
 
     out.clear();
 
-    reporter.jasmineDone({});
+    reporter.jasmineDone();
 
+    expect(out.getOutput()).toMatch(/true to be false/);
     expect(out.getOutput()).toMatch(/foo bar baz/);
   });
 
-  it("calls the onComplete callback when the suite is done", function() {
-    var onComplete = jasmine.createSpy('onComplete'),
+  describe('onComplete callback', function(){
+    var onComplete, reporter;
+
+    beforeEach(function() {
+      onComplete = jasmine.createSpy('onComplete');
       reporter = new j$.ConsoleReporter({
         print: out.print,
         onComplete: onComplete
       });
+      reporter.jasmineStarted();
+    });
 
-    reporter.jasmineDone({});
+    it("is called when the suite is done", function() {
+      reporter.jasmineDone();
+      expect(onComplete).toHaveBeenCalledWith(true);
+    });
 
-    expect(onComplete).toHaveBeenCalled();
+    it('calls it with false if there are spec failures', function() {
+      reporter.specDone({status: "failed", failedExpectations: []});
+      reporter.jasmineDone();
+      expect(onComplete).toHaveBeenCalledWith(false);
+    });
+
+    it('calls it with false if there are suite failures', function() {
+      reporter.specDone({status: "passed"});
+      reporter.suiteDone({failedExpectations: [{ message: 'bananas' }] });
+      reporter.jasmineDone();
+      expect(onComplete).toHaveBeenCalledWith(false);
+    });
   });
 
-
   describe("with color", function() {
-
     it("reports that the suite has started to the console", function() {
       var reporter = new j$.ConsoleReporter({
         print: out.print,
@@ -222,5 +252,19 @@ describe("ConsoleReporter", function() {
 
       expect(out.getOutput()).toEqual("\x1B[31mF\x1B[0m");
     });
+
+    it("displays all afterAll exceptions", function() {
+        var reporter = new j$.ConsoleReporter({
+          print: out.print,
+          showColors: true
+        });
+
+        reporter.suiteDone({ failedExpectations: [{ message: 'After All Exception' }] });
+        reporter.suiteDone({ failedExpectations: [{ message: 'Some Other Exception' }] });
+        reporter.jasmineDone();
+
+        expect(out.getOutput()).toMatch(/After All Exception/);
+        expect(out.getOutput()).toMatch(/Some Other Exception/);
+    });
   });
 });

spec/core/AnySpec.js

@@ -40,6 +40,7 @@ describe("Any", function() {
     var any = new j$.Any(Number);
 
     expect(any.jasmineToString()).toMatch('<jasmine.any');
+    expect(any.jasmineToString()).toMatch('Number');
   });
 
 });

spec/core/ClockSpec.js

@@ -5,7 +5,8 @@ describe("Clock", function() {
       fakeGlobal = { setTimeout: fakeSetTimeout },
       delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
       delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     fakeGlobal.setTimeout(delayedFn, 0);
 
@@ -26,7 +27,8 @@ describe("Clock", function() {
       fakeGlobal = { clearTimeout: fakeClearTimeout },
       delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
       delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     fakeGlobal.clearTimeout("foo");
 
@@ -47,7 +49,8 @@ describe("Clock", function() {
       fakeGlobal = { setInterval: fakeSetInterval },
       delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
       delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     fakeGlobal.setInterval(delayedFn, 0);
 
@@ -68,7 +71,8 @@ describe("Clock", function() {
       fakeGlobal = { clearInterval: fakeClearInterval },
       delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
       delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     fakeGlobal.clearInterval("foo");
 
@@ -97,7 +101,8 @@ describe("Clock", function() {
       },
       delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction", "reset"]),
       delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     clock.install();
     clock.uninstall();
@@ -119,7 +124,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = { scheduleFunction: scheduleFunction },
       fakeGlobal = { setTimeout: fakeSetTimeout },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     clock.install();
     clock.setTimeout(delayedFn, 0, 'a', 'b');
@@ -135,7 +141,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
       fakeGlobal = { setTimeout: fakeSetTimeout },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate),
       timeoutId;
 
     clock.install();
@@ -149,7 +156,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = jasmine.createSpyObj('delayedFunctionScheduler', ['removeFunctionWithId']),
       fakeGlobal = { setTimeout: fakeClearTimeout },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     clock.install();
     clock.clearTimeout(123);
@@ -164,7 +172,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
       fakeGlobal = { setInterval: fakeSetInterval },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     clock.install();
     clock.setInterval(delayedFn, 0, 'a', 'b');
@@ -180,7 +189,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
       fakeGlobal = { setInterval: fakeSetInterval },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate),
       intervalId;
 
     clock.install();
@@ -194,7 +204,8 @@ describe("Clock", function() {
       delayedFunctionScheduler = jasmine.createSpyObj('delayedFunctionScheduler', ['removeFunctionWithId']),
       fakeGlobal = { setInterval: clearInterval },
       delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     clock.install();
     clock.clearInterval(123);
@@ -220,7 +231,8 @@ describe("Clock", function() {
         setTimeout: fakeSetTimeout,
         setInterval: fakeSetInterval
       },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler, mockDate);
 
     fakeSetTimeout.apply = null;
     fakeSetInterval.apply = null;
@@ -249,7 +261,8 @@ describe("Clock (acceptance)", function() {
       delayedFn3 = jasmine.createSpy('delayedFn3'),
       recurring1 = jasmine.createSpy('recurring1'),
       delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
 
     clock.install();
 
@@ -295,7 +308,8 @@ describe("Clock (acceptance)", function() {
   it("can clear a previously set timeout", function() {
     var clearedFn = jasmine.createSpy('clearedFn'),
       delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate),
       timeoutId;
 
     clock.install();
@@ -309,10 +323,29 @@ describe("Clock (acceptance)", function() {
     expect(clearedFn).not.toHaveBeenCalled();
   });
 
+  it("can clear a previously set interval using that interval's handler", function() {
+    var spy = jasmine.createSpy('spy'),
+      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock({setInterval: function() {}}, delayedFunctionScheduler, mockDate),
+      intervalId;
+
+    clock.install();
+
+    intervalId = clock.setInterval(function() {
+      spy();
+      clock.clearInterval(intervalId);
+    }, 100);
+    clock.tick(200);
+
+    expect(spy.calls.count()).toEqual(1);
+  });
+
   it("correctly schedules functions after the Clock has advanced", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler);
+      mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
 
     clock.install();
 
@@ -328,7 +361,8 @@ describe("Clock (acceptance)", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
         delayedFn2 = jasmine.createSpy('delayedFn2'),
         delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler);
+        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
 
     delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 0); });
     clock.install();
@@ -346,7 +380,8 @@ describe("Clock (acceptance)", function() {
     var delayedFn1 = jasmine.createSpy('delayedFn1'),
         delayedFn2 = jasmine.createSpy('delayedFn2'),
         delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler);
+        mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} },
+        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler, mockDate);
 
     delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 1); });
     clock.install();
@@ -354,6 +389,75 @@ describe("Clock (acceptance)", function() {
 
     clock.tick(6);
     expect(delayedFn1).toHaveBeenCalled();
-    expect(delayedFn2).toHaveBeenCalled();  
+    expect(delayedFn2).toHaveBeenCalled();
+  });
+
+  it("does not mock the Date object by default", function() {
+     var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      global = {Date: Date},
+      mockDate = new j$.MockDate(global),
+      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+
+    clock.install();
+
+    expect(global.Date).toEqual(Date);
+
+    var now = new global.Date().getTime();
+
+    clock.tick(50);
+
+    expect(new global.Date().getTime() - now).not.toEqual(50);
+  });
+
+  it("mocks the Date object and sets it to current time", function() {
+    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      global = {Date: Date},
+      mockDate = new j$.MockDate(global),
+      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate);
+
+    clock.install().mockDate();
+
+    var now = new global.Date().getTime();
+
+    clock.tick(50);
+
+    expect(new global.Date().getTime() - now).toEqual(50);
+
+    var timeoutDate = 0;
+    clock.setTimeout(function() {
+      timeoutDate = new global.Date().getTime();
+    }, 100);
+
+    clock.tick(100);
+
+    expect(timeoutDate - now).toEqual(150);
+  });
+
+  it("mocks the Date object and sets it to a given time", function() {
+    var delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
+      global = {Date: Date},
+      mockDate = new j$.MockDate(global),
+      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler, mockDate),
+      baseTime = new Date(2013, 9, 23);
+
+
+    clock.install().mockDate(baseTime);
+
+    var now = new global.Date().getTime();
+
+    expect(now).toEqual(baseTime.getTime());
+
+    clock.tick(50);
+
+    expect(new global.Date().getTime()).toEqual(baseTime.getTime() + 50);
+
+    var timeoutDate = 0;
+    clock.setTimeout(function() {
+      timeoutDate = new global.Date().getTime();
+    }, 100);
+
+    clock.tick(100);
+
+    expect(timeoutDate).toEqual(baseTime.getTime() + 150);
   });
 });

spec/core/DelayedFunctionSchedulerSpec.js

@@ -14,7 +14,7 @@ describe("DelayedFunctionScheduler", function() {
 
   it("schedules a string for later execution", function() {
     var scheduler = new j$.DelayedFunctionScheduler(),
-        strfn = "horrible = true;";
+      strfn = "horrible = true;";
 
     scheduler.scheduleFunction(strfn, 0);
 
@@ -242,5 +242,18 @@ describe("DelayedFunctionScheduler", function() {
     expect(innerFn).toHaveBeenCalled();
   });
 
+  it("executes recurring functions after rescheduling them", function () {
+    var scheduler = new j$.DelayedFunctionScheduler(),
+      recurring = function() {
+        expect(scheduler.scheduleFunction).toHaveBeenCalled();
+      };
+
+    scheduler.scheduleFunction(recurring, 10, [], true);
+
+    spyOn(scheduler, "scheduleFunction");
+
+    scheduler.tick(10);
+  });
+
 });
 

spec/core/EnvSpec.js

@@ -5,68 +5,6 @@ describe("Env", function() {
     env = new j$.Env();
   });
 
-  it('removes all spies when env is executed', function(done) {
-    originalFoo = function() {},
-    testObj = {
-      foo: originalFoo
-    },
-    firstSpec = jasmine.createSpy('firstSpec').and.callFake(function() {
-      env.spyOn(testObj, 'foo');
-    }),
-    secondSpec = jasmine.createSpy('secondSpec').and.callFake(function() {
-      expect(testObj.foo).toBe(originalFoo);
-    });
-    env.describe('test suite', function() {
-      env.it('spec 0', firstSpec);
-      env.it('spec 1', secondSpec);
-    });
-
-    var assertions = function() {
-      expect(firstSpec).toHaveBeenCalled();
-      expect(secondSpec).toHaveBeenCalled();
-      done();
-    };
-
-    env.addReporter({ jasmineDone: assertions });
-
-    env.execute();
-  });
-
-  describe("#spyOn", function() {
-    it("checks for the existence of the object", function() {
-      expect(function() {
-        env.spyOn(void 0, 'pants');
-      }).toThrowError(/could not find an object/);
-    });
-
-    it("checks for the existence of the method", function() {
-      var subject = {};
-
-      expect(function() {
-        env.spyOn(subject, 'pants');
-      }).toThrowError(/method does not exist/);
-    });
-
-    it("checks if it has already been spied upon", function() {
-      var subject = { spiedFunc: function() {} };
-
-      env.spyOn(subject, 'spiedFunc');
-
-      expect(function() {
-        env.spyOn(subject, 'spiedFunc');
-      }).toThrowError(/has already been spied upon/);
-    });
-
-    it("overrides the method on the object and returns the spy", function() {
-      var originalFunctionWasCalled = false;
-      var subject = { spiedFunc: function() { originalFunctionWasCalled = true; } };
-
-      var spy = env.spyOn(subject, 'spiedFunc');
-
-      expect(subject.spiedFunc).toEqual(spy);
-    });
-  });
-
   describe("#pending", function() {
     it("throws the Pending Spec exception", function() {
       expect(function() {
@@ -82,4 +20,3 @@ describe("Env", function() {
     });
   });
 });
-

spec/core/ExceptionFormatterSpec.js

@@ -35,7 +35,14 @@ describe("ExceptionFormatter", function() {
         message = exceptionFormatter.message(sampleV8);
 
       expect(message).toEqual('A Classic Mistake: you got your foo in my bar');
+    });
 
+    it("formats thrown exceptions that aren't errors", function() {
+      var thrown = "crazy error",
+          exceptionFormatter = new j$.ExceptionFormatter(),
+          message = exceptionFormatter.message(thrown);
+
+      expect(message).toEqual("crazy error thrown");
     });
   });
 

spec/core/ExceptionsSpec.js

@@ -35,7 +35,7 @@ describe('Exceptions:', function() {
         env.it('should be a passing test that runs after exceptions are thrown from a async test', secondTest);
       });
 
-      expectations = function() {
+      var expectations = function() {
         expect(secondTest).toHaveBeenCalled();
         done();
       };
@@ -55,7 +55,7 @@ describe('Exceptions:', function() {
       });
       env.describe("a suite that doesn't throw an exception", secondDescribe);
 
-      expectations = function() {
+      var expectations = function() {
         expect(secondDescribe).toHaveBeenCalled();
         done();
       };

spec/core/ExpectationSpec.js

@@ -1,14 +1,14 @@
 describe("Expectation", function() {
-  it(".addMatchers makes matchers available to any expectation", function() {
+  it("makes custom matchers available to this expectation", function() {
     var matchers = {
         toFoo: function() {},
         toBar: function() {}
       },
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({});
+    expectation = new j$.Expectation({
+      customMatchers: matchers
+    });
 
     expect(expectation.toFoo).toBeDefined();
     expect(expectation.toBar).toBeDefined();
@@ -27,25 +27,6 @@ describe("Expectation", function() {
     expect(expectation.toQuux).toBeDefined();
   });
 
-  it(".resetMatchers should keep only core matchers", function() {
-    var matchers = {
-        toFoo: function() {}
-      },
-      coreMatchers = {
-        toQuux: function() {}
-      },
-      expectation;
-
-    j$.Expectation.addCoreMatchers(coreMatchers);
-    j$.Expectation.addMatchers(matchers);
-    j$.Expectation.resetMatchers();
-
-    expectation = new j$.Expectation({});
-
-    expect(expectation.toQuux).toBeDefined();
-    expect(expectation.toFoo).toBeUndefined();
-  });
-
   it("Factory builds an expectation/negative expectation", function() {
     var builtExpectation = j$.Expectation.Factory();
 
@@ -65,10 +46,9 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
       util: util,
+      customMatchers: matchers,
       customEqualityTesters: customEqualityTesters,
       actual: "an actual",
       addExpectationResult: addExpectationResult
@@ -94,10 +74,9 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
       util: util,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult
     });
@@ -121,10 +100,8 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       util: util,
       actual: "an actual",
       addExpectationResult: addExpectationResult
@@ -155,10 +132,8 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       util: util,
       actual: "an actual",
       addExpectationResult: addExpectationResult
@@ -191,10 +166,41 @@ describe("Expectation", function() {
       addExpectationResult = jasmine.createSpy("addExpectationResult"),
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
+    expectation = new j$.Expectation({
+      actual: "an actual",
+      customMatchers: matchers,
+      addExpectationResult: addExpectationResult
+    });
+
+    expectation.toFoo("hello");
+
+    expect(addExpectationResult).toHaveBeenCalledWith(false, {
+      matcherName: "toFoo",
+      passed: false,
+      expected: "hello",
+      actual: "an actual",
+      message: "I am a custom message"
+    });
+  });
+
+  it("reports a failing result with a custom fail message function to the spec when the comparison fails", function() {
+    var matchers = {
+        toFoo: function() {
+          return {
+            compare: function() {
+              return {
+                pass: false,
+                message: function() { return "I am a custom message"; }
+              };
+            }
+          };
+        }
+      },
+      addExpectationResult = jasmine.createSpy("addExpectationResult"),
+      expectation;
 
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult
     });
@@ -225,10 +231,8 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
       isNot: true
@@ -260,10 +264,8 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       util: util,
       addExpectationResult: addExpectationResult,
@@ -298,10 +300,8 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
       isNot: true
@@ -331,10 +331,8 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
       isNot: true
@@ -369,10 +367,8 @@ describe("Expectation", function() {
       actual = "an actual",
       expectation;
 
-    j$.Expectation.addMatchers(matchers);
-
     expectation = new j$.Expectation({
-      matchers: matchers,
+      customMatchers: matchers,
       actual: "an actual",
       addExpectationResult: addExpectationResult,
       isNot: true

spec/core/JsApiReporterSpec.js

@@ -178,6 +178,43 @@ describe("JsApiReporter", function() {
     });
   });
 
+  describe("#suiteResults", function(){
+    var reporter, suiteResult1, suiteResult2;
+    beforeEach(function() {
+      reporter = new j$.JsApiReporter({});
+      suiteStarted1 = {
+        id: 1
+      };
+      suiteResult1 = {
+        id: 1,
+        status: 'failed',
+        failedExpectations: [{ message: 'My After All Exception' }]
+      };
+      suiteResult2 = {
+        id: 2,
+        status: 'finished'
+      };
+
+      reporter.suiteStarted(suiteStarted1);
+      reporter.suiteDone(suiteResult1);
+      reporter.suiteDone(suiteResult2);
+    });
+
+    it('should not include suite starts', function(){
+      expect(reporter.suiteResults(0,3).length).toEqual(2);
+    });
+
+    it("should return a slice of results", function() {
+      expect(reporter.suiteResults(0, 1)).toEqual([suiteResult1]);
+      expect(reporter.suiteResults(1, 1)).toEqual([suiteResult2]);
+    });
+
+    it("returns nothing for out of bounds indicies", function() {
+      expect(reporter.suiteResults(0, 3)).toEqual([suiteResult1, suiteResult2]);
+      expect(reporter.suiteResults(2, 3)).toEqual([]);
+    });
+  });
+
   describe("#executionTime", function() {
     it("should start the timer when jasmine starts", function() {
       var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),

spec/core/MockDateSpec.js

@@ -0,0 +1,200 @@
+describe("FakeDate", function() {
+  it("does not fail if no global date is found", function() {
+    var fakeGlobal = {},
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    expect(function() {
+      mockDate.install();
+      mockDate.tick(0);
+      mockDate.uninstall();
+    }).not.toThrow();
+  });
+
+  it("replaces the global Date when it is installed", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {}
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    expect(fakeGlobal.Date).toEqual(globalDate);
+    mockDate.install();
+
+    expect(fakeGlobal.Date).not.toEqual(globalDate);
+  });
+
+  it("replaces the global Date on uninstall", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {}
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+    mockDate.uninstall();
+
+    expect(fakeGlobal.Date).toEqual(globalDate);
+  });
+
+  it("takes the current time as the base when installing without parameters", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    globalDate.calls.reset();
+    new fakeGlobal.Date();
+    expect(globalDate).toHaveBeenCalledWith(1000);
+  });
+
+  it("can accept a date as time base when installing", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal),
+      baseDate = new Date();
+
+    spyOn(baseDate, 'getTime').and.returnValue(123);
+    mockDate.install(baseDate);
+
+    expect(new fakeGlobal.Date().getTime()).toEqual(123);
+  });
+
+  it("makes real dates", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+    expect(new fakeGlobal.Date()).toEqual(jasmine.any(Date));
+    expect(new fakeGlobal.Date() instanceof fakeGlobal.Date).toBe(true);
+  });
+
+  it("fakes current time when using Date.now()", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+  });
+
+  it("does not stub Date.now() if it doesn't already exist", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.now).toThrowError("Browser does not support Date.now()");
+  });
+
+  it("makes time passes using tick", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    mockDate.tick(100);
+
+    expect(fakeGlobal.Date.now()).toEqual(1100);
+
+    mockDate.tick(1000);
+
+    expect(fakeGlobal.Date.now()).toEqual(2100);
+  });
+
+  it("allows to increase 0 milliseconds using tick", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    mockDate.tick(0);
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+
+    mockDate.tick();
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+  });
+
+  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.install();
+
+    var otherDate = new fakeGlobal.Date(2013, 9, 23, 0, 0, 1, 0);
+    expect(otherDate.getTime()).toEqual(new Date(2013, 9, 23, 0, 0, 1, 0).getTime());
+  });
+
+  it("allows creation of a Date that isn't fully specified", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    var otherDate = new fakeGlobal.Date(2013, 9, 23);
+    expect(otherDate.getTime()).toEqual(new Date(2013, 9, 23).getTime());
+  });
+
+  it('allows creation of a Date with millis', function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal),
+      now = new Date(2014, 3, 15).getTime();
+
+    mockDate.install();
+
+    var otherDate = new fakeGlobal.Date(now);
+    expect(otherDate.getTime()).toEqual(now);
+  });
+
+  it("copies all Date properties to the mocked date", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.UTC(2013, 9, 23)).toEqual(Date.UTC(2013, 9, 23));
+  });
+});

spec/core/ObjectContainingSpec.js

@@ -61,4 +61,10 @@ describe("ObjectContaining", function() {
 
     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

@@ -11,6 +11,7 @@ describe("j$.pp", function () {
     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");
   });
 
   it("should stringify arrays properly", function() {
@@ -25,11 +26,16 @@ describe("j$.pp", function () {
     expect(j$.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
   });
 
+  it("should not indicate circular references incorrectly", function() {
+    var array = [ [1] ];
+    expect(j$.pp(array)).toEqual("[ [ 1 ] ]");
+  });
+
   it("should stringify objects properly", function() {
-    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: '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 ] }");
+    }, bar: [1, 2, 3]})).toEqual("{ foo: Function, bar: [ 1, 2, 3 ] }");
   });
 
   it("should not include inherited properties when stringifying an object", function() {
@@ -37,7 +43,7 @@ describe("j$.pp", function () {
     SomeClass.prototype.foo = "inherited foo";
     var instance = new SomeClass();
     instance.bar = "my own bar";
-    expect(j$.pp(instance)).toEqual("{ bar : 'my own bar' }");
+    expect(j$.pp(instance)).toEqual("{ bar: 'my own bar' }");
   });
 
   it("should not recurse objects and arrays more deeply than j$.MAX_PRETTY_PRINT_DEPTH", function() {
@@ -47,21 +53,42 @@ describe("j$.pp", function () {
 
     try {
       j$.MAX_PRETTY_PRINT_DEPTH = 2;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : Object } }");
+      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: Object } }");
       expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
 
       j$.MAX_PRETTY_PRINT_DEPTH = 3;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : { level3 : Object } } }");
+      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: Object } } }");
       expect(j$.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(nestedObject)).toEqual("{ level1: { level2: { level3: { level4: 'leaf' } } } }");
       expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
     } finally {
       j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
     }
   });
 
+  it("should stringify immutable circular objects", function(){
+    if(Object.freeze){
+      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;
+    }
+  });
+
   it("should stringify RegExp objects properly", function() {
     expect(j$.pp(/x|y|z/)).toEqual("/x|y|z/");
   });
@@ -69,7 +96,7 @@ describe("j$.pp", function () {
   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(j$.pp(sampleValue)).toEqual("{ foo: 'hello', nested: <circular reference: Object> }");
   });
 
   it("should indicate getters on objects as such", function() {
@@ -81,10 +108,10 @@ describe("j$.pp", function () {
       });
     }
     if (sampleValue.__defineGetter__) {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
+      expect(j$.pp(sampleValue)).toEqual("{ id: 1, calculatedValue: <getter> }");
     }
     else {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1 }");
+      expect(j$.pp(sampleValue)).toEqual("{ id: 1 }");
     }
   });
 
@@ -108,7 +135,9 @@ describe("j$.pp", function () {
         },
         env = new j$.Env();
 
-    env.spyOn(TestObject, 'someFunction');
+    var spyRegistry = new j$.SpyRegistry({currentSpies: function() {return [];}});
+
+    spyRegistry.spyOn(TestObject, 'someFunction');
     expect(j$.pp(TestObject.someFunction)).toEqual("spy on someFunction");
 
     expect(j$.pp(j$.createSpy("something"))).toEqual("spy on something");
@@ -121,5 +150,13 @@ describe("j$.pp", function () {
 
     expect(j$.pp(obj)).toEqual("strung");
   });
-});
 
+  it("should handle objects with null prototype", function() {
+    if (jasmine.getEnv().ieVersion < 9) { return; }
+
+    var obj = Object.create(null);
+    obj.foo = 'bar';
+
+    expect(j$.pp(obj)).toEqual("{ foo: 'bar' }");
+  });
+});

spec/core/QueueRunnerSpec.js

@@ -2,15 +2,15 @@ describe("QueueRunner", function() {
 
   it("runs all the functions it's passed", function() {
     var calls = [],
-      fn1 = jasmine.createSpy('fn1'),
-      fn2 = jasmine.createSpy('fn2'),
+      queueableFn1 = { fn: jasmine.createSpy('fn1') },
+      queueableFn2 = { fn: jasmine.createSpy('fn2') },
       queueRunner = new j$.QueueRunner({
-        fns: [fn1, fn2]
+        queueableFns: [queueableFn1, queueableFn2]
       });
-    fn1.and.callFake(function() {
+    queueableFn1.fn.and.callFake(function() {
       calls.push('fn1');
     });
-    fn2.and.callFake(function() {
+    queueableFn2.fn.and.callFake(function() {
       calls.push('fn2');
     });
 
@@ -20,19 +20,19 @@ describe("QueueRunner", function() {
   });
 
   it("calls each function with a consistent 'this'-- an empty object", function() {
-    var fn1 = jasmine.createSpy('fn1'),
-        fn2 = jasmine.createSpy('fn2'),
-        fn3 = function(done) { asyncContext = this; done(); },
+    var queueableFn1 = { fn: jasmine.createSpy('fn1') },
+        queueableFn2 = { fn: jasmine.createSpy('fn2') },
+        queueableFn3 = { fn: function(done) { asyncContext = this; done(); } },
         queueRunner = new j$.QueueRunner({
-          fns: [fn1, fn2, fn3]
+          queueableFns: [queueableFn1, queueableFn2, queueableFn3]
         }),
         asyncContext;
 
     queueRunner.execute();
 
-    var context = fn1.calls.first().object;
+    var context = queueableFn1.fn.calls.first().object;
     expect(context).toEqual({});
-    expect(fn2.calls.first().object).toBe(context);
+    expect(queueableFn2.fn.calls.first().object).toBe(context);
     expect(asyncContext).toBe(context);
   });
 
@@ -50,31 +50,25 @@ describe("QueueRunner", function() {
       //createSpy('asyncfn').and.callFake(function(done) {});
 
       var onComplete = jasmine.createSpy('onComplete'),
-      beforeCallback = jasmine.createSpy('beforeCallback'),
-      fnCallback = jasmine.createSpy('fnCallback'),
-      afterCallback = jasmine.createSpy('afterCallback'),
-      fn1 = function(done) {
-        beforeCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      fn2 = function(done) {
-        fnCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      fn3 = function(done) {
-        afterCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      queueRunner = new j$.QueueRunner({
-        fns: [fn1, fn2, fn3],
-        onComplete: onComplete
-      });
+        beforeCallback = jasmine.createSpy('beforeCallback'),
+        fnCallback = jasmine.createSpy('fnCallback'),
+        afterCallback = jasmine.createSpy('afterCallback'),
+        queueableFn1 = { fn: function(done) {
+          beforeCallback();
+          setTimeout(done, 100);
+        } },
+        queueableFn2 = { fn: function(done) {
+          fnCallback();
+          setTimeout(done, 100);
+        } },
+        queueableFn3 = { fn: function(done) {
+          afterCallback();
+          setTimeout(done, 100);
+        } },
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn1, queueableFn2, queueableFn3],
+          onComplete: onComplete
+        });
 
       queueRunner.execute();
 
@@ -98,52 +92,182 @@ describe("QueueRunner", function() {
 
       expect(onComplete).toHaveBeenCalled();
     });
+
+    it("explicitly fails an async function with a provided fail function and moves to the next function", function() {
+      var queueableFn1 = { fn: function(done) {
+          setTimeout(function() { done.fail('foo'); }, 100);
+        } },
+        queueableFn2 = { fn: jasmine.createSpy('fn2') },
+        failFn = jasmine.createSpy('fail'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn1, queueableFn2],
+          fail: failFn
+        });
+
+      queueRunner.execute();
+
+      expect(failFn).not.toHaveBeenCalled();
+      expect(queueableFn2.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(100);
+
+      expect(failFn).toHaveBeenCalledWith('foo');
+      expect(queueableFn2.fn).toHaveBeenCalled();
+    });
+
+    it("sets a timeout if requested for asynchronous functions so they don't go on forever", function() {
+      var timeout = 3,
+        beforeFn = { fn: function(done) { }, type: 'before', timeout: function() { return timeout; } },
+        queueableFn = { fn: jasmine.createSpy('fn'), type: 'queueable' },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [beforeFn, queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(timeout);
+
+      expect(onException).toHaveBeenCalledWith(jasmine.any(Error));
+      expect(queueableFn.fn).toHaveBeenCalled();
+      expect(onComplete).toHaveBeenCalled();
+    });
+
+    it("by default does not set a timeout for asynchronous functions", function() {
+      var beforeFn = { fn: function(done) { } },
+        queueableFn = { fn: jasmine.createSpy('fn') },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [beforeFn, queueableFn],
+          onComplete: onComplete,
+          onException: onException,
+        });
+
+      queueRunner.execute();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+
+      expect(onException).not.toHaveBeenCalled();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+      expect(onComplete).not.toHaveBeenCalled();
+    });
+
+    it("clears the timeout when an async function throws an exception, to prevent additional exception reporting", function() {
+       var queueableFn = { fn: function(done) { throw new Error("error!"); } },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+
+      expect(onComplete).toHaveBeenCalled();
+      expect(onException).toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      expect(onException.calls.count()).toEqual(1);
+    });
+
+    it("clears the timeout when the done callback is called", function() {
+      var queueableFn = { fn: function(done) { done(); } },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+
+      expect(onComplete).toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.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({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
+
+      queueRunner.execute();
+      expect(nextQueueableFn.fn.calls.count()).toEqual(1);
+    });
+
+    it("does not move to the next spec if done is called after an exception has ended the spec", function() {
+       var queueableFn = { fn: function(done) {
+         setTimeout(done, 1);
+         throw new Error('error!');
+       } },
+        nextQueueableFn = { fn: jasmine.createSpy('nextFn') };
+      queueRunner = new j$.QueueRunner({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
+
+      queueRunner.execute();
+      jasmine.clock().tick(1);
+      expect(nextQueueableFn.fn.calls.count()).toEqual(1);
+    });
   });
 
-  it("calls an exception handler when an exception is thrown in a fn", function() {
-    var fn = function() {
+  it("calls exception handlers when an exception is thrown in a fn", function() {
+    var queueableFn = { type: 'queueable',
+      fn: function() {
         throw new Error('fake error');
-      },
-      exceptionCallback = jasmine.createSpy('exception callback'),
+      } },
+      onExceptionCallback = jasmine.createSpy('on exception callback'),
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
-        onException: exceptionCallback
+        queueableFns: [queueableFn],
+        onException: onExceptionCallback
       });
 
     queueRunner.execute();
 
-    expect(exceptionCallback).toHaveBeenCalledWith(jasmine.any(Error));
+    expect(onExceptionCallback).toHaveBeenCalledWith(jasmine.any(Error));
   });
 
   it("rethrows an exception if told to", function() {
-    var fn = function() {
+    var queueableFn = { fn: function() {
         throw new Error('fake error');
-      },
+      } },
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
+        queueableFns: [queueableFn],
         catchException: function(e) { return false; }
       });
 
-    expect(function() { queueRunner.execute(); }).toThrow();
+    expect(function() {
+      queueRunner.execute();
+    }).toThrowError('fake error');
   });
 
   it("continues running the functions even after an exception is thrown in an async spec", function() {
-    var fn = function(done) { throw new Error("error"); },
-        nextFn = jasmine.createSpy("nextFunction");
-
-    queueRunner = new j$.QueueRunner({
-      fns: [fn, nextFn]
-    });
+    var queueableFn = { fn: function(done) { throw new Error("error"); } },
+      nextQueueableFn = { fn: jasmine.createSpy("nextFunction") },
+      queueRunner = new j$.QueueRunner({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
 
     queueRunner.execute();
-    expect(nextFn).toHaveBeenCalled();
+    expect(nextQueueableFn.fn).toHaveBeenCalled();
   });
 
   it("calls a provided complete callback when done", function() {
-    var fn = jasmine.createSpy('fn'),
+    var queueableFn = { fn: jasmine.createSpy('fn') },
       completeCallback = jasmine.createSpy('completeCallback'),
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
+        queueableFns: [queueableFn],
         onComplete: completeCallback
       });
 
@@ -153,12 +277,12 @@ describe("QueueRunner", function() {
   });
 
   it("calls a provided stack clearing function when done", function() {
-    var asyncFn = function(done) { done() },
-        afterFn = jasmine.createSpy('afterFn'),
+    var asyncFn = { fn: function(done) { done() } },
+        afterFn = { fn: jasmine.createSpy('afterFn') },
         completeCallback = jasmine.createSpy('completeCallback'),
         clearStack = jasmine.createSpy('clearStack'),
         queueRunner = new j$.QueueRunner({
-          fns: [asyncFn, afterFn],
+          queueableFns: [asyncFn, afterFn],
           clearStack: clearStack,
           onComplete: completeCallback
         });
@@ -166,7 +290,7 @@ describe("QueueRunner", function() {
     clearStack.and.callFake(function(fn) { fn(); });
 
     queueRunner.execute();
-    expect(afterFn).toHaveBeenCalled();
+    expect(afterFn.fn).toHaveBeenCalled();
     expect(clearStack).toHaveBeenCalledWith(completeCallback);
   });
 });

spec/core/SpecSpec.js

@@ -14,18 +14,22 @@ describe("Spec", function() {
     expect(j$.Spec.isPendingSpecException(fakeError)).toBe(true);
   });
 
-  it("#isPendingSpecException returns true for a pending spec exception", function() {
+  it("#isPendingSpecException returns false for not a pending spec exception", function() {
     var e = new Error("foo");
 
     expect(j$.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);
+  });
+
   it("delegates execution to a QueueRunner", function() {
     var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       spec = new j$.Spec({
         description: 'my test',
         id: 'some-id',
-        fn: function() {},
+        queueableFn: { fn: function() {} },
         queueRunnerFactory: fakeQueueRunner
       });
 
@@ -40,7 +44,7 @@ describe("Spec", function() {
       spec = new j$.Spec({
         id: 123,
         description: 'foo bar',
-        fn: function() {},
+        queueableFn: { fn: function() {} },
         onStart: startCallback,
         queueRunnerFactory: fakeQueueRunner
       });
@@ -62,7 +66,7 @@ describe("Spec", function() {
         expect(beforesWereCalled).toBe(false);
       }),
       spec = new j$.Spec({
-        fn: function() {},
+        queueableFn: { fn: function() {} },
         beforeFns: function() {
           return [function() {
             beforesWereCalled = true
@@ -81,25 +85,22 @@ describe("Spec", function() {
     var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       before = jasmine.createSpy('before'),
       after = jasmine.createSpy('after'),
-      fn = jasmine.createSpy('test body').and.callFake(function() {
+      queueableFn = { fn: jasmine.createSpy('test body').and.callFake(function() {
         expect(before).toHaveBeenCalled();
         expect(after).not.toHaveBeenCalled();
-      }),
+      }) },
       spec = new j$.Spec({
-        fn: fn,
-        beforeFns: function() {
-          return [before]
-        },
-        afterFns: function() {
-          return [after]
+        queueableFn: queueableFn,
+        beforeAndAfterFns: function() {
+          return {befores: [before], afters: [after]}
         },
         queueRunnerFactory: fakeQueueRunner
       });
 
     spec.execute();
 
-    var allSpecFns = fakeQueueRunner.calls.mostRecent().args[0].fns;
-    expect(allSpecFns).toEqual([before, fn, after]);
+    var allSpecFns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(allSpecFns).toEqual([before, queueableFn, after]);
   });
 
   it("is marked pending if created without a function body", function() {
@@ -109,7 +110,7 @@ describe("Spec", function() {
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new j$.Spec({
         onStart: startCallback,
-        fn: null,
+        queueableFn: { fn: null },
         resultCallback: resultCallback,
         queueRunnerFactory: fakeQueueRunner
       });
@@ -125,7 +126,7 @@ describe("Spec", function() {
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new j$.Spec({
         onStart:startCallback,
-        fn: specBody,
+        queueableFn: { fn: specBody },
         resultCallback: resultCallback,
         queueRunnerFactory: fakeQueueRunner
       });
@@ -154,7 +155,8 @@ describe("Spec", function() {
         getSpecName: function() {
           return "a suite with a spec"
         },
-        queueRunnerFactory: fakeQueueRunner
+        queueRunnerFactory: fakeQueueRunner,
+        queueableFn: { fn: null }
       });
 
     spec.pend();
@@ -171,14 +173,15 @@ describe("Spec", function() {
       status: 'pending',
       description: 'with a spec',
       fullName: 'a suite with a spec',
-      failedExpectations: []
+      failedExpectations: [],
+      passedExpectations: []
     });
   });
 
   it("should call the done callback on execution complete", function() {
     var done = jasmine.createSpy('done callback'),
       spec = new j$.Spec({
-        fn: function() {},
+        queueableFn: { fn: function() {} },
         catchExceptions: function() { return false; },
         resultCallback: function() {},
         queueRunnerFactory: function(attrs) { attrs.onComplete(); }
@@ -190,118 +193,53 @@ describe("Spec", function() {
   });
 
   it("#status returns passing by default", function() {
-    var spec = new j$.Spec({fn: jasmine.createSpy("spec body")});
-    expect(spec.status()).toEqual('passed');
+    var spec = new j$.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({fn: jasmine.createSpy("spec body")});
+    var spec = new j$.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({ fn: jasmine.createSpy("spec body") });
+    var spec = new j$.Spec({queueableFn: { fn: jasmine.createSpy("spec body") } });
     spec.addExpectationResult(true);
     spec.addExpectationResult(false);
     expect(spec.status()).toBe('failed');
   });
 
+  it("keeps track of passed and failed expectations", function() {
+    var resultCallback = jasmine.createSpy('resultCallback'),
+      spec = new j$.Spec({
+        queueableFn: { fn: jasmine.createSpy("spec body") },
+        expectationResultFactory: function (data) { return data; },
+        queueRunnerFactory: function(attrs) { attrs.onComplete(); },
+        resultCallback: resultCallback
+      });
+    spec.addExpectationResult(true, 'expectation1');
+    spec.addExpectationResult(false, 'expectation2');
+
+    spec.execute();
+
+    expect(resultCallback.calls.first().args[0].passedExpectations).toEqual(['expectation1']);
+    expect(resultCallback.calls.first().args[0].failedExpectations).toEqual(['expectation2']);
+  });
+
   it("can return its full name", function() {
     var specNameSpy = jasmine.createSpy('specNameSpy').and.returnValue('expected val');
 
     var spec = new j$.Spec({
-      getSpecName: specNameSpy
+      getSpecName: specNameSpy,
+      queueableFn: { fn: null }
     });
 
     expect(spec.getFullName()).toBe('expected val');
     expect(specNameSpy.calls.mostRecent().args[0].id).toEqual(spec.id);
   });
 
-  it("sets a timeout for async functions to keep them from running forever", function() {
-    var queueRunnerSpy = jasmine.createSpy('queue runner'),
-      setTimeoutSpy = jasmine.createSpy('setTimeout'),
-      spec = new j$.Spec({
-        beforeFns: function() { return [function(done) { }]; },
-        fn: function(done) { },
-        afterFns: function() { return [function(done) { }]; },
-        timer: {
-          setTimeout: setTimeoutSpy,
-          clearTimeout: function() {}
-        },
-        queueRunnerFactory: queueRunnerSpy
-      });
-
-    spec.execute();
-    var fns = queueRunnerSpy.calls.mostRecent().args[0].fns;
-
-    for (var i = 0; i < fns.length; i++) {
-      fns[i]();
-    }
-
-    expect(setTimeoutSpy.calls.count()).toEqual(3);
-    expect(setTimeoutSpy).toHaveBeenCalledWith(jasmine.any(Function), j$.DEFAULT_TIMEOUT_INTERVAL);
-  });
-
-  it("resets the timeout timer when an async before throws an exception", function() {
-    var queueRunnerSpy = jasmine.createSpy('queueRunner'),
-      clearTimeoutSpy = jasmine.createSpy('clear timeout'),
-      spec = new j$.Spec({
-        beforeFns: function() { return [function(done) {}]; },
-        fn: function() { },
-        timer: {
-          setTimeout: function () { return 920; },
-          clearTimeout: clearTimeoutSpy
-        },
-        queueRunnerFactory: queueRunnerSpy
-      });
-
-    spec.execute();
-    queueRunnerSpy.calls.mostRecent().args[0].fns[0]();
-    queueRunnerSpy.calls.mostRecent().args[0].onException(new Error());
-
-    expect(clearTimeoutSpy).toHaveBeenCalledWith(920);
-  });
-
-  it("resets the timeout timer when an async spec throws an exception", function() {
-    var queueRunnerSpy = jasmine.createSpy('queueRunner'),
-      clearTimeoutSpy = jasmine.createSpy('clear timeout'),
-      spec = new j$.Spec({
-        fn: function(done) { },
-        timer: {
-          setTimeout: function () { return 920; },
-          clearTimeout: clearTimeoutSpy
-        },
-        queueRunnerFactory: queueRunnerSpy
-      });
-
-    spec.execute();
-    queueRunnerSpy.calls.mostRecent().args[0].fns[0]();
-    queueRunnerSpy.calls.mostRecent().args[0].onException(new Error());
-
-    expect(clearTimeoutSpy).toHaveBeenCalledWith(920);
-  });
-
-  it("resets the timeout timer when an async after spec throws an exception", function() {
-    var queueRunnerSpy = jasmine.createSpy('queueRunner'),
-      clearTimeoutSpy = jasmine.createSpy('clear timeout'),
-      spec = new j$.Spec({
-        fn: function() { },
-        afterFns: function() { return [function(done) {}]; },
-        timer: {
-          setTimeout: function () { return 920; },
-          clearTimeout: clearTimeoutSpy
-        },
-        queueRunnerFactory: queueRunnerSpy
-      });
-
-    spec.execute();
-    queueRunnerSpy.calls.mostRecent().args[0].fns[1]();
-    queueRunnerSpy.calls.mostRecent().args[0].onException(new Error());
-
-    expect(clearTimeoutSpy).toHaveBeenCalledWith(920);
-  });
-  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));
@@ -309,7 +247,7 @@ describe("Spec", function() {
         spec = new j$.Spec({
           description: 'my test',
           id: 'some-id',
-          fn: function() { },
+          queueableFn: { fn: function() { } },
           queueRunnerFactory: fakeQueueRunner
         });
 

spec/core/SpyRegistrySpec.js

@@ -0,0 +1,55 @@
+describe("SpyRegistry", function() {
+  describe("#spyOn", function() {
+    it("checks for the existence of the object", function() {
+      var spyRegistry = new j$.SpyRegistry();
+      expect(function() {
+        spyRegistry.spyOn(void 0, 'pants');
+      }).toThrowError(/could not find an object/);
+    });
+
+    it("checks for the existence of the method", function() {
+      var spyRegistry = new j$.SpyRegistry(),
+        subject = {};
+
+      expect(function() {
+        spyRegistry.spyOn(subject, 'pants');
+      }).toThrowError(/method does not exist/);
+    });
+
+    it("checks if it has already been spied upon", function() {
+      var spies = [],
+        spyRegistry = new j$.SpyRegistry({currentSpies: function() { return spies; }}),
+        subject = { spiedFunc: function() {} };
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+
+      expect(function() {
+        spyRegistry.spyOn(subject, 'spiedFunc');
+      }).toThrowError(/has already been spied upon/);
+    });
+
+    it("overrides the method on the object and returns the spy", function() {
+      var originalFunctionWasCalled = false,
+        spyRegistry = new j$.SpyRegistry(),
+        subject = { spiedFunc: function() { originalFunctionWasCalled = true; } };
+
+      var spy = spyRegistry.spyOn(subject, 'spiedFunc');
+
+      expect(subject.spiedFunc).toEqual(spy);
+    });
+  });
+
+  describe("#clearSpies", function() {
+    it("restores the original functions on the spied-upon objects", function() {
+      var spies = [],
+        spyRegistry = new j$.SpyRegistry({currentSpies: function() { return spies; }}),
+        originalFunction = function() {},
+        subject = { spiedFunc: originalFunction };
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+      spyRegistry.clearSpies();
+
+      expect(subject.spiedFunc).toBe(originalFunction);
+    });
+  });
+});

spec/core/SpySpec.js

@@ -47,6 +47,16 @@ describe('Spies', function () {
 
       expect(trackSpy.calls.mostRecent().args[0].object).toEqual(contextObject);
     });
+
+    it("tracks the return value of calls", function () {
+      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var trackSpy = spyOn(spy.calls, "track");
+
+      spy.and.returnValue("return value");
+      spy();
+
+      expect(trackSpy.calls.mostRecent().args[0].returnValue).toEqual("return value");
+    });
   });
 
   describe("createSpyObj", function() {

spec/core/SpyStrategySpec.js

@@ -46,6 +46,19 @@ describe("SpyStrategy", function() {
     expect(returnValue).toEqual(17);
   });
 
+  it("can return specified values in order specified when executed", function() {
+    var originalFn = jasmine.createSpy("original"),
+        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+
+    spyStrategy.returnValues('value1', 'value2', 'value3');
+
+    expect(spyStrategy.exec()).toEqual('value1');
+    expect(spyStrategy.exec()).toEqual('value2');
+    expect(spyStrategy.exec()).toBe('value3');
+    expect(spyStrategy.exec()).toBeUndefined();
+    expect(originalFn).not.toHaveBeenCalled();
+  });
+
   it("allows an exception to be thrown when executed", function() {
     var originalFn = jasmine.createSpy("original"),
         spyStrategy = new j$.SpyStrategy({fn: originalFn});

spec/core/SuiteSpec.js

@@ -52,6 +52,31 @@ 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({
@@ -67,12 +92,42 @@ describe("Suite", function() {
     expect(suite.afterFns).toEqual([innerAfter, outerAfter]);
   });
 
-  it("can be disabled", function() {
+  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
       });
 
@@ -80,12 +135,15 @@ describe("Suite", function() {
 
     expect(suite.disabled).toBe(true);
 
-    suite.execute();
+    suite.execute(onComplete);
 
     expect(fakeQueueRunner).not.toHaveBeenCalled();
+    expect(onStart).toHaveBeenCalled();
+    expect(resultCallback).toHaveBeenCalled();
+    expect(onComplete).toHaveBeenCalled();
   });
 
-  it("delegates execution of its specs and suites", function() {
+  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'),
@@ -101,22 +159,57 @@ describe("Suite", function() {
         queueRunner: fakeQueueRunner
       }),
       fakeSpec1 = {
-        execute: jasmine.createSpy('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].fns;
+    var parentSuiteFns = fakeQueueRunnerForParent.calls.mostRecent().args[0].queueableFns;
 
-    parentSuiteFns[0]();
+    parentSuiteFns[0].fn();
+    expect(beforeAllFn.fn).toHaveBeenCalled();
+    parentSuiteFns[1].fn();
     expect(fakeSpec1.execute).toHaveBeenCalled();
-    parentSuiteFns[1]();
+    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() {
@@ -130,7 +223,8 @@ describe("Suite", function() {
         queueRunner: fakeQueueRunner
       }),
       fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
+        execute: jasmine.createSpy('fakeSpec1'),
+        isExecutable: function() { return true; }
       };
 
     suite.execute();
@@ -174,9 +268,47 @@ describe("Suite", function() {
 
     expect(suiteResultsCallback).toHaveBeenCalledWith({
       id: suite.id,
-      status: '',
+      status: 'finished',
       description: "with a child suite",
-      fullName: "with a child suite"
+      fullName: "with a child suite",
+      failedExpectations: []
     });
   });
+
+  it("calls a provided result callback with status being disabled when disabled and done", function() {
+    var env = new j$.Env(),
+      suiteResultsCallback = jasmine.createSpy('suite result callback'),
+      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
+      suite = new j$.Suite({
+        env: env,
+        description: "with a child suite",
+        queueRunner: fakeQueueRunner,
+        resultCallback: suiteResultsCallback
+      }),
+      fakeSpec1 = {
+        execute: jasmine.createSpy('fakeSpec1')
+      };
+
+    suite.disable();
+
+    suite.execute();
+
+    expect(suiteResultsCallback).toHaveBeenCalledWith({
+      id: suite.id,
+      status: 'disabled',
+      description: "with a child suite",
+      fullName: "with a child suite",
+      failedExpectations: []
+    });
+  });
+
+  it('has a status of failed if any afterAll expectations have failed', function() {
+    var suite = new j$.Suite({
+      expectationResultFactory: function() { return 'hi'; }
+    });
+    suite.addChild({ result: { status: 'done' } });
+
+    suite.addExpectationResult(false);
+    expect(suite.status()).toBe('failed');
+  });
 });

spec/core/TimerSpec.js

@@ -10,4 +10,22 @@ describe("Timer", function() {
 
     expect(timer.elapsed()).toEqual(100);
   });
+
+  describe("when date is stubbed, perhaps by other testing helpers", function() {
+    var origDate = Date;
+    beforeEach(function() {
+      Date = jasmine.createSpy('date spy');
+    });
+
+    afterEach(function() {
+      Date = origDate;
+    });
+
+    it("does not throw even though Date was taken away", function() {
+      var timer = new j$.Timer();
+
+      expect(timer.start).not.toThrow();
+      expect(timer.elapsed()).toEqual(jasmine.any(Number));
+    });
+  });
 });

spec/core/integration/CustomMatchersSpec.js

@@ -38,13 +38,13 @@ describe("Custom Matchers (Integration)", function() {
   });
 
   it("passes the spec if the custom matcher passes", function(done) {
-    env.addMatchers({
-      toBeReal: function() {
-        return { compare: function() { return { pass: true }; } };
-      }
-    });
-
     env.it("spec using custom matcher", function() {
+      env.addMatchers({
+        toBeReal: function() {
+          return { compare: function() { return { pass: true }; } };
+        }
+      });
+
       env.expect(true).toBeReal();
     });
 
@@ -57,16 +57,16 @@ describe("Custom Matchers (Integration)", function() {
   });
 
   it("uses the negative compare function for a negative comparison, if provided", function(done) {
-    env.addMatchers({
-      toBeReal: function() {
-        return {
-          compare: function() { return { pass: true }; },
-          negativeCompare: function() { return { pass: true }; }
-        };
-      }
-    });
-
     env.it("spec with custom negative comparison matcher", function() {
+      env.addMatchers({
+        toBeReal: function() {
+          return {
+            compare: function() { return { pass: true }; },
+            negativeCompare: function() { return { pass: true }; }
+          };
+        }
+      });
+
       env.expect(true).not.toBeReal();
     });
 
@@ -79,17 +79,17 @@ describe("Custom Matchers (Integration)", function() {
   });
 
   it("generates messages with the same rules as built in matchers absent a custom message", function(done) {
-    env.addMatchers({
-      toBeReal: function() {
-        return {
-          compare: function() {
-            return { pass: false };
+    env.it('spec with an expectation', function() {
+      env.addMatchers({
+        toBeReal: function() {
+          return {
+            compare: function() {
+              return { pass: false };
+            }
           }
         }
-      }
-    });
+      });
 
-    env.it('spec with an expectation', function() {
       env.expect("a").toBeReal();
     });
 
@@ -103,13 +103,14 @@ describe("Custom Matchers (Integration)", function() {
 
   it("passes the expected and actual arguments to the comparison function", function(done) {
     var argumentSpy = jasmine.createSpy("argument spy").and.returnValue({ pass: true });
-    env.addMatchers({
-      toBeReal: function() {
-        return { compare: argumentSpy };
-      }
-    });
 
     env.it('spec with an expectation', function () {
+      env.addMatchers({
+        toBeReal: function() {
+          return { compare: argumentSpy };
+        }
+      });
+
       env.expect(true).toBeReal();
       env.expect(true).toBeReal("arg");
       env.expect(true).toBeReal("arg1", "arg2");
@@ -130,12 +131,13 @@ describe("Custom Matchers (Integration)", function() {
         argumentSpy = jasmine.createSpy("argument spy").and.returnValue(matcherFactory),
         customEqualityFn = function() { return true; };
 
-    env.addCustomEqualityTester(customEqualityFn);
-    env.addMatchers({
-      toBeReal: argumentSpy
-    });
 
     env.it("spec with expectation", function() {
+      env.addCustomEqualityTester(customEqualityFn);
+      env.addMatchers({
+        toBeReal: argumentSpy
+      });
+
       env.expect(true).toBeReal();
     });
 

spec/core/integration/SpecRunningSpec.js

@@ -159,7 +159,7 @@ describe("jasmine spec running", function () {
       ];
       expect(actions).toEqual(expected);
       done();
-    }
+    };
 
     env.addReporter({jasmineDone: assertions});
 
@@ -228,6 +228,257 @@ describe("jasmine spec running", function () {
     env.execute();
   });
 
+  it('should run beforeAlls before beforeEachs and afterAlls after afterEachs', function() {
+    var actions = [];
+
+    env.beforeAll(function() {
+      actions.push('runner beforeAll');
+    });
+
+    env.afterAll(function() {
+      actions.push('runner afterAll');
+    });
+
+    env.beforeEach(function () {
+      actions.push('runner beforeEach');
+    });
+
+    env.afterEach(function () {
+      actions.push('runner afterEach');
+    });
+
+    env.describe('Something', function() {
+      env.beforeEach(function() {
+        actions.push('inner beforeEach');
+      });
+
+      env.afterEach(function() {
+        actions.push('inner afterEach');
+      });
+
+      env.beforeAll(function() {
+        actions.push('inner beforeAll');
+      });
+
+      env.afterAll(function() {
+        actions.push('inner afterAll');
+      });
+
+      env.it('does something or other', function() {
+        actions.push('it');
+      });
+    });
+
+    var assertions = function() {
+      var expected = [
+        "runner beforeAll",
+        "inner beforeAll",
+        "runner beforeEach",
+        "inner beforeEach",
+        "it",
+        "inner afterEach",
+        "runner afterEach",
+        "inner afterAll",
+        "runner afterAll"
+      ];
+      expect(actions).toEqual(expected);
+      done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+    env.execute();
+  });
+
+  it('should run beforeAlls and afterAlls as beforeEachs and afterEachs in the order declared when runnablesToRun is provided', function() {
+    var actions = [],
+      spec,
+      spec2;
+
+    env.beforeAll(function() {
+      actions.push('runner beforeAll');
+    });
+
+    env.afterAll(function() {
+      actions.push('runner afterAll');
+    });
+
+    env.beforeEach(function () {
+      actions.push('runner beforeEach');
+    });
+
+    env.afterEach(function () {
+      actions.push('runner afterEach');
+    });
+
+    env.describe('Something', function() {
+      env.beforeEach(function() {
+        actions.push('inner beforeEach');
+      });
+
+      env.afterEach(function() {
+        actions.push('inner afterEach');
+      });
+
+      env.beforeAll(function() {
+        actions.push('inner beforeAll');
+      });
+
+      env.afterAll(function() {
+        actions.push('inner afterAll');
+      });
+
+      spec = env.it('does something', function() {
+        actions.push('it');
+      });
+
+      spec2 = env.it('does something or other', function() {
+        actions.push('it2');
+      });
+    });
+
+    var assertions = function() {
+      var expected = [
+        "runner beforeAll",
+        "inner beforeAll",
+        "runner beforeEach",
+        "inner beforeEach",
+        "it",
+        "inner afterEach",
+        "runner afterEach",
+        "inner afterAll",
+        "runner afterAll",
+
+        "runner beforeAll",
+        "inner beforeAll",
+        "runner beforeEach",
+        "inner beforeEach",
+        "it2",
+        "inner afterEach",
+        "runner afterEach",
+        "inner afterAll",
+        "runner afterAll"
+      ];
+      expect(actions).toEqual(expected);
+      done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+    env.execute([spec.id, spec2.id]);
+  });
+
+  describe('focused runnables', function() {
+    it('runs the relevant alls and eachs for each runnable', function(done) {
+      var actions = [];
+      env.beforeAll(function() {actions.push('beforeAll')});
+      env.afterAll(function() {actions.push('afterAll')});
+      env.beforeEach(function() {actions.push('beforeEach')});
+      env.afterEach(function() {actions.push('afterEach')});
+
+      env.fdescribe('a focused suite', function() {
+        env.it('is run', function() {
+          actions.push('spec in fdescribe')
+        });
+      });
+
+      env.describe('an unfocused suite', function() {
+        env.fit('has a focused spec', function() {
+          actions.push('focused spec')
+        });
+      });
+
+      var assertions = function() {
+        var expected = [
+          'beforeAll',
+          'beforeEach',
+          'spec in fdescribe',
+          'afterEach',
+          'afterAll',
+
+          'beforeAll',
+          'beforeEach',
+          'focused spec',
+          'afterEach',
+          'afterAll'
+        ];
+        expect(actions).toEqual(expected);
+        done();
+      };
+
+      env.addReporter({jasmineDone: assertions});
+      env.execute();
+    });
+
+    it('focused specs in focused suites cause non-focused siblings to not run', function(done){
+      var actions = [];
+
+      env.fdescribe('focused suite', function() {
+        env.it('unfocused spec', function() {
+          actions.push('unfocused spec')
+        });
+        env.fit('focused spec', function() {
+          actions.push('focused spec')
+        });
+      });
+
+      var assertions = function() {
+        var expected = ['focused spec'];
+        expect(actions).toEqual(expected);
+        done();
+      };
+
+      env.addReporter({jasmineDone: assertions});
+      env.execute();
+    });
+
+    it('focused suites in focused suites cause non-focused siblings to not run', function(done){
+      var actions = [];
+
+      env.fdescribe('focused suite', function() {
+        env.it('unfocused spec', function() {
+          actions.push('unfocused spec')
+        });
+        env.fdescribe('inner focused suite', function() {
+          env.it('inner spec', function() {
+            actions.push('inner spec');
+          });
+        });
+      });
+
+      var assertions = function() {
+        var expected = ['inner spec'];
+        expect(actions).toEqual(expected);
+        done();
+      };
+
+      env.addReporter({jasmineDone: assertions});
+      env.execute();
+    });
+
+    it('focused runnables unfocus ancestor focused suites', function() {
+      var actions = [];
+
+      env.fdescribe('focused suite', function() {
+        env.it('unfocused spec', function() {
+          actions.push('unfocused spec')
+        });
+        env.describe('inner focused suite', function() {
+          env.fit('focused spec', function() {
+            actions.push('focused spec');
+          });
+        });
+      });
+
+      var assertions = function() {
+        var expected = ['focused spec'];
+        expect(actions).toEqual(expected);
+        done();
+      };
+
+      env.addReporter({jasmineDone: assertions});
+      env.execute();
+    });
+  });
+
   it("shouldn't run disabled suites", function(done) {
     var specInADisabledSuite = jasmine.createSpy("specInADisabledSuite"),
     suite = env.describe('A Suite', function() {
@@ -236,10 +487,36 @@ describe("jasmine spec running", function () {
       });
     });
 
-    suite.execute(function() {
+    var assertions = function() {
       expect(specInADisabledSuite).not.toHaveBeenCalled();
       done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+
+    env.execute();
+  });
+
+  it("should allow top level suites to be disabled", function() {
+    var specInADisabledSuite = jasmine.createSpy("specInADisabledSuite"),
+      otherSpec = jasmine.createSpy("otherSpec");
+
+    env.xdescribe('A disabled suite', function() {
+      env.it('spec inside a disabled suite', specInADisabledSuite);
     });
+    env.describe('Another suite', function() {
+      env.it('another spec', otherSpec);
+    });
+
+    var assertions = function() {
+      expect(specInADisabledSuite).not.toHaveBeenCalled();
+      expect(otherSpec).toHaveBeenCalled();
+      done();
+    };
+
+    env.addReporter({jasmineDone: assertions});
+
+    env.execute();
   });
 
   it("should set all pending specs to pending when a suite is run", function(done) {
@@ -254,7 +531,6 @@ describe("jasmine spec running", function () {
     });
   });
 
-
   // TODO: is this useful? It doesn't catch syntax errors
   xit("should recover gracefully when there are errors in describe functions", function() {
     var specs = [];

spec/core/matchers/matchersUtilSpec.js

@@ -174,7 +174,7 @@ describe("matchersUtil", function() {
 
   describe("contains", function() {
     it("passes when expected is a substring of actual", function() {
-      expect(j$.matchersUtil.contains("ABC", "B")).toBe(true);
+      expect(j$.matchersUtil.contains("ABC", "BC")).toBe(true);
     });
 
     it("fails when expected is a not substring of actual", function() {
@@ -199,6 +199,23 @@ describe("matchersUtil", function() {
 
       expect(j$.matchersUtil.contains([1, 2], 2, [customTester])).toBe(true);
     });
+
+    it("fails when actual is undefined", function() {
+      expect(j$.matchersUtil.contains(undefined, 'A')).toBe(false);
+    });
+
+    it("fails when actual is null", function() {
+      expect(j$.matchersUtil.contains(null, 'A')).toBe(false);
+    });
+
+    it("passes with array-like objects", function() {
+      var capturedArgs = null;
+      function testFunction(){
+        capturedArgs = arguments;
+      }
+      testFunction('foo', 'bar');
+      expect(j$.matchersUtil.contains(capturedArgs, 'bar')).toBe(true);
+    });
   });
 
   describe("buildMessage", function() {

spec/core/matchers/toBeGreaterThanSpec.js

@@ -8,7 +8,8 @@ describe("toBeGreaterThan", function() {
   });
 
   it("fails when actual <= expected", function() {
-    var matcher = j$.matchers.toBeGreaterThan();
+    var matcher = j$.matchers.toBeGreaterThan(),
+      result;
 
     result = matcher.compare(1, 1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeNaNSpec.js

@@ -9,7 +9,8 @@ describe("toBeNaN", function() {
   });
 
   it("fails for anything not a NaN", function() {
-    var matcher = j$.matchers.toBeNaN();
+    var matcher = j$.matchers.toBeNaN(),
+      result;
 
     result = matcher.compare(1);
     expect(result.pass).toBe(false);
@@ -31,6 +32,6 @@ describe("toBeNaN", function() {
     var matcher = j$.matchers.toBeNaN(),
       result = matcher.compare(0);
 
-    expect(result.message).toEqual("Expected 0 to be NaN.");
+    expect(result.message()).toEqual("Expected 0 to be NaN.");
   });
 });

spec/core/matchers/toBeUndefinedSpec.js

@@ -9,7 +9,8 @@ describe("toBeUndefined", function() {
   });
 
   it("fails when matching defined values", function() {
-    var matcher = j$.matchers.toBeUndefined();
+    var matcher = j$.matchers.toBeUndefined(),
+      result;
 
     result = matcher.compare('foo');
     expect(result.pass).toBe(false);

spec/core/matchers/toContainSpec.js

@@ -3,7 +3,8 @@ describe("toContain", function() {
     var util = {
         contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
       },
-      matcher = j$.matchers.toContain(util);
+      matcher = j$.matchers.toContain(util),
+      result;
 
     result = matcher.compare("ABC", "B");
     expect(util.contains).toHaveBeenCalledWith("ABC", "B", []);
@@ -15,7 +16,8 @@ describe("toContain", function() {
         contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
       },
       customEqualityTesters = ['a', 'b'],
-      matcher = j$.matchers.toContain(util, customEqualityTesters);
+      matcher = j$.matchers.toContain(util, customEqualityTesters),
+      result;
 
     result = matcher.compare("ABC", "B");
     expect(util.contains).toHaveBeenCalledWith("ABC", "B", ['a', 'b']);

spec/core/matchers/toHaveBeenCalledSpec.js

@@ -13,7 +13,8 @@ describe("toHaveBeenCalled", function() {
 
   it("fails when the actual was not called", function() {
     var matcher = j$.matchers.toHaveBeenCalled(),
-      uncalledSpy = j$.createSpy('uncalled spy');
+      uncalledSpy = j$.createSpy('uncalled spy'),
+      result;
 
     result = matcher.compare(uncalledSpy);
     expect(result.pass).toBe(false);

spec/core/matchers/toHaveBeenCalledWithSpec.js

@@ -11,7 +11,21 @@ describe("toHaveBeenCalledWith", function() {
     result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected spy called-spy not to have been called with [ 'a', 'b' ] but it was.");
+    expect(result.message()).toEqual("Expected spy called-spy not to have been called with [ 'a', 'b' ] but it was.");
+  });
+
+  it("passes through the custom equality testers", function() {
+    var util = {
+          contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
+        },
+        customEqualityTesters = [function() { return true; }],
+        matcher = j$.matchers.toHaveBeenCalledWith(util, customEqualityTesters),
+        calledSpy = j$.createSpy('called-spy');
+
+    calledSpy('a', 'b');
+    matcher.compare(calledSpy, 'a', 'b');
+
+    expect(util.contains).toHaveBeenCalledWith([['a', 'b']], ['a', 'b'], customEqualityTesters);
   });
 
   it("fails when the actual was not called", function() {
@@ -24,7 +38,7 @@ describe("toHaveBeenCalledWith", function() {
 
     result = matcher.compare(uncalledSpy);
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected spy uncalled spy to have been called with [  ] but it was never called.");
+    expect(result.message()).toEqual("Expected spy uncalled spy to have been called with [  ] but it was never called.");
   });
 
   it("fails when the actual was called with different parameters", function() {
@@ -40,7 +54,7 @@ describe("toHaveBeenCalledWith", function() {
     result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected spy called spy to have been called with [ 'a', 'b' ] but actual calls were [ 'a' ], [ 'c', 'd' ].");
+    expect(result.message()).toEqual("Expected spy called spy to have been called with [ 'a', 'b' ] but actual calls were [ 'a' ], [ 'c', 'd' ].");
   });
 
   it("throws an exception when the actual is not a spy", function() {

spec/core/matchers/toThrowErrorSpec.js

@@ -62,7 +62,7 @@ describe("toThrowError", function() {
 
     result = matcher.compare(fn);
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw an Error, but it threw 4.");
+    expect(result.message()).toEqual("Expected function to throw an Error, but it threw 4.");
   });
 
   it("fails with the correct message if thrown is a falsy value", function() {
@@ -74,7 +74,7 @@ describe("toThrowError", function() {
 
     result = matcher.compare(fn);
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw an Error, but it threw undefined.");
+    expect(result.message()).toEqual("Expected function to throw an Error, but it threw undefined.");
   });
 
   it("passes if thrown is a type of Error, but there is no expected error", function() {
@@ -100,7 +100,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, "foo");
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw an exception with message 'foo'.");
+    expect(result.message()).toEqual("Expected function not to throw an exception with message 'foo'.");
   });
 
   it("fails if thrown is an Error and the expected is not the same message", function() {
@@ -113,7 +113,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, "bar");
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw an exception with message 'bar', but it threw an exception with message 'foo'.");
+    expect(result.message()).toEqual("Expected function to throw an exception with message 'bar', but it threw an exception with message 'foo'.");
   });
 
   it("passes if thrown is an Error and the expected is a RegExp that matches the message", function() {
@@ -126,7 +126,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, /long/);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw an exception with a message matching /long/.");
+    expect(result.message()).toEqual("Expected function not to throw an exception with a message matching /long/.");
   });
 
   it("fails if thrown is an Error and the expected is a RegExp that does not match the message", function() {
@@ -139,7 +139,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, /foo/);
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw an exception with a message matching /foo/, but it threw an exception with message 'a long message'.");
+    expect(result.message()).toEqual("Expected function to throw an exception with a message matching /foo/, but it threw an exception with message 'a long message'.");
   });
 
   it("passes if thrown is an Error and the expected the same Error", function() {
@@ -155,7 +155,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, Error);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw Error.");
+    expect(result.message()).toEqual("Expected function not to throw Error.");
   });
 
   it("passes if thrown is a custom error that takes arguments and the expected is the same error", function() {
@@ -175,7 +175,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, CustomError);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw CustomError.");
+    expect(result.message()).toEqual("Expected function not to throw CustomError.");
   });
 
   it("fails if thrown is an Error and the expected is a different Error", function() {
@@ -191,7 +191,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, TypeError);
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw TypeError, but it threw Error.");
+    expect(result.message()).toEqual("Expected function to throw TypeError, but it threw Error.");
   });
 
   it("passes if thrown is a type of Error and it is equal to the expected Error and message", function() {
@@ -207,7 +207,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, TypeError, "foo");
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw TypeError with message \"foo\".");
+    expect(result.message()).toEqual("Expected function not to throw TypeError with message 'foo'.");
   });
 
   it("passes if thrown is a custom error that takes arguments and it is equal to the expected custom error and message", function() {
@@ -227,7 +227,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, CustomError, "foo");
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw CustomError with message \"foo\".");
+    expect(result.message()).toEqual("Expected function not to throw CustomError with message 'foo'.");
   });
 
   it("fails if thrown is a type of Error and the expected is a different Error", function() {
@@ -243,7 +243,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, TypeError, "bar");
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw TypeError with message \"bar\", but it threw TypeError with message \"foo\".");
+    expect(result.message()).toEqual("Expected function to throw TypeError with message 'bar', but it threw TypeError with message 'foo'.");
   });
 
   it("passes if thrown is a type of Error and has the same type as the expected Error and the message matches the expected message", function() {
@@ -259,7 +259,7 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, TypeError, /foo/);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw TypeError with message matching /foo/.");
+    expect(result.message()).toEqual("Expected function not to throw TypeError with a message matching /foo/.");
   });
 
   it("fails if thrown is a type of Error and the expected is a different Error", function() {
@@ -275,6 +275,6 @@ describe("toThrowError", function() {
     result = matcher.compare(fn, TypeError, /bar/);
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw TypeError with message matching /bar/, but it threw TypeError with message \"foo\".");
+    expect(result.message()).toEqual("Expected function to throw TypeError with a message matching /bar/, but it threw TypeError with message 'foo'.");
   });
 });

spec/core/matchers/toThrowSpec.js

@@ -34,7 +34,7 @@ describe("toThrow", function() {
     result = matcher.compare(fn);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw, but it threw 5.");
+    expect(result.message()).toEqual("Expected function not to throw, but it threw 5.");
   });
 
   it("passes even if what is thrown is falsy", function() {
@@ -46,7 +46,7 @@ describe("toThrow", function() {
 
     result = matcher.compare(fn);
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw, but it threw undefined.");
+    expect(result.message()).toEqual("Expected function not to throw, but it threw undefined.");
   });
 
   it("passes if what is thrown is equivalent to what is expected", function() {
@@ -62,7 +62,7 @@ describe("toThrow", function() {
     result = matcher.compare(fn, 5);
 
     expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected function not to throw 5.");
+    expect(result.message()).toEqual("Expected function not to throw 5.");
   });
 
   it("fails if what is thrown is not equivalent to what is expected", function() {
@@ -78,7 +78,7 @@ describe("toThrow", function() {
     result = matcher.compare(fn, "foo");
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw 'foo', but it threw 5.");
+    expect(result.message()).toEqual("Expected function to throw 'foo', but it threw 5.");
   });
 
   it("fails if what is thrown is not equivalent to undefined", function() {
@@ -94,6 +94,6 @@ describe("toThrow", function() {
     result = matcher.compare(fn, void 0);
 
     expect(result.pass).toBe(false);
-    expect(result.message).toEqual("Expected function to throw undefined, but it threw 5.");
+    expect(result.message()).toEqual("Expected function to throw undefined, but it threw 5.");
   });
 });

spec/helpers/defineJasmineUnderTest.js

@@ -0,0 +1,7 @@
+(function() {
+  // By the time onload is called, jasmineRequire will be redefined to point
+  // to the Jasmine source files (and not jasmine.js). So re-require
+  window.j$ = jasmineRequire.core(jasmineRequire);
+  jasmineRequire.html(j$);
+  jasmineRequire.console(jasmineRequire, j$);
+})();

spec/helpers/nodeDefineJasmineUnderTest.js

@@ -0,0 +1,33 @@
+(function() {
+  var path = require("path"),
+    fs = require("fs");
+
+  var glob = require("glob");
+
+  var j$Require = require(path.join(__dirname, "../../src/core/requireCore.js"));
+
+  global.getJasmineRequireObj = function () {
+    return j$Require;
+  };
+
+  function extend(destination, source) {
+    for (var property in source) destination[property] = source[property];
+    return destination;
+  }
+
+  function getSourceFiles() {
+    var src_files = ['core/**/*.js', 'console/**/*.js', 'version.js'];
+    src_files.forEach(function(file) {
+      var filePath = path.join(__dirname, "../../", 'src/', file);
+      glob.sync(filePath).forEach(function(resolvedFile) {
+        require(resolvedFile);
+      });
+    });
+  }
+
+  extend(j$Require, require(path.join(__dirname,"../../src/console/requireConsole.js")));
+  getSourceFiles();
+  global.j$ = j$Require.core(j$Require);
+
+  j$Require.console(j$Require, j$);
+})();

spec/html/HtmlReporterSpec.js

@@ -13,7 +13,7 @@ describe("New HtmlReporter", function() {
     reporter.initialize();
 
     // Main top-level elements
-    expect(container.querySelector("div.html-reporter")).toBeTruthy();
+    expect(container.querySelector("div.jasmine_html-reporter")).toBeTruthy();
     expect(container.querySelector("div.banner")).toBeTruthy();
     expect(container.querySelector("div.alert")).toBeTruthy();
     expect(container.querySelector("div.results")).toBeTruthy();
@@ -23,18 +23,36 @@ describe("New HtmlReporter", function() {
     // title banner
     var banner = container.querySelector(".banner");
 
-    var title = banner.querySelector(".title");
-    expect(title.innerHTML).toMatch(/Jasmine/);
+    var title = banner.querySelector("a.title");
+    expect(title.getAttribute('href')).toEqual('http://jasmine.github.io/');
+    expect(title.getAttribute('target')).toEqual('_blank');
 
     var version = banner.querySelector(".version"),
       versionText = 'textContent' in version ? version.textContent : version.innerText;
     expect(versionText).toEqual(j$.version);
   });
 
+  it("builds a single reporter even if initialized multiple times", function() {
+    var env = new j$.Env(),
+      container = document.createElement("div"),
+      getContainer = function() { return container; },
+      reporter = new j$.HtmlReporter({
+        env: env,
+        getContainer: getContainer,
+        createElement: function() { return document.createElement.apply(document, arguments); },
+        createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+      });
+    reporter.initialize();
+    reporter.initialize();
+    reporter.initialize();
+
+    expect(container.querySelectorAll("div.jasmine_html-reporter").length).toEqual(1);
+  });
+
   it("starts the timer when jasmine begins", function() {
     var env = new jasmine.Env(),
         startTimerSpy = jasmine.createSpy("start-timer-spy"),
-        reporter = new jasmine.HtmlReporter({
+        reporter = new j$.HtmlReporter({
           env: env,
           createElement: function() { return document.createElement.apply(document, arguments); },
           timer: { start: startTimerSpy }
@@ -46,6 +64,36 @@ describe("New HtmlReporter", function() {
   });
 
   describe("when a spec is done", function() {
+    it("logs errors to the console and prints a special symbol if it is an empty spec", function() {
+      if (typeof console === "undefined") {
+        console = { error: function(){} };
+      }
+
+      var env = new j$.Env(),
+      container = document.createElement('div'),
+      getContainer = function() {return container;},
+      reporter = new j$.HtmlReporter({
+        env: env,
+        getContainer: getContainer,
+        createElement: function() { return document.createElement.apply(document, arguments); },
+        createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+      });
+
+      spyOn(console, 'error');
+
+      reporter.initialize();
+
+      reporter.specDone({
+        status: "passed",
+        fullName: 'Some Name',
+        passedExpectations: [],
+        failedExpectations: []
+      });
+      expect(console.error).toHaveBeenCalledWith("Spec \'Some Name\' has no expectations.");
+      var specEl = container.querySelector('.symbol-summary li');
+      expect(specEl.getAttribute("class")).toEqual("empty");
+    });
+
     it("reports the status symbol of a disabled spec", function() {
       var env = new j$.Env(),
         container = document.createElement("div"),
@@ -58,7 +106,7 @@ describe("New HtmlReporter", function() {
         });
       reporter.initialize();
 
-      reporter.specDone({id: 789, status: "disabled", fullName: "symbols should have titles"});
+      reporter.specDone({id: 789, status: "disabled", fullName: "symbols should have titles", passedExpectations: [], failedExpectations: []});
 
       var specEl = container.querySelector('.symbol-summary li');
       expect(specEl.getAttribute("class")).toEqual("disabled");
@@ -78,7 +126,7 @@ describe("New HtmlReporter", function() {
         });
       reporter.initialize();
 
-      reporter.specDone({id: 789, status: "pending"});
+      reporter.specDone({id: 789, status: "pending", passedExpectations: [], failedExpectations: []});
 
       var specEl = container.querySelector('.symbol-summary li');
       expect(specEl.getAttribute("class")).toEqual("pending");
@@ -97,7 +145,7 @@ describe("New HtmlReporter", function() {
         });
       reporter.initialize();
 
-      reporter.specDone({id: 123, status: "passed"});
+      reporter.specDone({id: 123, status: "passed", passedExpectations: [{passed: true}], failedExpectations: []});
 
       var statuses = container.querySelector(".symbol-summary");
       var specEl = statuses.querySelector("li");
@@ -121,7 +169,8 @@ describe("New HtmlReporter", function() {
       reporter.specDone({
         id: 345,
         status: "failed",
-        failedExpectations: []
+        failedExpectations: [],
+        passedExpectations: []
       });
 
       var specEl = container.querySelector(".symbol-summary li");
@@ -130,7 +179,73 @@ describe("New HtmlReporter", function() {
     });
   });
 
+  describe("when there are suite failures", function () {
+    it("displays the exceptions in their own alert bars", function(){
+      var env = new j$.Env(),
+        container = document.createElement("div"),
+        getContainer = function() { return container; },
+        reporter = new j$.HtmlReporter({
+          env: env,
+          getContainer: getContainer,
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
+
+      reporter.initialize();
+
+      reporter.jasmineStarted({});
+      reporter.suiteDone({ status: 'failed', failedExpectations: [{ message: 'My After All Exception' }] });
+      reporter.suiteDone({ status: 'failed', failedExpectations: [{ message: 'My Other Exception' }] });
+      reporter.jasmineDone({});
+
+      var alertBars = container.querySelectorAll(".alert .bar");
+
+      expect(alertBars.length).toEqual(3);
+      expect(alertBars[1].innerHTML).toMatch(/My After All Exception/);
+      expect(alertBars[1].getAttribute("class")).toEqual('bar errored');
+      expect(alertBars[2].innerHTML).toMatch(/My Other Exception/);
+    });
+  });
+
   describe("when Jasmine is done", function() {
+    it("adds EMPTY to the link title of specs that have no expectations", function() {
+      if (!window.console) {
+        window.console = { error: function(){} };
+      }
+      var env = new j$.Env(),
+      container = document.createElement('div'),
+      getContainer = function() {return container;},
+      reporter = new j$.HtmlReporter({
+        env: env,
+        getContainer: getContainer,
+        createElement: function() { return document.createElement.apply(document, arguments); },
+        createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+      });
+
+      spyOn(console, 'error');
+
+      reporter.initialize();
+      reporter.jasmineStarted({});
+      reporter.suiteStarted({id: 1});
+      reporter.specStarted({id: 1, status: 'passed', passedExpectations: [], failedExpectations: []});
+      reporter.specDone({
+        id: 1,
+        status: 'passed',
+        description: 'Spec Description',
+        passedExpectations: [],
+        failedExpectations: []
+      });
+      reporter.suiteDone({id: 1});
+      reporter.jasmineDone({});
+
+      var summary = container.querySelector('.summary');
+      var suite = summary.childNodes[0];
+      var specs = suite.childNodes[1];
+      var spec = specs.childNodes[0];
+      var specLink = spec.childNodes[0];
+      expect(specLink.innerHTML).toMatch(/SPEC HAS NO EXPECTATIONS/);
+    });
+
     it("reports the run time", function() {
       var env = new j$.Env(),
         container = document.createElement("div"),
@@ -178,7 +293,9 @@ describe("New HtmlReporter", function() {
         id: 123,
         description: "with a spec",
         fullName: "A Suite with a spec",
-        status: "passed"
+        status: "passed",
+        failedExpectations: [],
+        passedExpectations: [{passed: true}]
       };
       reporter.specStarted(specResult);
       reporter.specDone(specResult);
@@ -193,7 +310,9 @@ describe("New HtmlReporter", function() {
         id: 124,
         description: "with another spec",
         fullName: "A Suite inner suite with another spec",
-        status: "passed"
+        status: "passed",
+        failedExpectations: [],
+        passedExpectations: [{passed: true}]
       };
       reporter.specStarted(specResult);
       reporter.specDone(specResult);
@@ -205,7 +324,8 @@ describe("New HtmlReporter", function() {
         description: "with a failing spec",
         fullName: "A Suite inner with a failing spec",
         status: "failed",
-        failedExpectations: []
+        failedExpectations: [{}],
+        passedExpectations: []
       };
       reporter.specStarted(specResult);
       reporter.specDone(specResult);
@@ -321,12 +441,33 @@ describe("New HtmlReporter", function() {
       });
     });
 
+    it("shows a message if no specs are run", function(){
+      var env, container, reporter;
+      env = new j$.Env();
+      container = document.createElement("div");
+      var getContainer = function() { return container; },
+      reporter = new j$.HtmlReporter({
+        env: env,
+        getContainer: getContainer,
+        createElement: function() { return document.createElement.apply(document, arguments); },
+        createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+      });
+      reporter.initialize();
+
+      reporter.jasmineStarted({});
+      reporter.jasmineDone({});
+
+      var alertBars = container.querySelectorAll(".alert .bar");
+      expect(alertBars[0].getAttribute('class')).toMatch(/skipped/);
+      expect(alertBars[0].innerHTML).toMatch(/No specs found/);
+    });
+
     describe("and all specs pass", function() {
       var env, container, reporter;
       beforeEach(function() {
         env = new j$.Env();
         container = document.createElement("div");
-        getContainer = function() { return container; },
+        var getContainer = function() { return container; },
           reporter = new j$.HtmlReporter({
             env: env,
             getContainer: getContainer,
@@ -335,18 +476,22 @@ describe("New HtmlReporter", function() {
           });
         reporter.initialize();
 
-        reporter.jasmineStarted({});
+        reporter.jasmineStarted({ totalSpecsDefined: 2 });
         reporter.specDone({
           id: 123,
           description: "with a spec",
           fullName: "A Suite with a spec",
-          status: "passed"
+          status: "passed",
+          passedExpectations: [{passed: true}],
+          failedExpectations: []
         });
         reporter.specDone({
           id: 124,
           description: "with another spec",
           fullName: "A Suite inner suite with another spec",
-          status: "passed"
+          status: "passed",
+          passedExpectations: [{passed: true}],
+          failedExpectations: []
         });
         reporter.jasmineDone({});
       });
@@ -377,21 +522,23 @@ describe("New HtmlReporter", function() {
       beforeEach(function() {
         env = new j$.Env();
         container = document.createElement("div");
-        getContainer = function() { return container; },
-          reporter = new j$.HtmlReporter({
-            env: env,
-            getContainer: getContainer,
-            createElement: function() { return document.createElement.apply(document, arguments); },
-            createTextNode: function() { return document.createTextNode.apply(document, arguments); }
-          });
+        var getContainer = function() { return container; };
+        reporter = new j$.HtmlReporter({
+          env: env,
+          getContainer: getContainer,
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
         reporter.initialize();
 
-        reporter.jasmineStarted({});
+        reporter.jasmineStarted({ totalSpecsDefined: 1 });
         reporter.specDone({
           id: 123,
           description: "with a spec",
           fullName: "A Suite with a spec",
-          status: "pending"
+          status: "pending",
+          passedExpectations: [],
+          failedExpectations: []
         });
         reporter.jasmineDone({});
       });
@@ -414,19 +561,19 @@ describe("New HtmlReporter", function() {
 
       beforeEach(function() {
         env = new j$.Env();
-        container = document.createElement("div"),
-        getContainer = function() { return container; },
-          reporter = new j$.HtmlReporter({
-            env: env,
-            getContainer: getContainer,
-            createElement: function() { return document.createElement.apply(document, arguments); },
-            createTextNode: function() { return document.createTextNode.apply(document, arguments); }
-          });
+        container = document.createElement("div");
+        var getContainer = function() { return container; }
+        reporter = new j$.HtmlReporter({
+          env: env,
+          getContainer: getContainer,
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
         reporter.initialize();
 
-        reporter.jasmineStarted({});
+        reporter.jasmineStarted({ totalSpecsDefined: 1 });
 
-        var passingResult = {id: 123, status: "passed"};
+        var passingResult = {id: 123, status: "passed", passedExpectations: [{passed: true}], failedExpectations: []};
         reporter.specStarted(passingResult);
         reporter.specDone(passingResult);
 
@@ -435,6 +582,7 @@ describe("New HtmlReporter", function() {
           status: "failed",
           description: "a failing spec",
           fullName: "a suite with a failing spec",
+          passedExpectations: [],
           failedExpectations: [
             {
               message: "a failure message",
@@ -488,7 +636,7 @@ describe("New HtmlReporter", function() {
       });
 
       it("sets the reporter to 'Failures List' mode", function() {
-        var reporterNode = container.querySelector(".html-reporter");
+        var reporterNode = container.querySelector(".jasmine_html-reporter");
         expect(reporterNode.getAttribute("class")).toMatch("failure-list");
       });
     });

spec/html/PrettyPrintHtmlSpec.js

@@ -3,7 +3,7 @@ describe("j$.pp (HTML Dependent)", function () {
     var sampleNode = document.createElement('div');
     sampleNode.innerHTML = 'foo<b>bar</b>';
     expect(j$.pp(sampleNode)).toEqual("HTMLNode");
-    expect(j$.pp({foo: sampleNode})).toEqual("{ foo : HTMLNode }");
+    expect(j$.pp({foo: sampleNode})).toEqual("{ foo: HTMLNode }");
   });
 
   it("should print Firefox's wrapped native objects correctly", function() {

spec/node_suite.js

@@ -47,7 +47,15 @@ var jasmineInterface = {
 
   jsApiReporter: new jasmine.JsApiReporter({
     timer: new jasmine.Timer()
-  })
+  }),
+
+  beforeAll: function(beforeAllFunction) {
+    return env.beforeAll(beforeAllFunction);
+  },
+
+  afterAll: function(afterAllFunction) {
+    return env.afterAll(afterAllFunction);
+  }
 };
 
 extend(global, jasmineInterface);

spec/npmPackage/npmPackageSpec.js

@@ -0,0 +1,104 @@
+describe('npm package', function() {
+  var path = require('path'),
+      fs = require('fs');
+
+  beforeAll(function() {
+    var shell = require('shelljs'),
+        pack = shell.exec('npm pack', { silent: true });
+
+    this.tarball = pack.output.split('\n')[0];
+    this.tmpDir = '/tmp/jasmine-core';
+
+    fs.mkdirSync(this.tmpDir);
+
+    var untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, { silent: true });
+    expect(untar.code).toBe(0);
+
+    this.packagedCore = require(path.join(this.tmpDir, 'package/lib/jasmine-core.js'));
+  });
+
+  beforeEach(function() {
+    jasmine.addMatchers({
+      toExistInPath: function(util, customEquality) {
+        return {
+          compare: function(actual, expected) {
+            var fullPath = path.resolve(expected, actual);
+            return {
+              pass: fs.existsSync(fullPath)
+            };
+          }
+        };
+      }
+    });
+  });
+
+  afterAll(function() {
+    var cleanup = function (parent, fileOrFolder) {
+      var fullPath = path.join(parent, fileOrFolder);
+      if (fs.statSync(fullPath).isFile()) {
+        fs.unlinkSync(fullPath);
+      } else {
+        fs.readdirSync(fullPath).forEach(cleanup.bind(null, fullPath));
+        fs.rmdirSync(fullPath);
+      }
+    };
+
+    fs.unlink(this.tarball);
+    fs.readdirSync(this.tmpDir).forEach(cleanup.bind(null, this.tmpDir));
+    fs.rmdirSync(this.tmpDir);
+  });
+
+  it('has a root path', function() {
+    expect(this.packagedCore.files.path).toEqual(fs.realpathSync(path.resolve(this.tmpDir, 'package/lib/jasmine-core')));
+  });
+
+  it('has a bootDir', function() {
+    expect(this.packagedCore.files.bootDir).toEqual(fs.realpathSync(path.resolve(this.tmpDir, 'package/lib/jasmine-core')));
+  });
+
+  it('has jsFiles', function() {
+    expect(this.packagedCore.files.jsFiles).toEqual([
+      'jasmine.js',
+      'jasmine-html.js',
+      'json2.js'
+    ]);
+
+    var packagedCore = this.packagedCore;
+    this.packagedCore.files.jsFiles.forEach(function(fileName) {
+      expect(fileName).toExistInPath(packagedCore.files.path);
+    });
+  });
+
+  it('has cssFiles', function() {
+    expect(this.packagedCore.files.cssFiles).toEqual(['jasmine.css']);
+
+    var packagedCore = this.packagedCore;
+    this.packagedCore.files.cssFiles.forEach(function(fileName) {
+      expect(fileName).toExistInPath(packagedCore.files.path);
+    });
+  });
+
+  it('has bootFiles', function() {
+    expect(this.packagedCore.files.bootFiles).toEqual(['boot.js']);
+    expect(this.packagedCore.files.nodeBootFiles).toEqual(['node_boot.js']);
+
+    var packagedCore = this.packagedCore;
+    this.packagedCore.files.bootFiles.forEach(function(fileName) {
+      expect(fileName).toExistInPath(packagedCore.files.bootDir);
+    });
+
+    var packagedCore = this.packagedCore;
+    this.packagedCore.files.nodeBootFiles.forEach(function(fileName) {
+      expect(fileName).toExistInPath(packagedCore.files.bootDir);
+    });
+  });
+
+  it('has an imagesDir', function() {
+    expect(this.packagedCore.files.imagesDir).toEqual(fs.realpathSync(path.resolve(this.tmpDir, 'package/images')));
+    var images = fs.readdirSync(path.resolve(this.tmpDir, 'package/images'));
+
+    expect(images).toContain('jasmine-horizontal.png');
+    expect(images).toContain('jasmine-horizontal.svg');
+    expect(images).toContain('jasmine_favicon.png');
+  });
+});

spec/performance/large_object_test.js

@@ -0,0 +1,36 @@
+describe('Printing a big object', function(){
+  var bigObject;
+  function rand(upper) {
+    return Math.round(upper * Math.random());
+  }
+
+  function generateObject(level) {
+    var object = {};
+
+    for (var i = 0; i < 50; i++) {
+      var decide = rand(2);
+      switch (decide) {
+        case 0:
+          object["cycle" + i] = object;
+        break;
+        case 1:
+          object["number" + i] = rand(100);
+        break;
+        case 2:
+          if (level < 3) {
+          object["nesting" + i] = generateObject(level + 1);
+        }
+        break;
+      }
+
+    }
+
+    return object;
+  }
+
+  it('takes a resonable amount of time', function(){
+    bigObject = generateObject(0);
+    expect(j$.pp(bigObject)).toMatch(/cycle/);
+  });
+});
+

spec/support/dev_boot.js

@@ -1,124 +0,0 @@
-// Jasmine boot.js for browser runners - exposes external/global interface, builds the Jasmine environment and executes it.
-(function() {
-
-  window.jasmine = jasmineRequire.core(jasmineRequire);
-  jasmineRequire.html(jasmine);
-
-  var env = jasmine.getEnv();
-
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    jsApiReporter: new jasmine.JsApiReporter({
-      timer: new jasmine.Timer()
-    })
-  };
-
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
-
-  jasmine.addCustomEqualityTester = function(tester) {
-    env.addCustomEqualityTester(tester);
-  };
-
-  jasmine.addMatchers = function(matchers) {
-    return env.addMatchers(matchers);
-  };
-
-  jasmine.clock = function() {
-    return env.clock;
-  };
-
-  var queryString = new jasmine.QueryString({
-    getWindowLocation: function() { return window.location; }
-  });
-
-  // TODO: move all of catching to raise so we don't break our brains
-  var catchingExceptions = queryString.getParam("catch");
-  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
-
-  var htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
-    getContainer: function() { return document.body; },
-    createElement: function() { return document.createElement.apply(document, arguments); },
-    createTextNode: function() { return document.createTextNode.apply(document, arguments); },
-    timer: new jasmine.Timer()
-  });
-
-  env.addReporter(jasmineInterface.jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  var specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() { return queryString.getParam("spec"); }
-  });
-
-  env.specFilter = function(spec) {
-    return specFilter.matches(spec.getFullName());
-  };
-
-  window.setTimeout = window.setTimeout;
-  window.setInterval = window.setInterval;
-  window.clearTimeout = window.clearTimeout;
-  window.clearInterval = window.clearInterval;
-
-  var currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-
-    // By the time onload is called, jasmineRequire will be redefined to point
-    //   to the Jasmine source files (and not jasmine.js). So re-require
-    window.j$ = jasmineRequire.core(jasmineRequire);
-    jasmineRequire.html(j$);
-    jasmineRequire.console(jasmineRequire, j$);
-
-    env.execute();
-  };
-
-  function extend(destination, source) {
-    for (var property in source) destination[property] = source[property];
-    return destination;
-  }
-
-}());

spec/support/jasmine-performance.json

@@ -0,0 +1,9 @@
+{
+  "spec_dir": "spec",
+  "spec_files": [
+    "performance/performance_test.js"
+  ],
+  "helper_files": [
+    "helpers/nodeDefineJasmineUnderTest.js"
+  ]
+}

spec/support/jasmine-performance.yml

@@ -2,13 +2,8 @@ src_dir:
   - 'src'
 src_files:
   - '**/*.js'
-boot_dir: 'spec/support'
-boot_files:
-  - 'dev_boot.js'
 helpers:
   - 'helpers/**/*.js'
 spec_files:
   - 'performance/performance_test.js'
 spec_dir: spec
-
-

spec/support/jasmine.json

@@ -0,0 +1,11 @@
+{
+  "spec_dir": "spec",
+  "spec_files": [
+    "core/**/*.js",
+    "console/**/*.js",
+    "npmPackage/**/*.js"
+  ],
+  "helpers": [
+    "helpers/nodeDefineJasmineUnderTest.js"
+  ]
+}