Add release candidate option. Add node required message. Bump version.

.gitignore

@@ -5,15 +5,7 @@ site/
 .bundle/
 .pairs
 .rvmrc
-.ruby-gemset
-.ruby-version
 *.gem
 .bundle
-tags
 Gemfile.lock
 pkg/*
-.sass-cache/*
-src/html/.sass-cache/*
-node_modules/
-sauce_connect.log
-*.swp

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "pages"]
 	path = pages
-	url = https://github.com/pivotal/jasmine.git
+	url = git@github.com:pivotal/jasmine.git

.jshintrc

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

.rspec

@@ -1 +0,0 @@
---color

.travis.yml

@@ -1,50 +0,0 @@
----
-script: $TEST_COMMAND
-language: ruby
-rvm: 1.9.3
-env:
-  global:
-  - USE_SAUCE=true
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - TEST_COMMAND="bash travis-core-script.sh"
-  - JASMINE_BROWSER="firefox"
-  - SAUCE_OS="Linux"
-  - SAUCE_BROWSER_VERSION=''
-  - secure: WSPWhlnC4mWSnSPquX+m1/BCu5ch5NygkaHuM2Nea7lD8oS3XLX8QncZZAsQ4lnNfqoDDuBOizG0AESiqNvE4y6x5qvLLTS6q+ce255ZEMZ71TBdZgDEEvGMEjOPPsVXiXyTQOP1lwOPlrbZvaPgWV7e11KIBab6DfFcQpnvDgo=
-  - secure: SW7CJhZnwaNT749Gdnhvqb5rbXlAOsygUAzh9qhtyvbqXKkmJdBIEsO01YF6pbju1X2twE9JvWCOxeZju43NgQChJlPsGbjY2j3k/TdQeTAJesQe2K7ytwghunI30gjEovtRH0T3w1EmcKPH8yj5eBIcB2OYoJHx8KEC7e68q1g=
-matrix:
-  include:
-  - env:
-    - USE_SAUCE=false
-    - TEST_COMMAND="bash travis-node-script.sh"
-  - env:
-    - JASMINE_BROWSER="safari"
-    - SAUCE_OS="OS X 10.8"
-    - SAUCE_BROWSER_VERSION=6
-  - env:
-    - JASMINE_BROWSER="safari"
-    - SAUCE_OS="OS X 10.6"
-    - SAUCE_BROWSER_VERSION=5
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 8"
-    - SAUCE_BROWSER_VERSION=10
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 7"
-    - SAUCE_BROWSER_VERSION=9
-  - env:
-    - JASMINE_BROWSER="internet explorer"
-    - SAUCE_OS="Windows 7"
-    - SAUCE_BROWSER_VERSION=8
-  - env:
-    - JASMINE_BROWSER="chrome"
-    - SAUCE_OS="Linux"
-    - SAUCE_BROWSER_VERSION=''
-  - env:
-    - JASMINE_BROWSER="phantomjs"
-    - USE_SAUCE=false
-  - env:
-    - USE_SAUCE=false
-    - JASMINE_BROWSER="phantomjs"
-    - TEST_COMMAND="bash travis-docs-script.sh"

CONTRIBUTING.md

@@ -1,116 +0,0 @@
-# Developing for Jasmine Core
-
-We welcome your contributions - Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists (the main group - [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js) and the developer's list - [http://groups.google.com/group/jasmine-js-dev](http://groups.google.com/group/jasmine-js-dev)) before starting work - what you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
-
-## General Workflow
-
-Please submit pull requests via feature branches using the semi-standard workflow of:
-
-1. Fork it
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
-
-We favor pull requests with very small, single commits with a single purpose.
-
-## Background
-
-### Directory Structure
-
-* `/src` contains all of the source files
-    * `/src/console` - Node.js-specific files
-    * `/src/core` - generic source files
-    * `/src/html` - browser-specific files
-* `/spec` contains all of the tests
-    * mirrors the source directory
-    * there are some additional files
-* `/dist` contains the standalone distributions as zip files
-* `/lib` contains the generated files for distribution as the Jasmine Rubygem and the Python package
-
-### Self-testing
-
-Note that Jasmine tests itself. The files in `lib` are loaded first, defining the reference `jasmine`. Then the files in `src` are loaded, defining the reference `j$`. So there are two copies of the code loaded under test.
-
-The tests should always use `j$` to refer to the objects and functions that are being tested. But the tests can use functions on `jasmine` as needed. _Be careful how you structure any new test code_. Copy the patterns you see in the existing code - this ensures that the code you're testing is not leaking into the `jasmine` reference and vice-versa.
-
-### `boot.js`
-
-__This is new for Jasmine 2.0.__
-
-This file does all of the setup necessary for Jasmine to work. It loads all of the code, creates an `Env`, attaches the global functions, and builds the reporter. It also sets up the execution of the `Env` - for browsers this is in `window.onload`. While the default in `lib` is appropriate for browsers, projects may wish to customize this file.
-
-For example, for Jasmine development there is a different `dev_boot.js` for Jasmine development that does more work.
-
-### Compatibility
-
-* Browser Minimum
-  * IE8
-  * Firefox 3.x
-  * Chrome ??
-  * Safari 5
-
-## Development
-
-All source code belongs in `src/`. The `core/` directory contains the bulk of Jasmine's functionality. This code should remain browser- and environment-agnostic. If your feature or fix cannot be, as mentioned above, please degrade gracefully. Any code that should only be in a non-browser environment should live in `src/console/`. Any code that depends on a browser (specifically, it expects `window` to be the global or `document` is present) should live in `src/html/`.
-
-### Install Dependencies
-
-Jasmine Core relies on Ruby and Node.js.
-
-To install the Ruby dependencies, you will need Ruby, Rubygems, and Bundler available. Then:
-
-    $ bundle
-
-...will install all of the Ruby dependencies.
-
-To install the Node dependencies, you will need Node.js, Npm, and [Grunt](http://gruntjs.com/), the [grunt-cli](https://github.com/gruntjs/grunt-cli) and ensure that `grunt` is on your path.
-
-    $ npm install --local
-
-...will install all of the node modules locally. If when you run
-
-    $ grunt
-
-...you see that JSHint runs your system is ready.
-
-### How to write new Jasmine code
-
-Or, How to make a successful pull request
-
-* _Do not change the public interface_. Lots of projects depend on Jasmine and if you aren't careful you'll break them
-* _Be environment agnostic_ - server-side developers are just as important as browser developers
-* _Be browser agnostic_ - if you must rely on browser-specific functionality, please write it in a way that degrades gracefully
-* _Write specs_ - Jasmine's a testing framework; don't add functionality without test-driving it
-* _Write code in the style of the rest of the repo_ - Jasmine should look like a cohesive whole
-* _Ensure the *entire* test suite is green_ in all the big browsers, Node, and JSHint - your contribution shouldn't break Jasmine for other users
-
-Follow these tips and your pull request, patch, or suggestion is much more likely to be integrated.
-
-### Running Specs
-
-Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to test itself in browser.
-
-    $ rake jasmine
-
-...and then visit `http://localhost:8888` to run specs.
-
-Jasmine uses Node.js with a custom runner to test outside of a browser.
-
-    $ grunt execSpecsInNode
-
-...and then the results will print to the console. All specs run except those that expect a browser (the specs in `spec/html` are ignored).
-
-## 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. Build `jasmine.js` with `grunt buildDistribution` and run all specs again - this ensures that your changes self-test well
-
-## Submitting a Pull Request
-1. Revert your changes to `jasmine.js` and `jasmine-html.js`
-  * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches.
-1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master.
-
-Note that we use Travis for Continuous Integration. We only accept green pull requests.
-

GOALS_2.0.md

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

Gemfile

@@ -1,14 +1,3 @@
-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
+source :rubygems
 
 gemspec
-
-gem "jasmine_selenium_runner", :git => 'https://github.com/jasmine/jasmine_selenium_runner.git'
-
-gem "anchorman"

Gruntfile.js

@@ -1,48 +0,0 @@
-module.exports = function(grunt) {
-  var pkg = require("./package.json");
-  global.jasmineVersion = pkg.version;
-
-  grunt.initConfig({
-    pkg: pkg,
-    jshint: require('./grunt/config/jshint.js'),
-    concat: require('./grunt/config/concat.js'),
-    compass: require('./grunt/config/compass.js'),
-    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');
-
-  grunt.loadTasks('grunt/tasks');
-
-  grunt.registerTask('default', ['jshint:all']);
-
-  var version = require('./grunt/tasks/version.js');
-  var standaloneBuilder = require('./grunt/tasks/build_standalone.js');
-
-  grunt.registerTask('build:copyVersionToGem',
-    "Propagates the version from package.json to version.rb",
-    version.copyToGem);
-
-  grunt.registerTask('buildDistribution',
-    'Builds and lints jasmine.js, jasmine-html.js, jasmine.css',
-    [
-      'compass',
-      'jshint:beforeConcat',
-      'concat',
-      'jshint:afterConcat',
-      'build:copyVersionToGem'
-    ]
-  );
-
-
-  var spec = require('./grunt/tasks/spec.js');
-
-  grunt.registerTask("execSpecsInNode",
-  "Run Jasmine core specs in Node.js",
-    spec.execSpecsInNode
-  );
-
-};

HowToRelease.markdown

@@ -0,0 +1,49 @@
+
+
+1. Ensure all specs are green in browsers & Node.js (via rake tasks)
+1. Ensure CI is green
+1.
+
+
+
+
+## Development
+
+
+
+
+## Release
+
+
+
+
+
+# Making a Release of Jasmine Core
+
+'Jasmine' is the Github repo for Jasmine Core and contains all the JavaScript code for the Jasmine BDD framework.
+
+It also contains two HTML pages for the Github Pages at http://pivotal.github.com/jasmine.
+
+## The Repo
+
+All of the JS for Jasmine is in the src directory. The specs for each file are in the specs directory. There are rake tasks to build the various files for distribution.
+
+## Running Specs
+
+There are rake tasks to help with getting green:
+
+* `rake spec:browser` opens `spec/runner.html` in the default browser. Please run this in at least Firefox and Chrome before comitting
+* `rake spec:node` runs all the Jasmine specs in Node.js
+* `rake jasmine:lint` runs all the files through JSHint and will complain about potential viable issues with your code. Fix them.
+
+## The Pages
+
+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.
+
+The pages are built with [Frank](https://github.com/blahed/frank). All the source for these pages live in the pages_source directory.
+
+## Releasing
+
+Once all specs are green and you've updated the version in `version.json`, you need to run the rake task to make a distribution: `rake jasmine:dist`.

README.markdown

@@ -0,0 +1,50 @@
+<a name="README">[Jasmine](http://pivotal.github.com/jasmine/)</a>
+=======
+**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://pivotal.github.com/jasmine/](http://pivotal.github.com/jasmine/)
+
+## 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)
+* Check the current build status: [ci.pivotallabs.com](http://ci.pivotallabs.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)
+
+## How to Contribute
+
+We welcome your contributions - Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists (the main group - [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js) and the developer's list - [http://groups.google.com/group/jasmine-js-dev](http://groups.google.com/group/jasmine-js-dev)) before starting work - what you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
+
+### Development Environment
+
+Jasmine Core relies on Ruby for executing the test suite and building the project for release. The spec suite runs in any major, modern browser (Firefox, Safari, Chrome, and yes various IE's) and in [Node.js](http://nodejs.org). While you probably have browsers installed, you want to make sure that Ruby and Node are present.
+
+### How to Develop for Jasmine Core
+
+* Write specs
+* Make them pass in a browser (or three):
+  * open `spec/runner.html` in your browsers
+  * `rake spec:browser` will run in the default browser on MacOS
+* Make them pass in Node: `rake spec:node`
+* Fix any warnings or errors from JSHint: `rake jasmine:lint`
+
+Running `rake spec` will run the browser tests, then run specs in Node, then run JSHint. But this will only run in the default browser and only on MacOS (for now).
+
+
+### Making a Successful Pull Request
+
+* __Include specs for your work__ - it helps us understand your intent and makes sure that future development doesn't break your work
+* __Ensure the full test suite is green__ in all the big browsers, Node, and JSHint - your contribution shouldn't break Jasmine for other users
+
+Do these things and we'll take a look.
+
+## Maintainers
+
+* [Davis W. Frank](mailto:dwfrank@pivotallabs.com), Pivotal Labs
+* [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
+* [Christian Williams](mailto:antixian666@gmail.com), Square
+
+Copyright (c) 2008-2011 Pivotal Labs. This software is licensed under the MIT License.

README.md

@@ -1,31 +0,0 @@
-<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 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/)
-
-## Contributing
-
-Please read the [contributors' guide](https://github.com/pivotal/jasmine/blob/master/CONTRIBUTING.md)
-
-## 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)
-* 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
-
-### Maintainers Emeritus
-
-* [Christian Williams](mailto:antixian666@gmail.com), Square
-
-Copyright (c) 2008-2013 Pivotal Labs. This software is licensed under the MIT License.

RELEASE.md

@@ -1,49 +0,0 @@
-# How to work on a Jasmine Release
-
-## Development
-___Jasmine Core Maintainers Only___
-
-Follow the instructions in `CONTRIBUTING.md` during development.
-
-### Git Rules
-
-Please work on feature branches.
-
-Please attempt to keep commits to `master` small, but cohesive. If a feature is contained in a bunch of small commits (e.g., it has several wip commits or small work), please squash them when merging back to `master`.
-
-### Version
-
-We attempt to stick to [Semantic Versioning](http://semver.org/). Most of the time, development should be against a new minor version - fixing bugs and adding new features that are backwards compatible.
-
-The current version lives in the file `/package.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0.
-
-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
-
-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
-1. Build the standalone distribution with `grunt buildStandaloneDist`
-1. Make sure you add the new ZIP file to git
-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.
-
-
-There should be a post to Pivotal Labs blog and a tweet to that link.

Rakefile

@@ -1,17 +1,169 @@
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
-require "json"
-require "jasmine"
-unless ENV["JASMINE_BROWSER"] == 'phantomjs'
-  require "jasmine_selenium_runner"
-end
-load "jasmine/tasks/jasmine.rake"
 
-namespace :jasmine do
-  task :set_env do
-    ENV['JASMINE_CONFIG_PATH'] ||= 'spec/support/jasmine.yml'
+def sources
+  dependencies = JSON.parse(File.read('./src/SourcesList.json')).collect {|f| "./src/core/#{f}"}
+  dependencies + Dir.glob('./src/core/*.js').reject {|f| dependencies.include?(f)}.sort
+end
+
+def html_sources
+  ["./src/html/TrivialReporter.js"]
+end
+
+def version_hash
+  @version ||= JSON.parse(File.new("./src/core/version.json").read)
+end
+
+def substitute_version(filename)
+  contents = File.read(filename)
+  contents = contents.gsub(/##JASMINE_VERSION##/, (jasmine_version))
+    contents = contents.gsub(/[^\n]*REMOVE_THIS_LINE_FROM_BUILD[^\n]*/, '')
+  File.open(filename, 'w') { |f| f.write(contents) }
+end
+
+task :default => :spec
+
+desc "Run spec suite: Browser, Node, JSHint"
+task :spec => ["jasmine:build", "spec:node", "spec:browser"]
+
+namespace :spec do
+  desc 'Run specs in Node.js'
+  task :node => "jasmine:require_node" do
+    system("node spec/node_suite.js")
+  end
+
+  desc "Run specs in the default browser (MacOS only)"
+  task :browser do
+    system("open spec/runner.html")
   end
 end
 
-task "jasmine:configure" => "jasmine:set_env"
+namespace :jasmine do
 
+  task :require_node do
+    raise "Node.js is required" if `which node` == ''
+  end
+
+
+  desc 'Prepares for distribution'
+  task :dist => ['jasmine:build',
+    'jasmine:doc',
+    'jasmine:build_pages',
+    'jasmine:build_example_project',
+    'jasmine:fill_index_downloads']
+
+  desc 'Check jasmine sources for coding problems'
+  task :lint => "jasmine:require_node" do
+    puts "Running JSHint via Node.js"
+    system("node jshint/run.js") || exit(1)
+  end
+
+  desc "Alias to JSHint"
+  task :hint => :lint
+
+  desc 'Builds lib/jasmine from source'
+  task :build => :lint do
+    puts 'Building Jasmine from source'
+
+    version = Jasmine::Core::VERSION_HASH
+
+    File.open("./lib/jasmine-core/jasmine.js", 'w') do |jasmine|
+      sources.each do |source_filename|
+        jasmine.puts(File.read(source_filename))
+      end
+
+      jasmine.puts %{
+jasmine.version_= {
+  "major": #{version['major'].to_json},
+  "minor": #{version['minor'].to_json},
+  "build": #{version['build'].to_json},
+  "revision": #{Time.now.to_i},
+  "release_candidate": #{version['release_candidate'].to_json}
+};
+      }
+    end
+
+    File.open("./lib/jasmine-core/jasmine-html.js", 'w') do |jasmine_html|
+      html_sources.each do |source_filename|
+        jasmine_html.puts(File.read(source_filename))
+      end
+    end
+
+    FileUtils.cp("./src/html/jasmine.css", "lib/jasmine-core/jasmine.css")
+  end
+
+  downloads_file = 'pages/download.html'
+  task :need_pages_submodule do
+    unless File.exist?(downloads_file)
+      raise "Jasmine pages submodule isn't present.  Run git submodule update --init"
+    end
+  end
+
+  desc "Build the Github pages HTML"
+  task :build_pages => :need_pages_submodule do
+    Dir.chdir("pages") do
+      FileUtils.rm_r('pages_output') if File.exist?('pages_output')
+      Dir.chdir('pages_source') do
+        system("frank export ../pages_output")
+      end
+      puts "\nCopying Frank output to the root of the gh-pages branch\n\n"
+      system("cp -r pages_output/* .")
+    end
+  end
+
+  desc "Build jasmine documentation"
+  task :doc => :need_pages_submodule do
+    puts 'Creating Jasmine Documentation'
+    require 'rubygems'
+    require 'jsdoc_helper'
+
+    FileUtils.rm_r "pages/jsdoc", :force => true
+
+    JsdocHelper::Rake::Task.new(:lambda_jsdoc) do |t|
+      t[:files] = sources << html_sources
+      t[:options] = "-a"
+      t[:out] = "pages/jsdoc"
+      # JsdocHelper bug: template must be relative to the JsdocHelper gem, ick
+      t[:template] = File.join("../".*(100), Dir::getwd, "jsdoc-template")
+    end
+    Rake::Task[:lambda_jsdoc].invoke
+  end
+
+  desc "Build example project"
+  task :build_example_project => :need_pages_submodule do
+    require 'tmpdir'
+
+    temp_dir = File.join(Dir.tmpdir, 'jasmine-standalone-project')
+    puts "Building Example Project in #{temp_dir}"
+    FileUtils.rm_r temp_dir if File.exist?(temp_dir)
+    Dir.mkdir(temp_dir)
+
+    root = File.expand_path(File.dirname(__FILE__))
+    FileUtils.cp_r File.join(root, 'example/.'), File.join(temp_dir)
+    substitute_version(File.join(temp_dir, "SpecRunner.html"))
+
+    lib_dir = File.join(temp_dir, "lib", "jasmine-#{jasmine_version}")
+    FileUtils.mkdir_p(lib_dir)
+    {
+      "lib/jasmine.js" => "jasmine.js",
+      "lib/jasmine-html.js" => "jasmine-html.js",
+      "src/html/jasmine.css" => "jasmine.css",
+      "MIT.LICENSE"  => "MIT.LICENSE"
+    }.each_pair do |src, dest|
+      FileUtils.cp(File.join(root, src), File.join(lib_dir, dest))
+    end
+
+    dist_dir = File.join(root, 'pages/downloads')
+    zip_file_name = File.join(dist_dir, "jasmine-standalone-#{jasmine_version}.zip")
+    puts "Zipping Example Project and moving to #{zip_file_name}"
+    FileUtils.mkdir(dist_dir) unless File.exist?(dist_dir)
+    if File.exist?(zip_file_name)
+      puts "WARNING!!! #{zip_file_name} already exists!"
+      FileUtils.rm(zip_file_name)
+    end
+    exec "cd #{temp_dir} && zip -r #{zip_file_name} . -x .[a-zA-Z0-9]*"
+  end
+
+end
+
+task :build => "jasmine:build"

grunt/config/compass.js

@@ -1,10 +0,0 @@
-module.exports = {
-  jasmine: {
-    options: {
-      cssDir: 'lib/jasmine-core/',
-      sassDir: 'src/html',
-      outputStyle: 'compact',
-      noLineComments: true,
-    }
-  }
-};

grunt/config/compress.js

@@ -1,66 +0,0 @@
-var standaloneLibDir = "lib/jasmine-" + jasmineVersion;
-
-function root(path) { return "./" + path; }
-function libJasmineCore(path) { return root("lib/jasmine-core/" + path); }
-function libConsole() { return "lib/console/" }
-function dist(path) { return root("dist/" + path); }
-
-module.exports = {
-  standalone: {
-    options: {
-      archive: root("dist/jasmine-standalone-" + global.jasmineVersion + ".zip")
-    },
-
-    files: [
-      { src: [ root("MIT.LICENSE") ] },
-      {
-        src: [ "jasmine_favicon.png"],
-        dest: standaloneLibDir,
-        expand: true,
-        cwd: root("images")
-      },
-      {
-        src: [
-          "jasmine.js",
-          "jasmine-html.js",
-          "jasmine.css"
-        ],
-        dest: standaloneLibDir,
-        expand: true,
-        cwd: libJasmineCore("")
-      },
-      {
-        src: [
-          "console.js"
-        ],
-        dest: standaloneLibDir,
-        expand: true,
-        cwd: libConsole()
-      },
-      {
-        src: [ "boot.js" ],
-        dest: standaloneLibDir,
-        expand: true,
-        cwd: libJasmineCore("boot")
-      },
-      {
-        src: [ "SpecRunner.html" ],
-        dest: root(""),
-        expand: true,
-        cwd: dist("tmp")
-      },
-      {
-        src: [ "*.js" ],
-        dest: "src",
-        expand: true,
-        cwd: libJasmineCore("example/src/")
-      },
-      {
-        src: [ "*.js" ],
-        dest: "spec",
-        expand: true,
-        cwd: libJasmineCore("example/spec/")
-      }
-    ]
-  }
-};

grunt/config/concat.js

@@ -1,57 +0,0 @@
-var grunt = require('grunt');
-
-function license() {
-  var currentYear = "" + new Date(Date.now()).getFullYear();
-
-  return grunt.template.process(
-      grunt.file.read("grunt/templates/licenseBanner.js.jst"),
-      { data: { currentYear: currentYear}});
-}
-
-module.exports = {
-  'jasmine-html': {
-    src: [
-      'src/html/requireHtml.js',
-      'src/html/HtmlReporter.js',
-      'src/html/HtmlSpecFilter.js',
-      'src/html/ResultsNode.js',
-      'src/html/QueryString.js'
-    ],
-    dest: 'lib/jasmine-core/jasmine-html.js'
-  },
-  jasmine: {
-    src: [
-      'src/core/requireCore.js',
-      'src/core/matchers/requireMatchers.js',
-      'src/core/base.js',
-      'src/core/util.js',
-      'src/core/Spec.js',
-      'src/core/Env.js',
-      'src/core/JsApiReporter.js',
-      'src/core/PrettyPrinter',
-      'src/core/Suite',
-      'src/core/**/*.js',
-      'src/version.js'
-    ],
-    dest: 'lib/jasmine-core/jasmine.js'
-  },
-  boot: {
-    src: ['lib/jasmine-core/boot/boot.js'],
-    dest: 'lib/jasmine-core/boot.js'
-  },
-  console: {
-    src: [
-      'src/console/requireConsole.js',
-      'src/console/ConsoleReporter.js'
-    ],
-    dest: 'lib/console/console.js'
-  },
-  options: {
-    banner: license(),
-    process: {
-      data: {
-        version: global.jasmineVersion
-      }
-    }
-  }
-};

grunt/config/jshint.js

@@ -1,11 +0,0 @@
-module.exports = {
-  beforeConcat: ['src/**/*.js'],
-  afterConcat: [
-    'lib/jasmine-core/jasmine-html.js',
-    'lib/jasmine-core/jasmine.js'
-  ],
-  options: {
-    jshintrc: '.jshintrc'
-  },
-  all: ['src/**/*.js']
-};

grunt/tasks/build_standalone.js

@@ -1,31 +0,0 @@
-var grunt = require("grunt");
-
-function standaloneTmpDir(path) {  return "dist/tmp/" + path; }
-
-grunt.registerTask("build:compileSpecRunner",
-    "Processes the spec runner template and writes to a tmp file",
-    function() {
-        var runnerHtml = grunt.template.process(
-            grunt.file.read("grunt/templates/SpecRunner.html.jst"),
-            { data: { jasmineVersion: global.jasmineVersion }});
-
-        grunt.file.write(standaloneTmpDir("SpecRunner.html"), runnerHtml);
-    }
-);
-
-grunt.registerTask("build:cleanSpecRunner",
-    "Deletes the tmp spec runner file",
-    function() {
-        grunt.file.delete(standaloneTmpDir(""));
-    }
-);
-
-grunt.registerTask("buildStandaloneDist",
-    "Builds a standalone distribution",
-    [
-      "buildDistribution",
-      "build:compileSpecRunner",
-      "compress:standalone",
-      "build:cleanSpecRunner"
-    ]
-);

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/tasks/version.js

@@ -1,14 +0,0 @@
-var grunt = require("grunt");
-
-function gemLib(path) { return './lib/jasmine-core/' + path; }
-function nodeToRuby(version) { return version.replace('-', '.'); }
-
-module.exports = {
-  copyToGem: function() {
-    var versionRb = grunt.template.process(
-      grunt.file.read("grunt/templates/version.rb.jst"),
-      { data: { jasmineVersion: nodeToRuby(global.jasmineVersion) }});
-
-    grunt.file.write(gemLib("version.rb"), versionRb);
-  }
-};

grunt/templates/SpecRunner.html.jst

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; 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">
-
-  <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>
-
-  <!-- include source files here... -->
-  <script type="text/javascript" src="src/Player.js"></script>
-  <script type="text/javascript" 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>
-
-</head>
-
-<body>
-</body>
-</html>

grunt/templates/licenseBanner.js.jst

@@ -1,22 +0,0 @@
-/*
-Copyright (c) 2008-<%= currentYear %> 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.
-*/

grunt/templates/version.rb.jst

@@ -1,9 +0,0 @@
-#
-# DO NOT Edit this file. Canonical version of Jasmine lives in the repo's package.json. This file is generated
-# by a grunt task when the standalone release is built.
-#
-module Jasmine
-  module Core
-    VERSION = "<%= jasmineVersion %>"
-  end
-end

jasmine-core.gemspec

@@ -6,18 +6,17 @@ 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 Frank", "Christian Williams"]
   s.summary = %q{JavaScript BDD framework}
   s.description = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.}
   s.email = %q{jasmine-js@googlegroups.com}
   s.homepage = "http://pivotal.github.com/jasmine"
   s.rubyforge_project = "jasmine-core"
-  s.license = "MIT"
 
-  s.files         = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js")
+  s.files         = Dir.glob("./lib/**/*")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   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 "json_pure", ">= 1.4.3"
+  s.add_development_dependency "frank"
+  s.add_development_dependency "ragaskar-jsdoc_helper"
 end

jsdoc-template/allclasses.tmpl

@@ -0,0 +1,17 @@
+<div align="center">{+new Link().toFile("index.html").withText("Class Index")+}
+| {+new Link().toFile("files.html").withText("File Index")+}</div>
+<hr />
+<h2>Classes</h2>
+<ul class="classList">
+	<for each="thisClass" in="data">
+	<li>{!
+		if (thisClass.alias == "_global_") {
+			output += "<i>"+new Link().toClass(thisClass.alias)+"</i>";
+		}
+		else {
+			output += new Link().toClass(thisClass.alias);
+		}
+	!}</li>
+	</for>
+</ul>
+<hr />

jsdoc-template/allfiles.tmpl

@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}"" />
+		{! Link.base = ""; /* all generated links will be relative to this */ !}
+		<title>JsDoc Reference - File Index</title>
+		<meta name="generator" content="JsDoc Toolkit" />
+		
+		<style type="text/css">
+		{+include("static/default.css")+}
+		</style>
+	</head>
+	
+	<body>
+		{+include("static/header.html")+}
+		
+		<div id="index">
+			{+publish.classesIndex+}
+		</div>
+		
+		<div id="content">
+			<h1 class="classTitle">File Index</h1>
+			
+			<for each="item" in="data">
+			<div>
+				<h2>{+new Link().toSrc(item.alias).withText(item.name)+}</h2>
+				<if test="item.desc">{+resolveLinks(summarize(item.desc))+}</if>
+				<dl>
+					<if test="item.author">
+						<dt class="heading">Author:</dt>
+						<dd>{+item.author+}</dd>
+					</if>
+					<if test="item.version">
+						<dt class="heading">Version:</dt>
+							<dd>{+item.version+}</dd>
+					</if>
+					{! var locations = item.comment.getTag('location').map(function($){return $.toString().replace(/(^\$ ?| ?\$$)/g, '').replace(/^HeadURL: https:/g, 'http:');}) !}
+					<if test="locations.length">
+						<dt class="heading">Location:</dt>
+							<for each="location" in="locations">
+							<dd><a href="{+location+}">{+location+}</a></dd>
+							</for>
+					</if>
+				</dl>
+			</div>
+			<hr />
+			</for>
+			
+		</div>
+		<div class="fineprint" style="clear:both">
+			<if test="JSDOC.opt.D.copyright">&copy;{+JSDOC.opt.D.copyright+}<br /></if>
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> {+JSDOC.VERSION+} on {+new Date()+}
+		</div>
+	</body>
+</html>

jsdoc-template/class.tmpl

@@ -0,0 +1,646 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}" />
+		<meta name="generator" content="JsDoc Toolkit" />
+		{! Link.base = "../"; /* all generated links will be relative to this */ !}
+		<title>JsDoc Reference - {+data.alias+}</title>
+
+		<style type="text/css">
+			{+include("static/default.css")+}
+		</style>
+	</head>
+
+	<body>
+<!-- ============================== header ================================= -->	
+		<!-- begin static/header.html -->
+		{+include("static/header.html")+}
+		<!-- end static/header.html -->
+
+<!-- ============================== classes index ============================ -->
+		<div id="index">
+			<!-- begin publish.classesIndex -->
+			{+publish.classesIndex+}
+			<!-- end publish.classesIndex -->
+		</div>
+		
+		<div id="content">
+<!-- ============================== class title ============================ -->
+			<h1 class="classTitle">
+				{!
+					var classType = "";
+					
+					if (data.isBuiltin()) {
+						classType += "Built-In ";
+					}
+					
+					if (data.isNamespace) {
+						if (data.is('FUNCTION')) {
+							classType += "Function ";
+						}
+						classType += "Namespace ";
+					}
+					else {
+						classType += "Class ";
+					}
+				!}
+				{+classType+}{+data.alias+}
+			</h1>
+
+<!-- ============================== class summary ========================== -->			
+			<p class="description">
+				<if test="data.augments.length"><br />Extends
+					{+
+						data.augments
+						.sort()
+						.map(
+							function($) { return new Link().toSymbol($); }
+						)
+						.join(", ")
+					+}.<br />
+				</if>
+			
+				{+resolveLinks(data.classDesc)+}
+				
+				<if test="!data.isBuiltin()">{# isn't defined in any file #}
+					<br /><i>Defined in: </i> {+new Link().toSrc(data.srcFile)+}.
+				</if>
+			</p>
+
+<!-- ============================== constructor summary ==================== -->			
+			<if test="!data.isBuiltin() && (data.isNamespace || data.is('CONSTRUCTOR'))">
+			<table class="summaryTable" cellspacing="0" summary="A summary of the constructor documented in the class {+data.alias+}.">
+				<caption>{+classType+}Summary</caption>
+				<thead>
+					<tr>
+						<th scope="col">Constructor Attributes</th>
+						<th scope="col">Constructor Name and Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="attributes">{!
+							if (data.isPrivate) output += "&lt;private&gt; ";
+							if (data.isInner) output += "&lt;inner&gt; ";
+						!}&nbsp;</td>
+						<td class="nameDescription" {!if (data.comment.getTag("hilited").length){output += 'style="color: red"'}!}>
+							<div class="fixedFont">
+								<b>{+ new Link().toSymbol(data.alias).inner('constructor')+}</b><if test="classType != 'Namespace '">{+ makeSignature(data.params) +}</if>
+							</div>
+							<div class="description">{+resolveLinks(summarize(data.desc))+}</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			</if>
+
+<!-- ============================== properties summary ===================== -->
+			<if test="data.properties.length">
+				{! var ownProperties = data.properties.filter(function($){return $.memberOf == data.alias && !$.isNamespace}).sort(makeSortby("name")); !}
+				<if test="ownProperties.length">
+				<table class="summaryTable" cellspacing="0" summary="A summary of the fields documented in the class {+data.alias+}.">
+					<caption>Field Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Field Attributes</th>
+							<th scope="col">Field Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					<for each="member" in="ownProperties">
+						<tr>
+							<td class="attributes">{!
+								if (member.isPrivate) output += "&lt;private&gt; ";
+								if (member.isInner) output += "&lt;inner&gt; ";
+								if (member.isStatic) output += "&lt;static&gt; ";
+								if (member.isConstant) output += "&lt;constant&gt; ";
+							!}&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont">
+								<if test="member.isStatic && member.memberOf != '_global_'">{+member.memberOf+}.</if><b>{+new Link().toSymbol(member.alias).withText(member.name)+}</b>
+								</div>
+								<div class="description">{+resolveLinks(summarize(member.desc))+}</div>
+							</td>
+						</tr>
+					</for>
+					</tbody>
+				</table>
+				</if>
+				
+				<if test="data.inheritsFrom.length">
+				<dl class="inheritsList">
+				{!
+					var borrowedMembers = data.properties.filter(function($) {return $.memberOf != data.alias});
+					
+					var contributers = [];
+					borrowedMembers.map(function($) {if (contributers.indexOf($.memberOf) < 0) contributers.push($.memberOf)});
+					for (var i = 0, l = contributers.length; i < l; i++) {
+						output +=
+							"<dt>Fields borrowed from class "+new Link().toSymbol(contributers[i])+": </dt>"
+							+
+							"<dd>" +
+							borrowedMembers
+							.filter(
+								function($) { return $.memberOf == contributers[i] }
+							)
+							.sort(makeSortby("name"))
+							.map(
+								function($) { return new Link().toSymbol($.alias).withText($.name) }
+							)
+							.join(", ")
+							+
+							"</dd>";
+					}
+				!}
+				</dl>
+				</if>
+			</if>
+
+<!-- ============================== methods summary ======================== -->
+			<if test="data.methods.length">
+				{! var ownMethods = data.methods.filter(function($){return $.memberOf == data.alias  && !$.isNamespace}).sort(makeSortby("name")); !}
+				<if test="ownMethods.length">
+				<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class {+data.alias+}.">
+					<caption>Method Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Method Attributes</th>
+							<th scope="col">Method Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					<for each="member" in="ownMethods">
+						<tr>
+							<td class="attributes">{!
+								if (member.isPrivate) output += "&lt;private&gt; ";
+								if (member.isInner) output += "&lt;inner&gt; ";
+								if (member.isStatic) output += "&lt;static&gt; ";
+							!}&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><if test="member.isStatic && member.memberOf != '_global_'">{+member.memberOf+}.</if><b>{+new Link().toSymbol(member.alias).withText(member.name)+}</b>{+makeSignature(member.params)+}
+								</div>
+								<div class="description">{+resolveLinks(summarize(member.desc))+}</div>
+							</td>
+						</tr>
+					</for>
+					</tbody>
+				</table>
+				</if>
+				
+				<if test="data.inheritsFrom.length">
+				<dl class="inheritsList">
+				{!
+					var borrowedMembers = data.methods.filter(function($) {return $.memberOf != data.alias});
+					var contributers = [];
+					borrowedMembers.map(function($) {if (contributers.indexOf($.memberOf) < 0) contributers.push($.memberOf)});
+					for (var i = 0, l = contributers.length; i < l; i++) {
+						output +=
+							"<dt>Methods borrowed from class "+new Link().toSymbol(contributers[i])+": </dt>"
+							+
+							"<dd>" +
+							borrowedMembers
+							.filter(
+								function($) { return $.memberOf == contributers[i] }
+							)
+							.sort(makeSortby("name"))
+							.map(
+								function($) { return new Link().toSymbol($.alias).withText($.name) }
+							)
+							.join(", ")
+							+
+							"</dd>";
+					}
+				
+				!}
+				</dl>
+				</if>
+			</if>
+<!-- ============================== events summary ======================== -->
+			<if test="data.events.length">
+				{! var ownEvents = data.events.filter(function($){return $.memberOf == data.alias  && !$.isNamespace}).sort(makeSortby("name")); !}
+				<if test="ownEvents.length">
+				<table class="summaryTable" cellspacing="0" summary="A summary of the events documented in the class {+data.alias+}.">
+					<caption>Event Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Event Attributes</th>
+							<th scope="col">Event Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					<for each="member" in="ownEvents">
+						<tr>
+							<td class="attributes">{!
+								if (member.isPrivate) output += "&lt;private&gt; ";
+								if (member.isInner) output += "&lt;inner&gt; ";
+								if (member.isStatic) output += "&lt;static&gt; ";
+							!}&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><if test="member.isStatic && member.memberOf != '_global_'">{+member.memberOf+}.</if><b>{+new Link().toSymbol(member.alias).withText(member.name)+}</b>{+makeSignature(member.params)+}
+								</div>
+								<div class="description">{+resolveLinks(summarize(member.desc))+}</div>
+							</td>
+						</tr>
+					</for>
+					</tbody>
+				</table>
+				</if>
+				
+				<if test="data.inheritsFrom.length">
+				<dl class="inheritsList">
+				{!
+					var borrowedMembers = data.events.filter(function($) {return $.memberOf != data.alias});
+					var contributers = [];
+					borrowedMembers.map(function($) {if (contributers.indexOf($.memberOf) < 0) contributers.push($.memberOf)});
+					for (var i = 0, l = contributers.length; i < l; i++) {
+						output +=
+							"<dt>Events borrowed from class "+new Link().toSymbol(contributers[i])+": </dt>"
+							+
+							"<dd>" +
+							borrowedMembers
+							.filter(
+								function($) { return $.memberOf == contributers[i] }
+							)
+							.sort(makeSortby("name"))
+							.map(
+								function($) { return new Link().toSymbol($.alias).withText($.name) }
+							)
+							.join(", ")
+							+
+							"</dd>";
+					}
+				
+				!}
+				</dl>
+				</if>
+			</if>
+
+<!-- ============================== constructor details ==================== -->		
+			<if test="!data.isBuiltin() && (data.isNamespace || data.is('CONSTRUCTOR'))">
+			<div class="details"><a name="constructor"> </a>
+				<div class="sectionTitle">
+					{+classType+}Detail
+				</div>
+				
+				<div class="fixedFont">{!
+					if (data.isPrivate) output += "&lt;private&gt; ";
+					if (data.isInner) output += "&lt;inner&gt; ";
+				!}
+						<b>{+ data.alias +}</b><if test="classType != 'Namespace '">{+ makeSignature(data.params) +}</if>
+				</div>
+				
+				<div class="description">
+					{+resolveLinks(data.desc)+}
+					<if test="data.author"><br /><i>Author: </i>{+data.author+}.</if>
+				</div>
+				
+				<if test="data.example.length">
+				<for each="example" in="data.example">
+				<pre class="code">{+example+}</pre>
+				</for>
+				</if>
+				
+				
+					<if test="data.params.length">
+						<dl class="detailList">
+						<dt class="heading">Parameters:</dt>
+						<for each="item" in="data.params">
+							<dt>
+								{+((item.type)?""+("<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type)+"}</span> ")) : "")+} <b>{+item.name+}</b>
+								<if test="item.isOptional"><i>Optional<if test="item.defaultValue">, Default: {+item.defaultValue+}</if></i></if>
+							</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+						</for>
+						</dl>
+					</if>
+					<if test="data.deprecated">
+						<dl class="detailList">
+						<dt class="heading">Deprecated:</dt>
+						<dt>
+							{+resolveLinks(data.deprecated)+}
+						</dt>
+						</dl>
+					</if>
+					<if test="data.since">
+						<dl class="detailList">
+						<dt class="heading">Since:</dt>
+							<dd>{+ data.since +}</dd>
+						</dl>
+					</if>
+					<if test="data.exceptions.length">
+						<dl class="detailList">
+						<dt class="heading">Throws:</dt>
+						<for each="item" in="data.exceptions">
+							<dt>
+								{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+} <b>{+item.name+}</b>
+							</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+						</for>
+						</dl>
+					</if>
+					<if test="data.returns.length">
+						<dl class="detailList">
+						<dt class="heading">Returns:</dt>
+						<for each="item" in="data.returns">
+								<dd>{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}{+resolveLinks(item.desc)+}</dd>
+						</for>
+						</dl>
+					</if>
+					<if test="data.requires.length">
+						<dl class="detailList">
+						<dt class="heading">Requires:</dt>
+						<for each="item" in="data.requires">
+							<dd>{+ resolveLinks(item) +}</dd>
+						</for>
+						</dl>
+					</if>
+					<if test="data.see.length">
+						<dl class="detailList">
+						<dt class="heading">See:</dt>
+						<for each="item" in="data.see">
+							<dd>{+ new Link().toSymbol(item) +}</dd>
+						</for>
+						</dl>
+					</if>
+
+			</div>
+			</if>
+
+<!-- ============================== field details ========================== -->		
+			<if test="defined(ownProperties) && ownProperties.length">
+				<div class="sectionTitle">
+					Field Detail
+				</div>
+				<for each="member" in="ownProperties">
+					<a name="{+Link.symbolNameToLinkName(member)+}"> </a>
+					<div class="fixedFont">{!
+						if (member.isPrivate) output += "&lt;private&gt; ";
+						if (member.isInner) output += "&lt;inner&gt; ";
+						if (member.isStatic) output += "&lt;static&gt; ";
+						if (member.isConstant) output += "&lt;constant&gt; ";
+					!}
+					
+					<if test="member.type"><span class="light">{{+new Link().toSymbol(member.type)+}}</span></if>
+					<if test="member.isStatic && member.memberOf != '_global_'"><span class="light">{+member.memberOf+}.</span></if><b>{+member.name+}</b>
+					
+					</div>
+					<div class="description">
+						{+resolveLinks(member.desc)+}
+						<if test="member.srcFile != data.srcFile">
+							<br />
+							<i>Defined in: </i> {+new Link().toSrc(member.srcFile)+}.
+						</if>
+						<if test="member.author"><br /><i>Author: </i>{+member.author+}.</if>
+					</div>
+					
+					<if test="member.example.length">
+					<for each="example" in="member.example">
+					<pre class="code">{+example+}</pre>
+					</for>
+					</if>
+
+						<if test="member.deprecated">
+							<dl class="detailList">
+							<dt class="heading">Deprecated:</dt>
+							<dt>
+								{+ member.deprecated +}
+							</dt>
+							</dl>
+						</if>
+						<if test="member.since">
+							<dl class="detailList">
+							<dt class="heading">Since:</dt>
+								<dd>{+ member.since +}</dd>
+							</dl>
+						</if>
+						<if test="member.see.length">
+							<dl class="detailList">
+							<dt class="heading">See:</dt>
+							<for each="item" in="member.see">
+							<dd>{+ new Link().toSymbol(item) +}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.defaultValue">
+							<dl class="detailList">
+							<dt class="heading">Default Value:</dt>
+							<dd>
+								{+resolveLinks(member.defaultValue)+}
+							</dd>
+							</dl>
+						</if>
+
+					<if test="!$member_last"><hr /></if>
+				</for>
+			</if>
+
+<!-- ============================== method details ========================= -->		
+			<if test="defined(ownMethods) && ownMethods.length">
+				<div class="sectionTitle">
+					Method Detail
+				</div>
+				<for each="member" in="ownMethods">
+					<a name="{+Link.symbolNameToLinkName(member)+}"> </a>
+					<div class="fixedFont">{!
+						if (member.isPrivate) output += "&lt;private&gt; ";
+						if (member.isInner) output += "&lt;inner&gt; ";
+						if (member.isStatic) output += "&lt;static&gt; ";
+					!}
+					
+					<if test="member.type"><span class="light">{{+new Link().toSymbol(member.type)+}}</span></if>
+					<if test="member.isStatic && member.memberOf != '_global_'"><span class="light">{+member.memberOf+}.</span></if><b>{+member.name+}</b>{+makeSignature(member.params)+}
+					
+					</div>
+					<div class="description">
+						{+resolveLinks(member.desc)+}
+						<if test="member.srcFile != data.srcFile">
+							<br />
+							<i>Defined in: </i> {+new Link().toSrc(member.srcFile)+}.
+						</if>
+						<if test="member.author"><br /><i>Author: </i>{+member.author+}.</if>
+					</div>
+					
+					<if test="member.example.length">
+					<for each="example" in="member.example">
+					<pre class="code">{+example+}</pre>
+					</for>
+					</if>
+					
+						<if test="member.params.length">
+							<dl class="detailList">
+							<dt class="heading">Parameters:</dt>
+							<for each="item" in="member.params">
+								<dt>
+									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}<b>{+item.name+}</b>
+									<if test="item.isOptional"><i>Optional<if test="item.defaultValue">, Default: {+item.defaultValue+}</if></i></if>
+								</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.deprecated">
+							<dl class="detailList">
+							<dt class="heading">Deprecated:</dt>
+							<dt>
+								{+member.deprecated+}
+							</dt>
+							</dl>
+						</if>
+						<if test="member.since">
+							<dl class="detailList">
+							<dt class="heading">Since:</dt>
+								<dd>{+ member.since +}</dd>
+							</dl>
+							</dl>
+						</if>
+						<if test="member.exceptions.length">
+							<dl class="detailList">
+							<dt class="heading">Throws:</dt>
+							<for each="item" in="member.exceptions">
+								<dt>
+									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+} <b>{+item.name+}</b>
+								</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.returns.length">
+							<dl class="detailList">
+							<dt class="heading">Returns:</dt>
+							<for each="item" in="member.returns">
+								<dd>{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.requires.length">
+							<dl class="detailList">
+							<dt class="heading">Requires:</dt>
+							<for each="item" in="member.requires">
+								<dd>{+ resolveLinks(item) +}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.see.length">
+							<dl class="detailList">
+							<dt class="heading">See:</dt>
+							<for each="item" in="member.see">
+								<dd>{+ new Link().toSymbol(item) +}</dd>
+							</for>
+							</dl>
+						</if>
+
+					<if test="!$member_last"><hr /></if>
+				</for>
+			</if>
+			
+<!-- ============================== event details ========================= -->		
+			<if test="defined(ownEvents) && ownEvents.length">
+				<div class="sectionTitle">
+					Event Detail
+				</div>
+				<for each="member" in="ownEvents">
+					<a name="event:{+Link.symbolNameToLinkName(member)+}"> </a>
+					<div class="fixedFont">{!
+						if (member.isPrivate) output += "&lt;private&gt; ";
+						if (member.isInner) output += "&lt;inner&gt; ";
+						if (member.isStatic) output += "&lt;static&gt; ";
+					!}
+					
+					<if test="member.type"><span class="light">{{+new Link().toSymbol(member.type)+}}</span></if>
+					<if test="member.isStatic && member.memberOf != '_global_'"><span class="light">{+member.memberOf+}.</span></if><b>{+member.name+}</b>{+makeSignature(member.params)+}
+					
+					</div>
+					<div class="description">
+						{+resolveLinks(member.desc)+}
+						<if test="member.srcFile != data.srcFile">
+							<br />
+							<i>Defined in: </i> {+new Link().toSrc(member.srcFile)+}.
+						</if>
+						<if test="member.author"><br /><i>Author: </i>{+member.author+}.</if>
+					</div>
+					
+					<if test="member.example.length">
+					<for each="example" in="member.example">
+					<pre class="code">{+example+}</pre>
+					</for>
+					</if>
+					
+						<if test="member.params.length">
+							<dl class="detailList">
+							<dt class="heading">Parameters:</dt>
+							<for each="item" in="member.params">
+								<dt>
+									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}<b>{+item.name+}</b>
+									<if test="item.isOptional"><i>Optional<if test="item.defaultValue">, Default: {+item.defaultValue+}</if></i></if>
+								</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.deprecated">
+							<dl class="detailList">
+							<dt class="heading">Deprecated:</dt>
+							<dt>
+								{+member.deprecated+}
+							</dt>
+							</dl>
+						</if>
+						<if test="member.since">
+							<dl class="detailList">
+							<dt class="heading">Since:</dt>
+								<dd>{+ member.since +}</dd>
+							</dl>
+							</dl>
+						</if>
+						<if test="member.exceptions.length">
+							<dl class="detailList">
+							<dt class="heading">Throws:</dt>
+							<for each="item" in="member.exceptions">
+								<dt>
+									{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+} <b>{+item.name+}</b>
+								</dt>
+								<dd>{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.returns.length">
+							<dl class="detailList">
+							<dt class="heading">Returns:</dt>
+							<for each="item" in="member.returns">
+								<dd>{+((item.type)?"<span class=\"light fixedFont\">{"+(new Link().toSymbol(item.type))+"}</span> " : "")+}{+resolveLinks(item.desc)+}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.requires.length">
+							<dl class="detailList">
+							<dt class="heading">Requires:</dt>
+							<for each="item" in="member.requires">
+								<dd>{+ resolveLinks(item) +}</dd>
+							</for>
+							</dl>
+						</if>
+						<if test="member.see.length">
+							<dl class="detailList">
+							<dt class="heading">See:</dt>
+							<for each="item" in="member.see">
+								<dd>{+ new Link().toSymbol(item) +}</dd>
+							</for>
+							</dl>
+						</if>
+
+					<if test="!$member_last"><hr /></if>
+				</for>
+			</if>
+			
+			<hr />
+		</div>
+
+		
+<!-- ============================== footer ================================= -->
+		<div class="fineprint" style="clear:both">
+			<if test="JSDOC.opt.D.copyright">&copy;{+JSDOC.opt.D.copyright+}<br /></if>
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> {+JSDOC.VERSION+} on {+new Date()+}
+		</div>
+	</body>
+</html>

jsdoc-template/index.tmpl

@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}"" />
+		
+		<title>JsDoc Reference - Index</title>
+		<meta name="generator" content="JsDoc Toolkit" />
+		
+		<style type="text/css">
+		{+include("static/default.css")+}
+		</style>
+	</head>
+	
+	<body>
+		{+include("static/header.html")+}
+		
+		<div id="index">
+			{+publish.classesIndex+}
+		</div>
+		
+		<div id="content">
+			<h1 class="classTitle">Class Index</h1>
+			
+			<for each="thisClass" in="data">
+			<div>
+				<h2>{+(new Link().toSymbol(thisClass.alias))+}</h2>
+				{+resolveLinks(summarize(thisClass.classDesc))+}
+			</div>
+			<hr />
+			</for>
+			
+		</div>
+		<div class="fineprint" style="clear:both">
+			<if test="JSDOC.opt.D.copyright">&copy;{+JSDOC.opt.D.copyright+}<br /></if>
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> {+JSDOC.VERSION+} on {+new Date()+}
+		</div>
+	</body>
+</html>

jsdoc-template/publish.js

@@ -0,0 +1,184 @@
+/** Called automatically by JsDoc Toolkit. */
+function publish(symbolSet) {
+	publish.conf = {  // trailing slash expected for dirs
+		ext:         ".html",
+		outDir:      JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
+		templatesDir: JSDOC.opt.t || SYS.pwd+"../templates/jsdoc/",
+		symbolsDir:  "symbols/",
+		srcDir:      "symbols/src/"
+	};
+	
+	// is source output is suppressed, just display the links to the source file
+	if (JSDOC.opt.s && defined(Link) && Link.prototype._makeSrcLink) {
+		Link.prototype._makeSrcLink = function(srcFilePath) {
+			return "<"+srcFilePath+">";
+		}
+	}
+	
+	// create the folders and subfolders to hold the output
+	IO.mkPath((publish.conf.outDir+"symbols/src").split("/"));
+		
+	// used to allow Link to check the details of things being linked to
+	Link.symbolSet = symbolSet;
+
+	// create the required templates
+	try {
+		var classTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"class.tmpl");
+		var classesTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"allclasses.tmpl");
+	}
+	catch(e) {
+		print("Couldn't create the required templates: "+e);
+		quit();
+	}
+	
+	// some ustility filters
+	function hasNoParent($) {return ($.memberOf == "")}
+	function isaFile($) {return ($.is("FILE"))}
+	function isaClass($) {return ($.is("CONSTRUCTOR") || $.isNamespace)}
+	
+	// get an array version of the symbolset, useful for filtering
+	var symbols = symbolSet.toArray();
+	
+	// create the hilited source code files
+	var files = JSDOC.opt.srcFiles;
+ 	for (var i = 0, l = files.length; i < l; i++) {
+ 		var file = files[i];
+ 		var srcDir = publish.conf.outDir + "symbols/src/";
+		makeSrcFile(file, srcDir);
+ 	}
+ 	
+ 	// get a list of all the classes in the symbolset
+ 	var classes = symbols.filter(isaClass).sort(makeSortby("alias"));
+	
+	// create a class index, displayed in the left-hand column of every class page
+	Link.base = "../";
+ 	publish.classesIndex = classesTemplate.process(classes); // kept in memory
+	
+	// create each of the class pages
+	for (var i = 0, l = classes.length; i < l; i++) {
+		var symbol = classes[i];
+		
+		symbol.events = symbol.getEvents();   // 1 order matters
+		symbol.methods = symbol.getMethods(); // 2
+		
+		var output = "";
+		output = classTemplate.process(symbol);
+		
+		IO.saveFile(publish.conf.outDir+"symbols/", symbol.alias+publish.conf.ext, output);
+	}
+	
+	// regenerate the index with different relative links, used in the index pages
+	Link.base = "";
+	publish.classesIndex = classesTemplate.process(classes);
+	
+	// create the class index page
+	try {
+		var classesindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"index.tmpl");
+	}
+	catch(e) { print(e.message); quit(); }
+	
+	var classesIndex = classesindexTemplate.process(classes);
+	IO.saveFile(publish.conf.outDir, "index"+publish.conf.ext, classesIndex);
+	classesindexTemplate = classesIndex = classes = null;
+	
+	// create the file index page
+	try {
+		var fileindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"allfiles.tmpl");
+	}
+	catch(e) { print(e.message); quit(); }
+	
+	var documentedFiles = symbols.filter(isaFile); // files that have file-level docs
+	var allFiles = []; // not all files have file-level docs, but we need to list every one
+	
+	for (var i = 0; i < files.length; i++) {
+		allFiles.push(new JSDOC.Symbol(files[i], [], "FILE", new JSDOC.DocComment("/** */")));
+	}
+	
+	for (var i = 0; i < documentedFiles.length; i++) {
+		var offset = files.indexOf(documentedFiles[i].alias);
+		allFiles[offset] = documentedFiles[i];
+	}
+		
+	allFiles = allFiles.sort(makeSortby("name"));
+
+	// output the file index page
+	var filesIndex = fileindexTemplate.process(allFiles);
+	IO.saveFile(publish.conf.outDir, "files"+publish.conf.ext, filesIndex);
+	fileindexTemplate = filesIndex = files = null;
+}
+
+
+/** Just the first sentence (up to a full stop). Should not break on dotted variable names. */
+function summarize(desc) {
+	if (typeof desc != "undefined")
+		return desc.match(/([\w\W]+?\.)[^a-z0-9_$]/i)? RegExp.$1 : desc;
+}
+
+/** Make a symbol sorter by some attribute. */
+function makeSortby(attribute) {
+	return function(a, b) {
+		if (a[attribute] != undefined && b[attribute] != undefined) {
+			a = a[attribute].toLowerCase();
+			b = b[attribute].toLowerCase();
+			if (a < b) return -1;
+			if (a > b) return 1;
+			return 0;
+		}
+	}
+}
+
+/** Pull in the contents of an external file at the given path. */
+function include(path) {
+	var path = publish.conf.templatesDir+path;
+	return IO.readFile(path);
+}
+
+/** Turn a raw source file into a code-hilited page in the docs. */
+function makeSrcFile(path, srcDir, name) {
+	if (JSDOC.opt.s) return;
+	
+	if (!name) {
+		name = path.replace(/\.\.?[\\\/]/g, "").replace(/[\\\/]/g, "_");
+		name = name.replace(/\:/g, "_");
+	}
+	
+	var src = {path: path, name:name, charset: IO.encoding, hilited: ""};
+	
+	if (defined(JSDOC.PluginManager)) {
+		JSDOC.PluginManager.run("onPublishSrc", src);
+	}
+
+	if (src.hilited) {
+		IO.saveFile(srcDir, name+publish.conf.ext, src.hilited);
+	}
+}
+
+/** Build output for displaying function parameters. */
+function makeSignature(params) {
+	if (!params) return "()";
+	var signature = "("
+	+
+	params.filter(
+		function($) {
+			return $.name.indexOf(".") == -1; // don't show config params in signature
+		}
+	).map(
+		function($) {
+			return $.name;
+		}
+	).join(", ")
+	+
+	")";
+	return signature;
+}
+
+/** Find symbol {@link ...} strings in text and turn into html links */
+function resolveLinks(str, from) {
+	str = str.replace(/\{@link ([^} ]+) ?\}/gi,
+		function(match, symbolName) {
+			return new Link().toSymbol(symbolName);
+		}
+	);
+	
+	return str;
+}

jsdoc-template/static/default.css

@@ -0,0 +1,162 @@
+/* default.css */
+body
+{
+	font: 12px "Lucida Grande", Tahoma, Arial, Helvetica, sans-serif;
+	width: 800px;
+}
+
+.header
+{
+	clear: both;
+	background-color: #ccc;
+	padding: 8px;
+}
+
+h1
+{
+	font-size: 150%;
+	font-weight: bold;
+	padding: 0;
+	margin: 1em 0 0 .3em;
+}
+
+hr
+{
+	border: none 0;
+	border-top: 1px solid #7F8FB1;
+	height: 1px;
+}
+
+pre.code
+{
+	display: block;
+	padding: 8px;
+	border: 1px dashed #ccc;
+}
+
+#index
+{
+	margin-top: 24px;
+	float: left;
+	width: 160px;
+	position: absolute;
+	left: 8px;
+	background-color: #F3F3F3;
+	padding: 8px;
+}
+
+#content
+{
+	margin-left: 190px;
+	width: 600px;
+}
+
+.classList
+{
+	list-style-type: none;
+	padding: 0;
+	margin: 0 0 0 8px;
+	font-family: arial, sans-serif;
+	font-size: 1em;
+	overflow: auto;
+}
+
+.classList li
+{
+	padding: 0;
+	margin: 0 0 8px 0;
+}
+
+.summaryTable { width: 100%; }
+
+h1.classTitle
+{
+	font-size:170%;
+	line-height:130%;
+}
+
+h2 { font-size: 110%; }
+caption, div.sectionTitle
+{
+	background-color: #7F8FB1;
+	color: #fff;
+	font-size:130%;
+	text-align: left;
+	padding: 2px 6px 2px 6px;
+	border: 1px #7F8FB1 solid;
+}
+
+div.sectionTitle { margin-bottom: 8px; }
+.summaryTable thead { display: none; }
+
+.summaryTable td
+{
+	vertical-align: top;
+	padding: 4px;
+	border-bottom: 1px #7F8FB1 solid;
+	border-right: 1px #7F8FB1 solid;
+}
+
+/*col#summaryAttributes {}*/
+.summaryTable td.attributes
+{
+	border-left: 1px #7F8FB1 solid;
+	width: 140px;
+	text-align: right;
+}
+
+td.attributes, .fixedFont
+{
+	line-height: 15px;
+	color: #002EBE;
+	font-family: "Courier New",Courier,monospace;
+	font-size: 13px;
+}
+
+.summaryTable td.nameDescription
+{
+	text-align: left;
+	font-size: 13px;
+	line-height: 15px;
+}
+
+.summaryTable td.nameDescription, .description
+{
+	line-height: 15px;
+	padding: 4px;
+	padding-left: 4px;
+}
+
+.summaryTable { margin-bottom: 8px; }
+
+ul.inheritsList
+{
+	list-style: square;
+	margin-left: 20px;
+	padding-left: 0;
+}
+
+.detailList {
+	margin-left: 20px; 
+	line-height: 15px;
+}
+.detailList dt { margin-left: 20px; }
+
+.detailList .heading
+{
+	font-weight: bold;
+	padding-bottom: 6px;
+	margin-left: 0;
+}
+
+.light, td.attributes, .light a:link, .light a:visited
+{
+	color: #777;
+	font-style: italic;
+}
+
+.fineprint
+{
+	text-align: right;
+	font-size: 10px;
+}

jsdoc-template/static/header.html

@@ -0,0 +1,2 @@
+<div id="header">
+</div>

jsdoc-template/static/index.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title>Generated Javascript Documentation</title>
+</head>
+<frameset cols="20%,80%">
+	<frame src="allclasses-frame.html" name="packageFrame" />
+	<frame src="splash.html" name="classFrame" />
+	<noframes>
+		<body>
+		<p>
+		This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+		</p>
+		</body>
+	</noframes>
+</frameset>
+</html>

jsdoc-template/symbol.tmpl

@@ -0,0 +1,35 @@
+<symbol alias="{+data.alias+}">
+	<name>{+data.name+}</name>
+	<memberOf>{+data.memberOf+}</memberOf>
+	<isStatic>{+data.isStatic+}</isStatic>
+	<isa>{+data.isa+}</isa>
+	<desc>{+data.desc+}</desc>
+	<classDesc>{+data.classDesc+}</classDesc>
+	
+	<methods><for each="method" in="data.methods">
+		<method>
+			<name>{+method.name+}</name>
+			<memberOf>{+method.memberOf+}</memberOf>
+			<isStatic>{+method.isStatic+}</isStatic>
+			<desc>{+method.desc+}</desc>
+			<params><for each="param" in="method.params">
+				<param>
+					<type>{+param.type+}</type>
+					<name>{+param.name+}</name>
+					<desc>{+param.desc+}</desc>
+					<defaultValue>{+param.defaultValue+}</defaultValue>
+				</param></for>
+			</params>
+		</method></for>
+	</methods>
+	
+	<properties><for each="property" in="data.properties">
+		<property>
+			<name>{+property.name+}</name>
+			<memberOf>{+property.memberOf+}</memberOf>
+			<isStatic>{+property.isStatic+}</isStatic>
+			<desc>{+property.desc+}</desc>
+			<type>{+property.type+}</type>
+		</property></for>
+	</properties>
+</symbol>

jshint/run.js

@@ -0,0 +1,99 @@
+var fs = require("fs");
+var sys = require("sys");
+var path = require("path");
+var JSHINT = require("./jshint").JSHINT;
+
+// DWF TODO: Standardize this?
+function isExcluded(fullPath) {
+  var fileName = path.basename(fullPath);
+  var excludeFiles = ["json2.js", "jshint.js", "publish.js", "node_suite.js", "jasmine.js", "jasmine-html.js"];
+  for (var i = 0; i < excludeFiles.length; i++) {
+    if (fileName == excludeFiles[i]) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// DWF TODO: This function could/should be re-written
+function allJasmineJsFiles(rootDir) {
+  var files = [];
+  fs.readdirSync(rootDir).filter(function(filename) {
+
+    var fullPath = rootDir + "/" + filename;
+    if (fs.statSync(fullPath).isDirectory() && !fullPath.match(/pages/)) {
+      var subDirFiles = allJasmineJsFiles(fullPath);
+      if (subDirFiles.length > 0) {
+        files = files.concat();
+        return true;
+      }
+    } else {
+      if (fullPath.match(/\.js$/) && !isExcluded(fullPath)) {
+        files.push(fullPath);
+        return true;
+      }
+    }
+    return false;
+  });
+
+  return files;
+}
+
+var jasmineJsFiles = allJasmineJsFiles(".");
+jasmineJsFiles.reverse(); //cheap way to do the stuff in src stuff first
+
+var jasmineJsHintConfig = {
+
+  forin:true,             //while it's possible that we could be
+  //considering unwanted prototype methods, mostly
+  //we're doing this because the jsobjects are being
+  //used as maps.
+
+  loopfunc:true           //we're fine with functions defined inside loops (setTimeout functions, etc)
+
+};
+
+var jasmineGlobals = {};
+
+
+//jasmine.undefined is a jasmine-ism, let's let it go...
+function removeJasmineUndefinedErrors(errors) {
+  var keepErrors = [];
+  for (var i = 0; i < errors.length; i++) {
+    if (!(errors[i] &&
+      errors[i].raw &&
+      errors[i].evidence &&
+      ( errors[i].evidence.match(/jasmine\.undefined/) ||
+        errors[i].evidence.match(/diz be undefined yo/) )
+      )) {
+      keepErrors.push(errors[i]);
+    }
+  }
+  return keepErrors;
+}
+
+(function() {
+  var ansi = {
+    green: '\033[32m',
+    red: '\033[31m',
+    yellow: '\033[33m',
+    none: '\033[0m'
+  };
+
+  for (var i = 0; i < jasmineJsFiles.length; i++) {
+    var file = jasmineJsFiles[i];
+    JSHINT(fs.readFileSync(file, "utf8"), jasmineJsHintConfig);
+    var errors = JSHINT.data().errors || [];
+    errors = removeJasmineUndefinedErrors(errors);
+
+    if (errors.length >= 1) {
+      console.log(ansi.red + "Jasmine JSHint failure: " + ansi.none);
+      console.log(file);
+      console.log(errors);
+      process.exit(1);
+    }
+  }
+
+  console.log(ansi.green + "Jasmine JSHint PASSED." + ansi.none);
+})();
+

lib/console/console.js

@@ -1,160 +0,0 @@
-/*
-Copyright (c) 2008-2013 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.
-*/
-function getJasmineRequireObj() {
-  if (typeof module !== "undefined" && module.exports) {
-    return exports;
-  } else {
-    window.jasmineRequire = window.jasmineRequire || {};
-    return window.jasmineRequire;
-  }
-}
-
-getJasmineRequireObj().console = function(jRequire, j$) {
-  j$.ConsoleReporter = jRequire.ConsoleReporter();
-};
-
-getJasmineRequireObj().ConsoleReporter = function() {
-
-  var noopTimer = {
-    start: function(){},
-    elapsed: function(){ return 0; }
-  };
-
-  function ConsoleReporter(options) {
-    var print = options.print,
-      showColors = options.showColors || false,
-      onComplete = options.onComplete || function() {},
-      timer = options.timer || noopTimer,
-      specCount,
-      failureCount,
-      failedSpecs = [],
-      pendingCount,
-      ansi = {
-        green: '\x1B[32m',
-        red: '\x1B[31m',
-        yellow: '\x1B[33m',
-        none: '\x1B[0m'
-      };
-
-    this.jasmineStarted = function() {
-      specCount = 0;
-      failureCount = 0;
-      pendingCount = 0;
-      print("Started");
-      printNewline();
-      timer.start();
-    };
-
-    this.jasmineDone = function() {
-      printNewline();
-      for (var i = 0; i < failedSpecs.length; i++) {
-        specFailureDetails(failedSpecs[i]);
-      }
-
-      printNewline();
-      var specCounts = specCount + " " + plural("spec", specCount) + ", " +
-        failureCount + " " + plural("failure", failureCount);
-
-      if (pendingCount) {
-        specCounts += ", " + pendingCount + " pending " + plural("spec", pendingCount);
-      }
-
-      print(specCounts);
-
-      printNewline();
-      var seconds = timer.elapsed() / 1000;
-      print("Finished in " + seconds + " " + plural("second", seconds));
-
-      printNewline();
-
-      onComplete(failureCount === 0);
-    };
-
-    this.specDone = function(result) {
-      specCount++;
-
-      if (result.status == "pending") {
-        pendingCount++;
-        print(colored("yellow", "*"));
-        return;
-      }
-
-      if (result.status == "passed") {
-        print(colored("green", '.'));
-        return;
-      }
-
-      if (result.status == "failed") {
-        failureCount++;
-        failedSpecs.push(result);
-        print(colored("red", 'F'));
-      }
-    };
-
-    return this;
-
-    function printNewline() {
-      print("\n");
-    }
-
-    function colored(color, str) {
-      return showColors ? (ansi[color] + str + ansi.none) : str;
-    }
-
-    function plural(str, count) {
-      return count == 1 ? str : str + "s";
-    }
-
-    function repeat(thing, times) {
-      var arr = [];
-      for (var i = 0; i < times; i++) {
-        arr.push(thing);
-      }
-      return arr;
-    }
-
-    function indent(str, spaces) {
-      var lines = (str || '').split("\n");
-      var newArr = [];
-      for (var i = 0; i < lines.length; i++) {
-        newArr.push(repeat(" ", spaces).join("") + lines[i]);
-      }
-      return newArr.join("\n");
-    }
-
-    function specFailureDetails(result) {
-      printNewline();
-      print(result.fullName);
-
-      for (var i = 0; i < result.failedExpectations.length; i++) {
-        var failedExpectation = result.failedExpectations[i];
-        printNewline();
-        print(indent(failedExpectation.stack, 2));
-      }
-
-      printNewline();
-    }
-  }
-
-  return ConsoleReporter;
-};

lib/jasmine-core.rb

@@ -6,44 +6,12 @@ module Jasmine
       end
 
       def js_files
-        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq - boot_files
-      end
-
-      SPEC_TYPES = ["core", "html", "node"]
-
-      def core_spec_files
-        spec_files("core")
-      end
-
-      def html_spec_files
-        spec_files("html")
-      end
-
-      def node_spec_files
-        spec_files("node")
-      end
-
-      def boot_files
-        ["boot.js"]
-      end
-
-      def boot_dir
-        File.join(path, 'boot')
-      end
-
-      def spec_files(type)
-        raise ArgumentError.new("Unrecognized spec type") unless SPEC_TYPES.include?(type)
-        (Dir.glob(File.join(path, "spec", type, "*.js"))).map { |f| File.join("spec", type, File.basename(f)) }.uniq
+        (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq
       end
 
       def css_files
         Dir.glob(File.join(path, "*.css")).map { |f| File.basename(f) }
       end
-
-      def images_dir
-        File.join(File.dirname(__FILE__), '../images')
-      end
-
     end
   end
 end

lib/jasmine-core/boot.js

@@ -1,203 +0,0 @@
-/*
-Copyright (c) 2008-2013 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.
-*/
-/**
- 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.
-
- 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.
-
- The location of `boot.js` can be specified and/or overridden in `jasmine.yml`.
-
- [jasmine-gem]: http://github.com/pivotal/jasmine-gem
- */
-
-(function() {
-
-  /**
-   * ## Require & Instantiate
-   *
-   * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
-   */
-  window.jasmine = jasmineRequire.core(jasmineRequire);
-
-  /**
-   * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
-   */
-  jasmineRequire.html(jasmine);
-
-  /**
-   * Create the Jasmine environment. This is used to run all specs in a project.
-   */
-  var env = jasmine.getEnv();
-
-  /**
-   * ## The Global Interface
-   *
-   * 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()
-    })
-  };
-
-  /**
-   * 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`.
-   */
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    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
-   *
-   * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface.
-   */
-
-  var queryString = new jasmine.QueryString({
-    getWindowLocation: function() { return window.location; }
-  });
-
-  var catchingExceptions = queryString.getParam("catch");
-  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
-
-  /**
-   * ## Reporters
-   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
-   */
-  var htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
-    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()
-  });
-
-  /**
-   * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
-   */
-  env.addReporter(jasmineInterface.jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  /**
-   * Filter which specs will be run by matching the start of the full name against the `spec` query param.
-   */
-  var specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() { return queryString.getParam("spec"); }
-  });
-
-  env.specFilter = function(spec) {
-    return specFilter.matches(spec.getFullName());
-  };
-
-  /**
-   * Setting up timing functions to be able to be overridden. Certain browsers (Safari, IE 8, phantomjs) require this hack.
-   */
-  window.setTimeout = window.setTimeout;
-  window.setInterval = window.setInterval;
-  window.clearTimeout = window.clearTimeout;
-  window.clearInterval = window.clearInterval;
-
-  /**
-   * ## Execution
-   *
-   * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
-   */
-  var currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-
-  /**
-   * Helper function for readability above.
-   */
-  function extend(destination, source) {
-    for (var property in source) destination[property] = source[property];
-    return destination;
-  }
-
-}());

lib/jasmine-core/boot/boot.js

@@ -1,181 +0,0 @@
-/**
- 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.
-
- 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.
-
- The location of `boot.js` can be specified and/or overridden in `jasmine.yml`.
-
- [jasmine-gem]: http://github.com/pivotal/jasmine-gem
- */
-
-(function() {
-
-  /**
-   * ## Require & Instantiate
-   *
-   * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
-   */
-  window.jasmine = jasmineRequire.core(jasmineRequire);
-
-  /**
-   * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
-   */
-  jasmineRequire.html(jasmine);
-
-  /**
-   * Create the Jasmine environment. This is used to run all specs in a project.
-   */
-  var env = jasmine.getEnv();
-
-  /**
-   * ## The Global Interface
-   *
-   * 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()
-    })
-  };
-
-  /**
-   * 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`.
-   */
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    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
-   *
-   * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface.
-   */
-
-  var queryString = new jasmine.QueryString({
-    getWindowLocation: function() { return window.location; }
-  });
-
-  var catchingExceptions = queryString.getParam("catch");
-  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
-
-  /**
-   * ## Reporters
-   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
-   */
-  var htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
-    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()
-  });
-
-  /**
-   * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
-   */
-  env.addReporter(jasmineInterface.jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  /**
-   * Filter which specs will be run by matching the start of the full name against the `spec` query param.
-   */
-  var specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() { return queryString.getParam("spec"); }
-  });
-
-  env.specFilter = function(spec) {
-    return specFilter.matches(spec.getFullName());
-  };
-
-  /**
-   * Setting up timing functions to be able to be overridden. Certain browsers (Safari, IE 8, phantomjs) require this hack.
-   */
-  window.setTimeout = window.setTimeout;
-  window.setInterval = window.setInterval;
-  window.clearTimeout = window.clearTimeout;
-  window.clearInterval = window.clearInterval;
-
-  /**
-   * ## Execution
-   *
-   * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
-   */
-  var currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-
-  /**
-   * Helper function for readability above.
-   */
-  function extend(destination, source) {
-    for (var property in source) destination[property] = source[property];
-    return destination;
-  }
-
-}());

lib/jasmine-core/example/SpecRunner.html

@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Jasmine Test Runner</title>
+  <link rel="stylesheet" type="text/css" href="lib/jasmine-##JASMINE_VERSION##/jasmine.css">
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine.js"></script>
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine-html.js"></script>
+
+  <!-- include source files here... -->
+  <script type="text/javascript" src="src/Player.js"></script>
+  <script type="text/javascript" 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>
+
+</head>
+<body>
+<div id="REMOVE_THIS_LINE_FROM_BUILD"><p>You must be trying to look at examples in the Jasmine source tree.</p><p>Please download a distribution version of Jasmine at <a href="http://pivotal.github.com/jasmine/">http://pivotal.github.com/jasmine/</a>.</p></div>
+<script type="text/javascript">
+  jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+  jasmine.getEnv().execute();
+</script>
+
+</body>
+</html>

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

@@ -52,7 +52,7 @@ describe("Player", function() {
 
       expect(function() {
         player.resume();
-      }).toThrowError("song is already playing");
+      }).toThrow("song is already playing");
     });
   });
-});
+});

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

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

lib/jasmine-core/jasmine-html.js

@@ -1,359 +1,190 @@
-/*
-Copyright (c) 2008-2013 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.
-*/
-jasmineRequire.html = function(j$) {
-  j$.ResultsNode = jasmineRequire.ResultsNode();
-  j$.HtmlReporter = jasmineRequire.HtmlReporter(j$);
-  j$.QueryString = jasmineRequire.QueryString();
-  j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter();
+jasmine.TrivialReporter = function(doc) {
+  this.document = doc || document;
+  this.suiteDivs = {};
+  this.logRunningSpecs = false;
 };
 
-jasmineRequire.HtmlReporter = function(j$) {
+jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
 
-  var noopTimer = {
-    start: function() {},
-    elapsed: function() { return 0; }
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) { el.appendChild(child); }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
+  var showPassed, showSkipped;
+
+  this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
+      this.createDom('div', { className: 'banner' },
+        this.createDom('div', { className: 'logo' },
+            this.createDom('a', { href: 'http://pivotal.github.com/jasmine/', target: "_blank" }, "Jasmine"),
+            this.createDom('span', { className: 'version' }, runner.env.versionString())),
+        this.createDom('div', { className: 'options' },
+            "Show ",
+            showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
+            showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
+            )
+          ),
+
+      this.runnerDiv = this.createDom('div', { className: 'runner running' },
+          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
+          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
+          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
+      );
+
+  this.document.body.appendChild(this.outerDiv);
+
+  var suites = runner.suites();
+  for (var i = 0; i < suites.length; i++) {
+    var suite = suites[i];
+    var suiteDiv = this.createDom('div', { className: 'suite' },
+        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
+        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
+    this.suiteDivs[suite.id] = suiteDiv;
+    var parentDiv = this.outerDiv;
+    if (suite.parentSuite) {
+      parentDiv = this.suiteDivs[suite.parentSuite.id];
+    }
+    parentDiv.appendChild(suiteDiv);
+  }
+
+  this.startedAt = new Date();
+
+  var self = this;
+  showPassed.onclick = function(evt) {
+    if (showPassed.checked) {
+      self.outerDiv.className += ' show-passed';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
+    }
   };
 
-  function HtmlReporter(options) {
-    var env = options.env || {},
-      getContainer = options.getContainer,
-      createElement = options.createElement,
-      createTextNode = options.createTextNode,
-      onRaiseExceptionsClick = options.onRaiseExceptionsClick || function() {},
-      timer = options.timer || noopTimer,
-      results = [],
-      specsExecuted = 0,
-      failureCount = 0,
-      pendingSpecCount = 0,
-      htmlReporterMain,
-      symbols;
-
-    this.initialize = function() {
-      htmlReporterMain = createDom("div", {className: "html-reporter"},
-        createDom("div", {className: "banner"},
-          createDom("span", {className: "title"}, "Jasmine"),
-          createDom("span", {className: "version"}, j$.version)
-        ),
-        createDom("ul", {className: "symbol-summary"}),
-        createDom("div", {className: "alert"}),
-        createDom("div", {className: "results"},
-          createDom("div", {className: "failures"})
-        )
-      );
-      getContainer().appendChild(htmlReporterMain);
-
-      symbols = find(".symbol-summary");
-    };
-
-    var totalSpecsDefined;
-    this.jasmineStarted = function(options) {
-      totalSpecsDefined = options.totalSpecsDefined || 0;
-      timer.start();
-    };
-
-    var summary = createDom("div", {className: "summary"});
-
-    var topResults = new j$.ResultsNode({}, "", null),
-      currentParent = topResults;
-
-    this.suiteStarted = function(result) {
-      currentParent.addChild(result, "suite");
-      currentParent = currentParent.last();
-    };
-
-    this.suiteDone = function(result) {
-      if (currentParent == topResults) {
-        return;
-      }
-
-      currentParent = currentParent.parent;
-    };
-
-    this.specStarted = function(result) {
-      currentParent.addChild(result, "spec");
-    };
-
-    var failures = [];
-    this.specDone = function(result) {
-      if (result.status != "disabled") {
-        specsExecuted++;
-      }
-
-      symbols.appendChild(createDom("li", {
-          className: result.status,
-          id: "spec_" + result.id,
-          title: result.fullName
-        }
-      ));
-
-      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: "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));
-        }
-
-        failures.push(failure);
-      }
-
-      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 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"
-        })
-      ));
-      var checkbox = find("input");
-
-      checkbox.checked = !env.catchingExceptions();
-      checkbox.onclick = onRaiseExceptionsClick;
-
-      if (specsExecuted < totalSpecsDefined) {
-        var skippedMessage = "Ran " + specsExecuted + " of " + totalSpecsDefined + " specs - run all";
-        alert.appendChild(
-          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 statusBarClassName = "bar " + ((failureCount > 0) ? "failed" : "passed");
-      alert.appendChild(createDom("span", {className: statusBarClassName}, statusBarMessage));
-
-      var results = find(".results");
-      results.appendChild(summary);
-
-      summaryList(topResults, summary);
-
-      function summaryList(resultsTree, domParent) {
-        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)
-              )
-            );
-
-            summaryList(resultNode, suiteListNode);
-            domParent.appendChild(suiteListNode);
-          }
-          if (resultNode.type == "spec") {
-            if (domParent.getAttribute("class") != "specs") {
-              specListNode = createDom("ul", {className: "specs"});
-              domParent.appendChild(specListNode);
-            }
-            specListNode.appendChild(
-              createDom("li", {
-                  className: resultNode.result.status,
-                  id: "spec-" + resultNode.result.id
-                },
-                createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description)
-              )
-            );
-          }
-        }
-      }
-
-      if (failures.length) {
-        alert.appendChild(
-          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 ")));
-
-        find(".failures-menu").onclick = function() {
-          setMenuModeTo('failure-list');
-        };
-        find(".spec-list-menu").onclick = function() {
-          setMenuModeTo('spec-list');
-        };
-
-        setMenuModeTo('failure-list');
-
-        var failureNode = find(".failures");
-        for (var i = 0; i < failures.length; i++) {
-          failureNode.appendChild(failures[i]);
-        }
-      }
-    };
-
-    return this;
-
-    function find(selector) {
-      return getContainer().querySelector(selector);
+  showSkipped.onclick = function(evt) {
+    if (showSkipped.checked) {
+      self.outerDiv.className += ' show-skipped';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
     }
+  };
+};
 
-    function createDom(type, attrs, childrenVarArgs) {
-      var el = createElement(type);
+jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
+  var results = runner.results();
+  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
+  this.runnerDiv.setAttribute("class", className);
+  //do it twice for IE
+  this.runnerDiv.setAttribute("className", className);
+  var specs = runner.specs();
+  var specCount = 0;
+  for (var i = 0; i < specs.length; i++) {
+    if (this.specFilter(specs[i])) {
+      specCount++;
+    }
+  }
+  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
+  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
+  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
 
-      for (var i = 2; i < arguments.length; i++) {
-        var child = arguments[i];
+  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
+};
 
-        if (typeof child === 'string') {
-          el.appendChild(createTextNode(child));
-        } else {
-          if (child) {
-            el.appendChild(child);
-          }
-        }
+jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
+  var results = suite.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.totalCount === 0) { // todo: change this to check results.skipped
+    status = 'skipped';
+  }
+  this.suiteDivs[suite.id].className += " " + status;
+};
+
+jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
+  if (this.logRunningSpecs) {
+    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+  }
+};
+
+jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
+  var results = spec.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+  var specDiv = this.createDom('div', { className: 'spec '  + status },
+      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(spec.getFullName()),
+        title: spec.getFullName()
+      }, spec.description));
+
+
+  var resultItems = results.getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
       }
-
-      for (var attr in attrs) {
-        if (attr == "className") {
-          el[attr] = attrs[attr];
-        } else {
-          el.setAttribute(attr, attrs[attr]);
-        }
-      }
-
-      return el;
-    }
-
-    function pluralize(singular, count) {
-      var word = (count == 1 ? singular : singular + "s");
-
-      return "" + count + " " + word;
-    }
-
-    function specHref(result) {
-      return "?spec=" + encodeURIComponent(result.fullName);
-    }
-
-    function setMenuModeTo(mode) {
-      htmlReporterMain.setAttribute("class", "html-reporter " + mode);
     }
   }
 
-  return HtmlReporter;
-};
-
-jasmineRequire.HtmlSpecFilter = function() {
-  function HtmlSpecFilter(options) {
-    var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    var filterPattern = new RegExp(filterString);
-
-    this.matches = function(specName) {
-      return filterPattern.test(specName);
-    };
+  if (messagesDiv.childNodes.length > 0) {
+    specDiv.appendChild(messagesDiv);
   }
 
-  return HtmlSpecFilter;
+  this.suiteDivs[spec.suite.id].appendChild(specDiv);
 };
 
-jasmineRequire.ResultsNode = function() {
-  function ResultsNode(result, type, parent) {
-    this.result = result;
-    this.type = type;
-    this.parent = parent;
-
-    this.children = [];
-
-    this.addChild = function(result, type) {
-      this.children.push(new ResultsNode(result, type, this));
-    };
-
-    this.last = function() {
-      return this.children[this.children.length - 1];
-    };
-  }
-
-  return ResultsNode;
-};
-
-jasmineRequire.QueryString = function() {
-  function QueryString(options) {
-
-    this.setParam = function(key, value) {
-      var paramMap = queryStringToParamMap();
-      paramMap[key] = value;
-      options.getWindowLocation().search = toQueryString(paramMap);
-    };
-
-    this.getParam = function(key) {
-      return queryStringToParamMap()[key];
-    };
-
-    return this;
-
-    function toQueryString(paramMap) {
-      var qStrPairs = [];
-      for (var prop in paramMap) {
-        qStrPairs.push(encodeURIComponent(prop) + "=" + encodeURIComponent(paramMap[prop]));
-      }
-      return "?" + qStrPairs.join('&');
+jasmine.TrivialReporter.prototype.log = function() {
+  var console = jasmine.getGlobal().console;
+  if (console && console.log) {
+    if (console.log.apply) {
+      console.log.apply(console, arguments);
+    } else {
+      console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
     }
+  }
+};
 
-    function queryStringToParamMap() {
-      var paramStr = options.getWindowLocation().search.substring(1),
-        params = [],
-        paramMap = {};
-
-      if (paramStr.length > 0) {
-        params = paramStr.split('&');
-        for (var i = 0; i < params.length; i++) {
-          var p = params[i].split('=');
-          var value = decodeURIComponent(p[1]);
-          if (value === "true" || value === "false") {
-            value = JSON.parse(value);
-          }
-          paramMap[decodeURIComponent(p[0])] = value;
-        }
-      }
-
-      return paramMap;
-    }
+jasmine.TrivialReporter.prototype.getLocation = function() {
+  return this.document.location;
+};
 
+jasmine.TrivialReporter.prototype.specFilter = function(spec) {
+  var paramMap = {};
+  var params = this.getLocation().search.substring(1).split('&');
+  for (var i = 0; i < params.length; i++) {
+    var p = params[i].split('=');
+    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
   }
 
-  return QueryString;
+  if (!paramMap.spec) {
+    return true;
+  }
+  return spec.getFullName().indexOf(paramMap.spec) === 0;
 };

lib/jasmine-core/jasmine.css

@@ -1,55 +1,166 @@
-body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
+body {
+  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
+}
 
-.html-reporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
-.html-reporter a { text-decoration: none; }
-.html-reporter a:hover { text-decoration: underline; }
-.html-reporter p, .html-reporter h1, .html-reporter h2, .html-reporter h3, .html-reporter h4, .html-reporter h5, .html-reporter h6 { margin: 0; line-height: 14px; }
-.html-reporter .banner, .html-reporter .symbol-summary, .html-reporter .summary, .html-reporter .result-message, .html-reporter .spec .description, .html-reporter .spec-detail .description, .html-reporter .alert .bar, .html-reporter .stack-trace { padding-left: 9px; padding-right: 9px; }
-.html-reporter .banner .version { margin-left: 14px; }
-.html-reporter #jasmine_content { position: fixed; right: 100%; }
-.html-reporter .version { color: #aaaaaa; }
-.html-reporter .banner { margin-top: 14px; }
-.html-reporter .duration { color: #aaaaaa; float: right; }
-.html-reporter .symbol-summary { overflow: hidden; *zoom: 1; margin: 14px 0; }
-.html-reporter .symbol-summary li { display: inline-block; height: 8px; width: 14px; font-size: 16px; }
-.html-reporter .symbol-summary li.passed { font-size: 14px; }
-.html-reporter .symbol-summary li.passed:before { color: #5e7d00; content: "\02022"; }
-.html-reporter .symbol-summary li.failed { line-height: 9px; }
-.html-reporter .symbol-summary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
-.html-reporter .symbol-summary li.disabled { font-size: 14px; }
-.html-reporter .symbol-summary li.disabled:before { color: #bababa; content: "\02022"; }
-.html-reporter .symbol-summary li.pending { line-height: 17px; }
-.html-reporter .symbol-summary li.pending:before { color: #ba9d37; content: "*"; }
-.html-reporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
-.html-reporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
-.html-reporter .bar.failed { background-color: #b03911; }
-.html-reporter .bar.passed { background-color: #a6b779; }
-.html-reporter .bar.skipped { background-color: #bababa; }
-.html-reporter .bar.menu { background-color: #fff; color: #aaaaaa; }
-.html-reporter .bar.menu a { color: #333333; }
-.html-reporter .bar a { color: white; }
-.html-reporter.spec-list .bar.menu.failure-list, .html-reporter.spec-list .results .failures { display: none; }
-.html-reporter.failure-list .bar.menu.spec-list, .html-reporter.failure-list .summary { display: none; }
-.html-reporter .running-alert { background-color: #666666; }
-.html-reporter .results { margin-top: 14px; }
-.html-reporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
-.html-reporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
-.html-reporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
-.html-reporter.showDetails .summary { display: none; }
-.html-reporter.showDetails #details { display: block; }
-.html-reporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
-.html-reporter .summary { margin-top: 14px; }
-.html-reporter .summary ul { list-style-type: none; margin-left: 14px; padding-top: 0; padding-left: 0; }
-.html-reporter .summary ul.suite { margin-top: 7px; margin-bottom: 7px; }
-.html-reporter .summary li.passed a { color: #5e7d00; }
-.html-reporter .summary li.failed a { color: #b03911; }
-.html-reporter .summary li.pending a { color: #ba9d37; }
-.html-reporter .description + .suite { margin-top: 0; }
-.html-reporter .suite { margin-top: 14px; }
-.html-reporter .suite a { color: #333333; }
-.html-reporter .failures .spec-detail { margin-bottom: 28px; }
-.html-reporter .failures .spec-detail .description { background-color: #b03911; }
-.html-reporter .failures .spec-detail .description a { color: white; }
-.html-reporter .result-message { padding-top: 14px; color: #333333; white-space: pre; }
-.html-reporter .result-message span.result { display: block; }
-.html-reporter .stack-trace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
+
+.jasmine_reporter a:visited, .jasmine_reporter a {
+  color: #303; 
+}
+
+.jasmine_reporter a:hover, .jasmine_reporter a:active {
+  color: blue; 
+}
+
+.run_spec {
+  float:right;
+  padding-right: 5px;
+  font-size: .8em;
+  text-decoration: none;
+}
+
+.jasmine_reporter {
+  margin: 0 5px;
+}
+
+.banner {
+  color: #303;
+  background-color: #fef;
+  padding: 5px;
+}
+
+.logo {
+  float: left;
+  font-size: 1.1em;
+  padding-left: 5px;
+}
+
+.logo .version {
+  font-size: .6em;
+  padding-left: 1em;
+}
+
+.runner.running {
+  background-color: yellow;
+}
+
+
+.options {
+  text-align: right;
+  font-size: .8em;
+}
+
+
+
+
+.suite {
+  border: 1px outset gray;
+  margin: 5px 0;
+  padding-left: 1em;
+}
+
+.suite .suite {
+  margin: 5px; 
+}
+
+.suite.passed {
+  background-color: #dfd;
+}
+
+.suite.failed {
+  background-color: #fdd;
+}
+
+.spec {
+  margin: 5px;
+  padding-left: 1em;
+  clear: both;
+}
+
+.spec.failed, .spec.passed, .spec.skipped {
+  padding-bottom: 5px;
+  border: 1px solid gray;
+}
+
+.spec.failed {
+  background-color: #fbb;
+  border-color: red;
+}
+
+.spec.passed {
+  background-color: #bfb;
+  border-color: green;
+}
+
+.spec.skipped {
+  background-color: #bbb;
+}
+
+.messages {
+  border-left: 1px dashed gray;
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+.passed {
+  background-color: #cfc;
+  display: none;
+}
+
+.failed {
+  background-color: #fbb;
+}
+
+.skipped {
+  color: #777;
+  background-color: #eee;
+  display: none;
+}
+
+
+/*.resultMessage {*/
+  /*white-space: pre;*/
+/*}*/
+
+.resultMessage span.result {
+  display: block;
+  line-height: 2em;
+  color: black;
+}
+
+.resultMessage .mismatch {
+  color: black;
+}
+
+.stackTrace {
+  white-space: pre;
+  font-size: .8em;
+  margin-left: 10px;
+  max-height: 5em;
+  overflow: auto;
+  border: 1px inset red;
+  padding: 1em;
+  background: #eef;
+}
+
+.finished-at {
+  padding-left: 1em;
+  font-size: .6em;
+}
+
+.show-passed .passed,
+.show-skipped .skipped {
+  display: block;
+}
+
+
+#jasmine_content {
+  position:fixed;
+  right: 100%;
+}
+
+.runner {
+  border: 1px solid gray;
+  display: block;
+  margin: 5px 0;
+  padding: 2px 0 2px 10px;
+}

lib/jasmine-core/spec

@@ -1 +0,0 @@
-../../spec

lib/jasmine-core/version.rb

@@ -1,9 +1,8 @@
-#
-# DO NOT Edit this file. Canonical version of Jasmine lives in the repo's package.json. This file is generated
-# by a grunt task when the standalone release is built.
-#
 module Jasmine
   module Core
-    VERSION = "2.0.0"
+    require 'json'
+    VERSION_HASH = JSON.parse(File.new(File.join(File.dirname(__FILE__), "..", "..", "src", "core", "version.json")).read);
+    VERSION = "#{VERSION_HASH['major']}.#{VERSION_HASH['minor']}.#{VERSION_HASH['build']}"
+    VERSION << ".rc#{VERSION_HASH['release_candidate']}" if VERSION_HASH['release_candidate']
   end
 end

package.json

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

release_notes/20.md

@@ -1,179 +0,0 @@
-# Jasmine Core 2.0 Release Notes
-
-## Summary
-
-These notes are for Jasmine Core 2.0.
-
-## Breaking Changes
-
-The [`introduction.js`][intro] page covers the current syntax, highlighting the changes. Here are the known interface changes that are not backwards compatible with 1.x.
-
-* New syntax for asynchronous specs
-* New syntax for spies
-* New interface for reporters
-* Better Equality testing
-* Replaced custom matchers for ease of use
-* Change to `toThrow` matcher
-* Clock now remains installed when a spec finishes
-* More Jasmine internal variables/functions have been moved into closures
-
-### New syntax for asynchronous specs
-
-Similar to [Mocha][mocha], Jasmine `before`s, `spec`s, and `after`s can take an optional `done` callback in order to force asynchronous tests. The next function, whether it's a `before`, `spec` or `after`, will wait until this function is called or until a timeout is reached.
-
-### New syntax for spies
-
-Spies have a slightly modified syntax. The idea came from a desire to preserve any of the properties on a spied-upon function and some better testing patterns.
-
-### New interface for reporters
-
-The reporter interface has been **replaced**. The callbacks are different and more consistent. The objects passed in should only provide what is needed to report results. This enforces an interface to result data so custom reporters will be less coupled to the Jasmine implementation. The Jasmine reporter API now includes a slot for a `timer` object.
-
-### Better Equality testing
-
-We removed the previous equality code and are now using new code for testing equality. We started with [Underscore.js][underscore]'s `isEqual`, refactored a bit and added some additional tests.
-
-### Replaced custom matchers for ease of use
-
-The interface for adding custom matchers has been **replaced**. It has always been possible to add custom matchers, but the API was barely documented and difficult to test. We've changed how matchers are added and tested. Jasmine adds its own matchers by the same mechanism that custom matchers use. Dogfooding FTW.
-
-### Change to `toThrow` matcher
-
-We've changed the behavior of the `toThrow` matcher, moving some functionality to the `toThrowError` matcher. This should allow more of the requested use cases.
-
-### Clock now remains installed when a spec finishes
-
-After installing the Jasmine Clock, it will stay installed until `uninstall` is called -- clearing up any ambiguity for when those timing functions will revert to using the global clock object.
-
-## More Jasmine internal variables/functions have been moved into closures
-
-Certain variables/functions like a function to get the next spec id have been moved into closures, making the Jasmine interface cleaner.
-
-## Other Changes
-
-* Massive refactoring and better testing
-* Environment setup now in `boot.js`
-* Development and Build moved to Grunt
-* Changes to how Jasmine is loaded
-* Changes to how Jasmine is tested
-* Better node.js support
-* Better Continuous Integration Environment at Travis
-* Support matrix updated
-* Removed JsDoc Pages
-* Adding Code Climate for JavaScript
-
-## Massive refactoring and better testing
-
-This is the biggest set of changes. We've touched nearly every file and every object. We've merged objects together and factored out code. We styled the code more consistently. We've improved nearly every test.
-
-In general, Jasmine is made of smaller, more-loosely-coupled objects, unit-tested with explicit dependencies injected. This made tests easier to read, write, and maintain. We know this has made Jasmine development easier for the core team. We expect (and hope) this makes it easier for the community to extend Jasmine and provide pull requests that make more sense the first time out.
-
-## Environment setup now in `boot.js`
-
-Instantiation and setup of the Jasmine environment, including building reporters, exposing the "global" functions, and executing tests has moved into its own file: `boot.js`. This should make it easier to add custom reporters, configure some objects, or just in general change how you use Jasmine from the outside.
-
-For example, during development, Jasmine uses its own `devboot.js` to load itself twice - once from `jasmine.js` and once from the source directories.
-
-## Development and Build moved to Grunt
-
-We've moved away from Ruby and embraced [Node.js][node] and [Grunt.js][grunt] for the various command line tasks during development. Yes, it's a just a different set of dependencies. But it's less code for the team to maintain - it turns out that JavaScript tools are pretty good at building JavaScript projects. This will make it easier for the community to make sure contributions work in browsers and in Node.js before submitting Pull Requests. There is more detail in the [Contributor's Guide][contrib].
-
-## Changes to how Jasmine is loaded
-
-We did not want to add new run-time dependencies, yet we needed to be cleaner when loading Jasmine. So we wrote a custom "require" scheme that works in Node.js and in browsers. This only affects pull requests which add files - please be careful in these cases. Again, the [Contributor's Guide][contrib] should help.
-
-## Changes to how Jasmine is tested with Jasmine
-
-Writing a custom require system helped enforce self-testing - the built `jasmine.js` testing Jasmine from the source directories. Overall this has improved the stability of the code. When you look at Jasmine's tests, you'll see both `jasmine` and `j$` used. The former, `jasmine`, will always be used to test the code from source, which is loaded into the reference `j$`. Please adhere to this pattern when writing tests for contributions.
-
-## Better node.js support
-
-`Node.js` is now officially a first-class citizen. For a long time we've made sure tests were green in Node before releasing. But it is now officially part of Jasmine's CI build at [Travis][travis]. For the curious, the [`node_suite.js`][node_suite], is essentially a `boot.js` for Node. An official `npm` is coming.
-
-## Better Continuous Integration Environment at Travis
-
-The [CI build at Travis][travis_jasmine] now runs the core specs in a build matrix across browsers. It's far from complete on the operating system matrix, but you will see that Jasmine runs against: Firefox, Chrome, Safari 5, Safari 6, [Phantom.js][phantom], [Node.js][node], and IE versions 8, 9, and 10. Big thanks to [SauceLabs][sauce] for their support of open source projects. We will happily take pull requests for additional OS/Browser combos within the matrix.
-
-## Support Matrix Updated
-
-We're dropping support for IE < 8. [Jasmine 1.x][jasmine_downloads] remains for projects that need to support older browsers.
-
-## Removed JsDoc Pages
-
-Comments in code are lies waiting to happen. Jasmine's JsDoc comments were no exception. The comments were out of date, the generated pages were even more out of date, and frankly they were not helpful. So they're gone.
-
-Last year saw the posting of the [`introduction.js`][intro] page to document the real, practical interface for projects to use. This page has received a lot of positive feedback so expect more pages like this one.
-
-## Adding Code Climate for JavaScript
-
-We are running Code Climate for Jasmine. We have some work to do here but it's helping us easily find code hotspots.
-
-## Pull Requests and Issues
-
-The following Pull Requests were merged:
-
-* ObjectContaining wrong filed value error message #[394](https://github.com/pivotal/jasmine/issues/394) from albertandrejev
-* Removed unnecessary parameter from `suiteFactory()` call #[397](https://github.com/pivotal/jasmine/issues/397) from valera-rozuvan
-* `jasmine.Any` supports `Boolean` #[392](https://github.com/pivotal/jasmine/issues/392) from albertandrejev
-* Reporters get execution time #[30](https://github.com/pivotal/jasmine/issues/30)
-* `toThrow` matchers handle falsy exceptions #[317](https://github.com/pivotal/jasmine/issues/371)
-* Removed deprecated `jasmine.Matchers.pp` #[363](https://github.com/pivotal/jasmine/issues/363) from robinboehm
-* Fix for Clock ticking to default to 0 #[340](https://github.com/pivotal/jasmine/issues/340) from Caio Cunha
-* Whitespace failures should be easier to understand #[332](https://github.com/pivotal/jasmine/issues/332) from bjornblomqvist
-* Fix for more markdown-y image for Build status #[329](https://github.com/pivotal/jasmine/issues/329) from sunliwen
-* UTF-8 encoding fixes #[333](https://github.com/pivotal/jasmine/issues/333) from bjornblomqvist
-* Replaced deprecated octal literal with hexadecimal from kris7t
-* Make getGlobal() work in strict mode from metaweta
-* Clears timeout timer even when async spec throws an exception from tidoust
-* Timeouts scheduled within a delayed function are correctly scheduled and executed from maciej-filip-sz
-
-### Bug Fixes
-* Improved the performance of the HTML output with a CSS change #[428](https://github.com/pivotal/jasmine/issues/428) - Thanks @tjgrathwell
-* Removed an accidental global pollution of `j$` as a reference to Jasmine. Thanks to Morten Maxild from the mailing list
-* There is now a consistent `this` between `beforeEach`, `it` and `afterEach` for a spec
-* A spy's strategy now has properties `returnValue` and `throwError` because they are better names
-* Make it easy to copy the title of failing specs from the HTML output
-* Don't add periods to the full name of a spec fix #[427](https://github.com/pivotal/jasmine/issues/427)
-* Allow Env to take optional spec/suite ids when asked to `execute`
-* [Mock clock now less intrusive, replacing global timer functions only when clock is installed](http://www.pivotaltracker.com/story/54168708)
-* Restore custom failure messages for `toHaveBeenCalledWith`
-* Jasmine global object has a addCustomEqualityTester and addMatchers (no longer directly on global)
-* Fixed a global leak of `timer`
-* Remove currentRunner from Env (users can use topSuite from Env instead)
-* [Specs without expectations are now considered passing](http://www.pivotaltracker.com/story/59422744)
-* Improve error message when a spec does not call the async callback within the default time interval
-* Allow passing a negativeCompare in a custom matcher for more custom implementations when `.not` is called
-* Update favicon to be higher resolution
-* Make all async functions be subject to the timeout
-
-There were several other pull requests that either had already been fixed, or were good starting points for the various changes above. Thank you for all of the hard work to keep Jasmine awesome.
-
-## Other Bugs and Features
-
-There were a few small changes and fixes that didn't fit into any of the above categories:
-
-* HTML Reporter refactored for simplicity and performance
-* Default character encoding on the HTML runner page is UTF-8
-* [Escape special regex characters from the spec param](http://www.pivotaltracker.com/story/52731407)
-* Favicon returns
-* [Clock supports `eval`'d strings as functions](http://www.pivotaltracker.com/story/40853563)
-* There should always be stack traces on failures
-* Removed references to unused `jasmine.VERBOSE`
-* Removed references to unused `jasmine.XmlHttpRequest`
-
-[mocha]: http://visionmedia.github.io/mocha/
-[underscore]: http://underscorejs.org/
-[grunt]: http://gruntjs.com
-[node]: http://nodejs.org
-[phantom]: http://phantomjs.org
-[jasmine_downloads]: https://github.com/pivotal/jasmine/downloads
-[contrib]: https://github.com/pivotal/jasmine/blob/master/CONTRIBUTING.md
-[travis]: http://travis-ci.org
-[travis_jasmine]: http://travis-ci.org/jasmine
-[sauce]: http://saucelabs.com
-[node_suite]: https://github.com/pivotal/jasmine/blob/master/spec/node_suite.js
-[intro]: http://jasmine.github.io/2.0/introduction.html
-
-------
-
-_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_

spec/console/ConsoleReporterSpec.js

@@ -1,226 +0,0 @@
-describe("ConsoleReporter", function() {
-  var out;
-
-  beforeEach(function() {
-    out = (function() {
-      var output = "";
-      return {
-        print: function(str) {
-          output += str;
-        },
-        getOutput: function() {
-          return output;
-        },
-        clear: function() {
-          output = "";
-        }
-      };
-    }());
-  });
-
-  it("reports that the suite has started to the console", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.jasmineStarted();
-
-    expect(out.getOutput()).toEqual("Started\n");
-  });
-
-  it("starts the provided timer when jasmine starts", function() {
-    var timerSpy = jasmine.createSpyObj('timer', ['start']),
-        reporter = new j$.ConsoleReporter({
-          print: out.print,
-          timer: timerSpy
-        });
-
-    reporter.jasmineStarted();
-
-    expect(timerSpy.start).toHaveBeenCalled();
-  });
-
-  it("reports a passing spec as a dot", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.specDone({status: "passed"});
-
-    expect(out.getOutput()).toEqual(".");
-  });
-
-  it("does not report a disabled spec", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.specDone({status: "disabled"});
-
-    expect(out.getOutput()).toEqual("");
-  });
-
-  it("reports a failing spec as an 'F'", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.specDone({status: "failed"});
-
-    expect(out.getOutput()).toEqual("F");
-  });
-
-  it("reports a pending spec as a '*'", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.specDone({status: "pending"});
-
-    expect(out.getOutput()).toEqual("*");
-  });
-
-  it("reports a summary when done (singular spec and time)", function() {
-    var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new j$.ConsoleReporter({
-          print: out.print,
-          timer: timerSpy
-        });
-
-    reporter.jasmineStarted();
-    reporter.specDone({status: "passed"});
-
-    timerSpy.elapsed.and.returnValue(1000);
-
-    out.clear();
-    reporter.jasmineDone();
-
-    expect(out.getOutput()).toMatch(/1 spec, 0 failures/);
-    expect(out.getOutput()).not.toMatch(/0 pending specs/);
-    expect(out.getOutput()).toMatch("Finished in 1 second\n");
-  });
-
-  it("reports a summary when done (pluralized specs and seconds)", function() {
-    var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-        reporter = new j$.ConsoleReporter({
-          print: out.print,
-          timer: timerSpy
-        });
-
-    reporter.jasmineStarted();
-    reporter.specDone({status: "passed"});
-    reporter.specDone({status: "pending"});
-    reporter.specDone({
-      status: "failed",
-      description: "with a failing spec",
-      fullName: "A suite with a failing spec",
-      failedExpectations: [
-        {
-          passed: false,
-          message: "Expected true to be false.",
-          expected: false,
-          actual: true,
-          stack: "foo\nbar\nbaz"
-        }
-      ]
-    });
-
-    out.clear();
-
-    timerSpy.elapsed.and.returnValue(100);
-
-    reporter.jasmineDone();
-
-    expect(out.getOutput()).toMatch(/3 specs, 1 failure, 1 pending spec/);
-    expect(out.getOutput()).toMatch("Finished in 0.1 seconds\n");
-  });
-
-  it("reports a summary when done that includes stack traces for a failing suite", function() {
-    var reporter = new j$.ConsoleReporter({
-      print: out.print
-    });
-
-    reporter.jasmineStarted();
-    reporter.specDone({status: "passed"});
-    reporter.specDone({
-      status: "failed",
-      description: "with a failing spec",
-      fullName: "A suite with a failing spec",
-      failedExpectations: [
-        {
-          passed: false,
-          message: "Expected true to be false.",
-          expected: false,
-          actual: true,
-          stack: "foo bar baz"
-        }
-      ]
-    });
-
-    out.clear();
-
-    reporter.jasmineDone({});
-
-    expect(out.getOutput()).toMatch(/foo bar baz/);
-  });
-
-  it("calls the onComplete callback when the suite is done", function() {
-    var onComplete = jasmine.createSpy('onComplete'),
-      reporter = new j$.ConsoleReporter({
-        print: out.print,
-        onComplete: onComplete
-      });
-
-    reporter.jasmineDone({});
-
-    expect(onComplete).toHaveBeenCalled();
-  });
-
-
-  describe("with color", function() {
-
-    it("reports that the suite has started to the console", function() {
-      var reporter = new j$.ConsoleReporter({
-        print: out.print,
-        showColors: true
-      });
-
-      reporter.jasmineStarted();
-
-      expect(out.getOutput()).toEqual("Started\n");
-    });
-
-    it("reports a passing spec as a dot", function() {
-      var reporter = new j$.ConsoleReporter({
-        print: out.print,
-        showColors: true
-      });
-
-      reporter.specDone({status: "passed"});
-
-      expect(out.getOutput()).toEqual("\x1B[32m.\x1B[0m");
-    });
-
-    it("does not report a disabled spec", function() {
-      var reporter = new j$.ConsoleReporter({
-        print: out.print,
-        showColors: true
-      });
-
-      reporter.specDone({status: 'disabled'});
-
-      expect(out.getOutput()).toEqual("");
-    });
-
-    it("reports a failing spec as an 'F'", function() {
-      var reporter = new j$.ConsoleReporter({
-        print: out.print,
-        showColors: true
-      });
-
-      reporter.specDone({status: 'failed'});
-
-      expect(out.getOutput()).toEqual("\x1B[31mF\x1B[0m");
-    });
-  });
-});

spec/console/TrivialConsoleReporterSpec.js

@@ -0,0 +1,490 @@
+describe("TrivialConsoleReporter", function() {
+  //keep these literal.  otherwise the test loses value as a test.
+  function green(str) {
+    return '\033[32m' + str + '\033[0m';
+  }
+
+  function red(str) {
+    return '\033[31m' + str + '\033[0m';
+  }
+
+  function yellow(str) {
+    return '\033[33m' + str + '\033[0m';
+  }
+
+  function prefixGreen(str) {
+    return '\033[32m' + str;
+  }
+
+  function prefixRed(str) {
+    return '\033[31m' + str;
+  }
+
+  var newline = "\n";
+
+  var passingSpec = {
+    results: function() {
+      return {
+        passed: function() {
+          return true;
+        }
+      };
+    }
+  },
+    failingSpec = {
+      results: function() {
+        return {
+          passed: function() {
+            return false;
+          }
+        };
+      }
+    },
+    skippedSpec = {
+      results: function() {
+        return {skipped: true};
+      }
+    },
+    passingRun = {
+      specs: function() {
+        return [null, null, null];
+      },
+      results: function() {
+        return {failedCount: 0, items_: [null, null, null]};
+      }
+    },
+    failingRun = {
+      specs: function() {
+        return [null, null, null];
+      },
+      results: function() {
+        return {
+          failedCount: 7, items_: [null, null, null]};
+      }
+    };
+
+  function repeatedlyInvoke(f, times) {
+    for (var i = 0; i < times; i++) f(times + 1);
+  }
+
+  function repeat(thing, times) {
+    var arr = [];
+    for (var i = 0; i < times; i++) arr.push(thing);
+    return arr;
+  }
+
+  function simulateRun(reporter, specResults, suiteResults, finalRunner, startTime, endTime) {
+    reporter.reportRunnerStarting();
+    for (var i = 0; i < specResults.length; i++) {
+      reporter.reportSpecResults(specResults[i]);
+    }
+    for (i = 0; i < suiteResults.length; i++) {
+      reporter.reportSuiteResults(suiteResults[i]);
+    }
+    reporter.runnerStartTime = startTime;
+    reporter.now = function() {
+      return endTime;
+    };
+    reporter.reportRunnerResults(finalRunner);
+  }
+
+  var reporter, out, done;
+
+  beforeEach(function() {
+    out = (function() {
+      var output = "";
+      return {
+        print:function(str) {
+          output += str;
+        },
+        getOutput:function() {
+          return output;
+        },
+        clear: function() {
+          output = "";
+        }
+      };
+    })();
+
+    done = false;
+    reporter = new jasmine.TrivialConsoleReporter(out.print, function(runner) {
+      done = true
+    });
+  });
+
+
+  describe('Integration', function() {
+    it("prints the proper output under a pass scenario.  small numbers.", function() {
+      simulateRun(reporter,
+        repeat(passingSpec, 3),
+        [],
+      {
+        specs: function() {
+          return [null, null, null];
+        },
+        results:function() {
+          return {
+            items_: [null, null, null],
+            totalCount: 7,
+            failedCount: 0
+          };
+        }
+      },
+        1000,
+        1777
+        );
+
+      expect(out.getOutput()).toEqual(
+        [
+          "Started",
+          green(".") + green(".") + green("."),
+          "",
+          "Finished in 0.777 seconds",
+          green("3 specs, 0 failures"),
+          ""
+        ].join("\n") + "\n"
+        );
+    });
+
+    it("prints the proper output under a pass scenario.  large numbers.", function() {
+      simulateRun(reporter,
+        repeat(passingSpec, 57),
+        [],
+      {
+        specs: function() {
+          return [null, null, null];
+        },
+        results:function() {
+          return {
+            items_: [null, null, null],
+            totalCount: 7,
+            failedCount: 0
+          };
+        }
+      },
+        1000,
+        1777);
+
+      expect(out.getOutput()).toEqual(
+        [
+          "Started",
+
+          green(".") + green(".") + green(".") + green(".") + green(".") + //50 green dots
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+            green(".") + green(".") + green(".") + green(".") + green(".") +
+
+            green(".") + green(".") + green(".") + green(".") + green(".") + //7 green dots
+            green(".") + green("."),
+
+          "",
+          "Finished in 0.777 seconds",
+          green("3 specs, 0 failures"),
+          ""
+        ].join("\n") + "\n"
+        );
+    });
+
+
+    it("prints the proper output under a failure scenario.", function() {
+      simulateRun(reporter,
+        [failingSpec, passingSpec, failingSpec],
+        [
+          {description:"The oven",
+            results:function() {
+              return {
+                items_:[
+                  {failedCount:2,
+                    description:"heats up",
+                    items_:[
+                      {trace:{stack:"stack trace one\n  second line"}},
+                      {trace:{stack:"stack trace two"}}
+                    ]}
+                ]
+              };
+            }},
+          {description:"The washing machine",
+            results:function() {
+              return {
+                items_:[
+                  {failedCount:2,
+                    description:"washes clothes",
+                    items_:[
+                      {trace:{stack:"stack trace one"}}
+                    ]}
+                ]
+              };
+            }}
+        ],
+      {
+        specs: function() {
+          return [null, null, null];
+        },
+        results:function() {
+          return {
+            items_: [null, null, null],
+            totalCount: 7,
+            failedCount: 2
+          };
+        }
+      },
+        1000,
+        1777);
+
+      expect(out.getOutput()).toEqual(
+        [
+          "Started",
+          red("F") + green(".") + red("F"),
+          "",
+          "The oven heats up",
+          "  stack trace one",
+          "    second line",
+          "  stack trace two",
+          "",
+          "The washing machine washes clothes",
+          "  stack trace one",
+          "",
+          "Finished in 0.777 seconds",
+          red("3 specs, 2 failures"),
+          ""
+        ].join("\n") + "\n"
+        );
+    });
+  });
+
+  describe('When a Jasmine environment executes', function() {
+    beforeEach(function() {
+      reporter.reportRunnerStarting();
+    });
+
+    it("should print 'Started' to the console", function() {
+      expect(out.getOutput()).toEqual("Started" + newline);
+    });
+
+    describe('when a spec reports', function() {
+      beforeEach(function() {
+        out.clear();
+      });
+
+      it("prints a green dot if the spec passes", function() {
+        reporter.reportSpecResults(passingSpec);
+
+        expect(out.getOutput()).toEqual(green("."));
+      });
+
+      it("prints a red dot if the spec fails", function() {
+        reporter.reportSpecResults(failingSpec);
+
+        expect(out.getOutput()).toEqual(red("F"));
+      });
+
+      it("prints a yellow star if the spec was skipped", function() {
+        reporter.reportSpecResults(skippedSpec);
+
+        expect(out.getOutput()).toEqual(yellow("*"));
+      });
+    });
+
+    describe('when a suite reports', function() {
+      var emptyResults;
+      beforeEach(function() {
+        emptyResults = function() {
+          return {
+            items_:[]
+          };
+        };
+      });
+
+      it("remembers suite results", function() {
+        reporter.reportSuiteResults({description: "Oven", results: emptyResults});
+        reporter.reportSuiteResults({description: "Mixer", results: emptyResults});
+
+        expect(reporter.suiteResults[0].description).toEqual('Oven');
+        expect(reporter.suiteResults[1].description).toEqual('Mixer');
+      });
+
+      it("creates a description out of the current suite and any parent suites", function() {
+        var grandparentSuite = {
+          description: "My house",
+          results: emptyResults
+        };
+        var parentSuite = {
+          description: "kitchen",
+          parentSuite: grandparentSuite,
+          results: emptyResults
+        };
+        reporter.reportSuiteResults({ description: "oven", parentSuite: parentSuite, results: emptyResults });
+
+        expect(reporter.suiteResults[0].description).toEqual("My house kitchen oven");
+      });
+
+      it("gathers failing spec results from the suite - the spec must have a description.", function() {
+        reporter.reportSuiteResults({description:"Oven",
+          results: function() {
+            return {
+              items_:[
+                { failedCount: 0, description: "specOne" },
+                { failedCount: 99, description: "specTwo" },
+                { failedCount: 0, description: "specThree" },
+                { failedCount: 88, description: "specFour" },
+                { failedCount: 3 }
+              ]
+            };
+          }});
+
+        expect(reporter.suiteResults[0].failedSpecResults).
+          toEqual([
+          { failedCount: 99, description: "specTwo" },
+          { failedCount: 88, description: "specFour" }
+        ]);
+      });
+
+    });
+
+    describe('and finishes', function() {
+
+      describe('when reporting spec failure information', function() {
+
+        it("prints suite and spec descriptions together as a sentence", function() {
+          reporter.suiteResults = [
+            {description:"The oven", failedSpecResults:[
+              {description:"heats up", items_:[]},
+              {description:"cleans itself", items_:[]}
+            ]},
+            {description:"The mixer", failedSpecResults:[
+              {description:"blends things together", items_:[]}
+            ]}
+          ];
+
+          reporter.reportRunnerResults(failingRun);
+
+          expect(out.getOutput()).toContain("The oven heats up");
+          expect(out.getOutput()).toContain("The oven cleans itself");
+          expect(out.getOutput()).toContain("The mixer blends things together");
+        });
+
+        it("prints stack trace of spec failure", function() {
+          reporter.suiteResults = [
+            {description:"The oven", failedSpecResults:[
+              {description:"heats up",
+                items_:[
+                  {trace:{stack:"stack trace one"}},
+                  {trace:{stack:"stack trace two"}}
+                ]}
+            ]}
+          ];
+
+          reporter.reportRunnerResults(failingRun);
+
+          expect(out.getOutput()).toContain("The oven heats up");
+          expect(out.getOutput()).toContain("stack trace one");
+          expect(out.getOutput()).toContain("stack trace two");
+        });
+
+      });
+
+      describe('when reporting the execution time', function() {
+
+        it("prints the full finished message", function() {
+          reporter.now = function() {
+            return 1000;
+          };
+          reporter.reportRunnerStarting();
+          reporter.now = function() {
+            return 1777;
+          };
+          reporter.reportRunnerResults(failingRun);
+          expect(out.getOutput()).toContain("Finished in 0.777 seconds");
+        });
+
+        it("prints round time numbers correctly", function() {
+          function run(startTime, endTime) {
+            out.clear();
+            reporter.runnerStartTime = startTime;
+            reporter.now = function() {
+              return endTime;
+            };
+            reporter.reportRunnerResults(passingRun);
+          }
+
+          run(1000, 11000);
+          expect(out.getOutput()).toContain("10 seconds");
+
+          run(1000, 2000);
+          expect(out.getOutput()).toContain("1 seconds");
+
+          run(1000, 1100);
+          expect(out.getOutput()).toContain("0.1 seconds");
+
+          run(1000, 1010);
+          expect(out.getOutput()).toContain("0.01 seconds");
+
+          run(1000, 1001);
+          expect(out.getOutput()).toContain("0.001 seconds");
+        });
+      });
+
+      describe("when reporting the results summary", function() {
+        it("prints statistics in green if there were no failures", function() {
+          reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
+            results:function() {
+              return {items_: [null, null, null], totalCount: 7, failedCount: 0};
+            }
+          });
+          expect(out.getOutput()).
+            toContain("3 specs, 0 failures");
+        });
+
+        it("prints statistics in red if there was a failure", function() {
+          reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
+            results:function() {
+              return {items_: [null, null, null], totalCount: 7, failedCount: 3};
+            }
+          });
+          expect(out.getOutput()).
+            toContain("3 specs, 3 failures");
+        });
+
+        it("handles pluralization with 1's ones appropriately", function() {
+          reporter.reportRunnerResults({
+            specs: function() {
+              return [null];
+            },
+            results:function() {
+              return {items_: [null], totalCount: 1, failedCount: 1};
+            }
+          });
+          expect(out.getOutput()).
+            toContain("1 spec, 1 failure");
+        });
+      });
+
+      describe("done callback", function() {
+        it("calls back when done", function() {
+          expect(done).toBeFalsy();
+          reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
+            results:function() {
+              return {items_: [null, null, null], totalCount: 7, failedCount: 0};
+            }
+          });
+          expect(done).toBeTruthy();
+        });
+      });
+    });
+  });
+});

spec/core/AnySpec.js

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

spec/core/BaseSpec.js

@@ -0,0 +1,27 @@
+describe("base.js", function() {
+  describe("jasmine.MessageResult", function() {
+    it("#toString should pretty-print and concatenate each part of the message", function() {
+      var values = ["log", "message", 123, {key: "value"}, "FTW!"];
+      var messageResult = new jasmine.MessageResult(values);
+      expect(messageResult.toString()).toEqual("log message 123 { key : 'value' } FTW!");
+    });
+  });
+
+  describe("jasmine.log", function() {
+    it("should accept n arguments", function() {
+      spyOn(jasmine.getEnv().currentSpec, 'log');
+      jasmine.log(1, 2, 3);
+      expect(jasmine.getEnv().currentSpec.log).toHaveBeenCalledWith(1, 2, 3);
+    });
+  });
+
+  describe("jasmine.getGlobal", function() {
+    it("should return the global object", function() {
+      var globalObject = (function() {
+        return this;
+      })();
+
+      expect(jasmine.getGlobal()).toBe(globalObject);
+    });
+  });
+});

spec/core/CallTrackerSpec.js

@@ -1,105 +0,0 @@
-describe("CallTracker", function() {
-  it("tracks that it was called when executed", function() {
-    var callTracker = new j$.CallTracker();
-
-    expect(callTracker.any()).toBe(false);
-
-    callTracker.track();
-
-    expect(callTracker.any()).toBe(true);
-  });
-
-  it("tracks that number of times that it is executed", function() {
-    var callTracker = new j$.CallTracker();
-
-    expect(callTracker.count()).toEqual(0);
-
-    callTracker.track();
-
-    expect(callTracker.count()).toEqual(1);
-  });
-
-  it("tracks the params from each execution", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track({object: void 0, args: []});
-    callTracker.track({object: {}, args: [0, "foo"]});
-
-    expect(callTracker.argsFor(0)).toEqual([]);
-
-    expect(callTracker.argsFor(1)).toEqual([0, "foo"]);
-  });
-
-  it("returns any empty array when there was no call", function() {
-    var callTracker = new j$.CallTracker();
-
-    expect(callTracker.argsFor(0)).toEqual([]);
-  });
-
-  it("allows access for the arguments for all calls", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track({object: {}, args: []});
-    callTracker.track({object: {}, args: [0, "foo"]});
-
-    expect(callTracker.allArgs()).toEqual([[], [0, "foo"]]);
-  });
-
-  it("tracks the context and arguments for each call", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track({object: {}, args: []});
-    callTracker.track({object: {}, args: [0, "foo"]});
-
-    expect(callTracker.all()[0]).toEqual({object: {}, args: []});
-
-    expect(callTracker.all()[1]).toEqual({object: {}, args: [0, "foo"]});
-  });
-
-  it("simplifies access to the arguments for the last (most recent) call", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track();
-    callTracker.track({object: {}, args: [0, "foo"]});
-
-    expect(callTracker.mostRecent()).toEqual({
-      object: {},
-      args: [0, "foo"]
-    });
-  });
-
-  it("returns a useful falsy value when there isn't a last (most recent) call", function() {
-    var callTracker = new j$.CallTracker();
-
-    expect(callTracker.mostRecent()).toBeFalsy();
-  });
-
-  it("simplifies access to the arguments for the first (oldest) call", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track({object: {}, args: [0, "foo"]});
-
-    expect(callTracker.first()).toEqual({object: {}, args: [0, "foo"]})
-  });
-
-  it("returns a useful falsy value when there isn't a first (oldest) call", function() {
-    var callTracker = new j$.CallTracker();
-
-    expect(callTracker.first()).toBeFalsy();
-  });
-
-
-  it("allows the tracking to be reset", function() {
-    var callTracker = new j$.CallTracker();
-
-    callTracker.track();
-    callTracker.track({object: {}, args: [0, "foo"]});
-    callTracker.reset();
-
-    expect(callTracker.any()).toBe(false);
-    expect(callTracker.count()).toEqual(0);
-    expect(callTracker.argsFor(0)).toEqual([]);
-    expect(callTracker.all()).toEqual([]);
-    expect(callTracker.mostRecent()).toBeFalsy();
-  });
-});

spec/core/ClockSpec.js

@@ -1,359 +0,0 @@
-describe("Clock", function() {
-
-  it("does not replace setTimeout until it is installed", function() {
-    var fakeSetTimeout = jasmine.createSpy("global setTimeout"),
-      fakeGlobal = { setTimeout: fakeSetTimeout },
-      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
-      delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    fakeGlobal.setTimeout(delayedFn, 0);
-
-    expect(fakeSetTimeout).toHaveBeenCalledWith(delayedFn, 0);
-    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
-
-    fakeSetTimeout.calls.reset();
-
-    clock.install();
-    fakeGlobal.setTimeout(delayedFn, 0);
-
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalled();
-    expect(fakeSetTimeout).not.toHaveBeenCalled();
-  });
-
-  it("does not replace clearTimeout until it is installed", function() {
-    var fakeClearTimeout = jasmine.createSpy("global cleartimeout"),
-      fakeGlobal = { clearTimeout: fakeClearTimeout },
-      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
-      delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    fakeGlobal.clearTimeout("foo");
-
-    expect(fakeClearTimeout).toHaveBeenCalledWith("foo");
-    expect(delayedFunctionScheduler.removeFunctionWithId).not.toHaveBeenCalled();
-
-    fakeClearTimeout.calls.reset();
-
-    clock.install();
-    fakeGlobal.clearTimeout("foo");
-
-    expect(delayedFunctionScheduler.removeFunctionWithId).toHaveBeenCalled();
-    expect(fakeClearTimeout).not.toHaveBeenCalled();
-  });
-
-  it("does not replace setInterval until it is installed", function() {
-    var fakeSetInterval = jasmine.createSpy("global setInterval"),
-      fakeGlobal = { setInterval: fakeSetInterval },
-      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction"]),
-      delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    fakeGlobal.setInterval(delayedFn, 0);
-
-    expect(fakeSetInterval).toHaveBeenCalledWith(delayedFn, 0);
-    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
-
-    fakeSetInterval.calls.reset();
-
-    clock.install();
-    fakeGlobal.setInterval(delayedFn, 0);
-
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalled();
-    expect(fakeSetInterval).not.toHaveBeenCalled();
-  });
-
-  it("does not replace clearInterval until it is installed", function() {
-    var fakeClearInterval = jasmine.createSpy("global clearinterval"),
-      fakeGlobal = { clearInterval: fakeClearInterval },
-      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["removeFunctionWithId"]),
-      delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    fakeGlobal.clearInterval("foo");
-
-    expect(fakeClearInterval).toHaveBeenCalledWith("foo");
-    expect(delayedFunctionScheduler.removeFunctionWithId).not.toHaveBeenCalled();
-
-    fakeClearInterval.calls.reset();
-
-    clock.install();
-    fakeGlobal.clearInterval("foo");
-
-    expect(delayedFunctionScheduler.removeFunctionWithId).toHaveBeenCalled();
-    expect(fakeClearInterval).not.toHaveBeenCalled();
-  });
-
-  it("replaces the global timer functions on uninstall", function() {
-    var fakeSetTimeout = jasmine.createSpy("global setTimeout"),
-      fakeClearTimeout = jasmine.createSpy("global clearTimeout"),
-      fakeSetInterval = jasmine.createSpy("global setInterval"),
-      fakeClearInterval = jasmine.createSpy("global clearInterval"),
-      fakeGlobal = {
-        setTimeout: fakeSetTimeout,
-        clearTimeout: fakeClearTimeout,
-        setInterval: fakeSetInterval,
-        clearInterval: fakeClearInterval
-      },
-      delayedFunctionScheduler = jasmine.createSpyObj("delayedFunctionScheduler", ["scheduleFunction", "reset"]),
-      delayedFn = jasmine.createSpy("delayedFn"),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    clock.install();
-    clock.uninstall();
-    fakeGlobal.setTimeout(delayedFn, 0);
-    fakeGlobal.clearTimeout("foo");
-    fakeGlobal.setInterval(delayedFn, 10);
-    fakeGlobal.clearInterval("bar");
-
-    expect(fakeSetTimeout).toHaveBeenCalledWith(delayedFn, 0);
-    expect(fakeClearTimeout).toHaveBeenCalledWith("foo");
-    expect(fakeSetInterval).toHaveBeenCalledWith(delayedFn, 10);
-    expect(fakeClearInterval).toHaveBeenCalledWith("bar");
-    expect(delayedFunctionScheduler.scheduleFunction).not.toHaveBeenCalled();
-  });
-
-  it("schedules the delayed function (via setTimeout) with the fake timer", function() {
-    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
-      scheduleFunction = jasmine.createSpy('scheduleFunction'),
-      delayedFunctionScheduler = { scheduleFunction: scheduleFunction },
-      fakeGlobal = { setTimeout: fakeSetTimeout },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    clock.install();
-    clock.setTimeout(delayedFn, 0, 'a', 'b');
-
-    expect(fakeSetTimeout).not.toHaveBeenCalled();
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalledWith(delayedFn, 0, ['a', 'b']);
-  });
-
-  it("returns an id for the delayed function", function() {
-    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
-      scheduleId = 123,
-      scheduleFunction = jasmine.createSpy('scheduleFunction').and.returnValue(scheduleId),
-      delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
-      fakeGlobal = { setTimeout: fakeSetTimeout },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler),
-      timeoutId;
-
-    clock.install();
-    timeoutId = clock.setTimeout(delayedFn, 0);
-
-    expect(timeoutId).toEqual(123);
-  });
-
-  it("clears the scheduled function with the scheduler", function() {
-    var fakeClearTimeout = jasmine.createSpy('clearTimeout'),
-      delayedFunctionScheduler = jasmine.createSpyObj('delayedFunctionScheduler', ['removeFunctionWithId']),
-      fakeGlobal = { setTimeout: fakeClearTimeout },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    clock.install();
-    clock.clearTimeout(123);
-
-    expect(fakeClearTimeout).not.toHaveBeenCalled();
-    expect(delayedFunctionScheduler.removeFunctionWithId).toHaveBeenCalledWith(123);
-  });
-
-  it("schedules the delayed function with the fake timer", function() {
-    var fakeSetInterval = jasmine.createSpy('setInterval'),
-      scheduleFunction = jasmine.createSpy('scheduleFunction'),
-      delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
-      fakeGlobal = { setInterval: fakeSetInterval },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    clock.install();
-    clock.setInterval(delayedFn, 0, 'a', 'b');
-
-    expect(fakeSetInterval).not.toHaveBeenCalled();
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalledWith(delayedFn, 0, ['a', 'b'], true);
-  });
-
-  it("returns an id for the delayed function", function() {
-    var fakeSetInterval = jasmine.createSpy('setInterval'),
-      scheduleId = 123,
-      scheduleFunction = jasmine.createSpy('scheduleFunction').and.returnValue(scheduleId),
-      delayedFunctionScheduler = {scheduleFunction: scheduleFunction},
-      fakeGlobal = { setInterval: fakeSetInterval },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler),
-      intervalId;
-
-    clock.install();
-    intervalId = clock.setInterval(delayedFn, 0);
-
-    expect(intervalId).toEqual(123);
-  });
-
-  it("clears the scheduled function with the scheduler", function() {
-    var clearInterval = jasmine.createSpy('clearInterval'),
-      delayedFunctionScheduler = jasmine.createSpyObj('delayedFunctionScheduler', ['removeFunctionWithId']),
-      fakeGlobal = { setInterval: clearInterval },
-      delayedFn = jasmine.createSpy('delayedFn'),
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    clock.install();
-    clock.clearInterval(123);
-
-    expect(clearInterval).not.toHaveBeenCalled();
-    expect(delayedFunctionScheduler.removeFunctionWithId).toHaveBeenCalledWith(123);
-  });
-
-  it("gives you a friendly reminder if the Clock is not installed and you tick", function() {
-    var clock = new j$.Clock({}, jasmine.createSpyObj('delayedFunctionScheduler', ['tick']));
-    expect(function() {
-      clock.tick(50);
-    }).toThrow();
-  });
-
-  it("on IE < 9, fails if extra args are passed to fake clock", function() {
-    //fail, because this would break in IE9.
-    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
-      fakeSetInterval = jasmine.createSpy('setInterval'),
-      delayedFunctionScheduler = jasmine.createSpyObj('delayedFunctionScheduler', ['scheduleFunction']),
-      fn = jasmine.createSpy('fn'),
-      fakeGlobal = {
-        setTimeout: fakeSetTimeout,
-        setInterval: fakeSetInterval
-      },
-      clock = new j$.Clock(fakeGlobal, delayedFunctionScheduler);
-
-    fakeSetTimeout.apply = null;
-    fakeSetInterval.apply = null;
-
-    clock.install();
-
-    clock.setTimeout(fn, 0);
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalledWith(fn, 0, []);
-    expect(function() {
-      clock.setTimeout(fn, 0, 'extra');
-    }).toThrow();
-
-    clock.setInterval(fn, 0);
-    expect(delayedFunctionScheduler.scheduleFunction).toHaveBeenCalledWith(fn, 0, [], true);
-    expect(function() {
-      clock.setInterval(fn, 0, 'extra');
-    }).toThrow();
-  });
-
-});
-
-describe("Clock (acceptance)", function() {
-  it("can run setTimeouts/setIntervals synchronously", function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
-      delayedFn2 = jasmine.createSpy('delayedFn2'),
-      delayedFn3 = jasmine.createSpy('delayedFn3'),
-      recurring1 = jasmine.createSpy('recurring1'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-      clock = new j$.Clock({setTimeout: setTimeout}, delayedFunctionScheduler);
-
-    clock.install();
-
-    clock.setTimeout(delayedFn1, 0);
-    var intervalId = clock.setInterval(recurring1, 50);
-    clock.setTimeout(delayedFn2, 100);
-    clock.setTimeout(delayedFn3, 200);
-
-    expect(delayedFn1).not.toHaveBeenCalled();
-    expect(delayedFn2).not.toHaveBeenCalled();
-    expect(delayedFn3).not.toHaveBeenCalled();
-
-    clock.tick(0);
-
-    expect(delayedFn1).toHaveBeenCalled();
-    expect(delayedFn2).not.toHaveBeenCalled();
-    expect(delayedFn3).not.toHaveBeenCalled();
-
-    clock.tick(50);
-
-    expect(recurring1).toHaveBeenCalled();
-    expect(recurring1.calls.count()).toBe(1);
-    expect(delayedFn2).not.toHaveBeenCalled();
-    expect(delayedFn3).not.toHaveBeenCalled();
-
-    clock.tick(50);
-
-    expect(recurring1.calls.count()).toBe(2);
-    expect(delayedFn2).toHaveBeenCalled();
-    expect(delayedFn3).not.toHaveBeenCalled();
-
-    clock.tick(100);
-
-    expect(recurring1.calls.count()).toBe(4);
-    expect(delayedFn3).toHaveBeenCalled();
-
-    clock.clearInterval(intervalId);
-    clock.tick(50);
-
-    expect(recurring1.calls.count()).toBe(4);
-  });
-
-  it("can clear a previously set timeout", function() {
-    var clearedFn = jasmine.createSpy('clearedFn'),
-      delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-      clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler),
-      timeoutId;
-
-    clock.install();
-
-    timeoutId = clock.setTimeout(clearedFn, 100);
-    expect(clearedFn).not.toHaveBeenCalled();
-
-    clock.clearTimeout(timeoutId);
-    clock.tick(100);
-
-    expect(clearedFn).not.toHaveBeenCalled();
-  });
-
-  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);
-
-    clock.install();
-
-    clock.tick(100);
-    clock.setTimeout(delayedFn1, 10, ['some', 'arg']);
-    clock.tick(5);
-    expect(delayedFn1).not.toHaveBeenCalled();
-    clock.tick(5);
-    expect(delayedFn1).toHaveBeenCalled();
-  });
-
-  it("correctly schedules functions while the Clock is advancing", function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
-        delayedFn2 = jasmine.createSpy('delayedFn2'),
-        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler);
-
-    delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 0); });
-    clock.install();
-    clock.setTimeout(delayedFn1, 5);
-
-    clock.tick(5);
-    expect(delayedFn1).toHaveBeenCalled();
-    expect(delayedFn2).not.toHaveBeenCalled();
-
-    clock.tick();
-    expect(delayedFn2).toHaveBeenCalled();
-  });
-
-  it("correctly calls functions scheduled while the Clock is advancing", function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
-        delayedFn2 = jasmine.createSpy('delayedFn2'),
-        delayedFunctionScheduler = new j$.DelayedFunctionScheduler(),
-        clock = new j$.Clock({setTimeout: function() {}}, delayedFunctionScheduler);
-
-    delayedFn1.and.callFake(function() { clock.setTimeout(delayedFn2, 1); });
-    clock.install();
-    clock.setTimeout(delayedFn1, 5);
-
-    clock.tick(6);
-    expect(delayedFn1).toHaveBeenCalled();
-    expect(delayedFn2).toHaveBeenCalled();  
-  });
-});

spec/core/CustomMatchersSpec.js

@@ -0,0 +1,97 @@
+describe("Custom Matchers", function() {
+  var env;
+  var fakeTimer;
+
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+  });
+
+  it("should be easy to add more matchers local to a spec, suite, etc.", function() {
+    var spec1, spec2, spec1Matcher, spec2Matcher;
+    var suite = env.describe('some suite', function() {
+      env.beforeEach(function() {
+        this.addMatchers({
+          matcherForSuite: function(expected) {
+            this.message = "matcherForSuite: actual: " + this.actual + "; expected: " + expected;
+            return true;
+          }
+        });
+      });
+
+      spec1 = env.it('spec with an expectation').runs(function () {
+        this.addMatchers({
+          matcherForSpec: function(expected) {
+            this.message = "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
+            return true;
+          }
+        });
+        spec1Matcher = this.expect("xxx");
+      });
+
+      spec2 = env.it('spec with failing expectation').runs(function () {
+        spec2Matcher = this.expect("yyy");
+      });
+    });
+
+    suite.execute();
+
+    spec1Matcher.matcherForSuite("expected");
+    expect(spec1Matcher.message).toEqual("matcherForSuite: actual: xxx; expected: expected");
+    spec1Matcher.matcherForSpec("expected");
+    expect(spec1Matcher.message).toEqual("matcherForSpec: actual: xxx; expected: expected");
+
+    spec2Matcher.matcherForSuite("expected");
+    expect(spec2Matcher.message).toEqual("matcherForSuite: actual: yyy; expected: expected");
+    expect(spec2Matcher.matcherForSpec).toBe(jasmine.undefined);
+  });
+
+  it("should generate messages with the same rules as for regular matchers when this.report() is not called", function() {
+    var spec;
+    var suite = env.describe('some suite', function() {
+      spec = env.it('spec with an expectation').runs(function () {
+        this.addMatchers({
+          toBeTrue: function() {
+            return this.actual === true;
+          }
+        });
+        this.expect(true).toBeTrue();
+        this.expect(false).toBeTrue();
+      });
+    });
+
+    suite.execute();
+    var passResult = new jasmine.ExpectationResult({passed: true, matcherName: 'toBeTrue',
+      actual: true, expected: jasmine.undefined, message: "Passed." });
+    var failResult = new jasmine.ExpectationResult({passed: false, matcherName: 'toBeTrue',
+      actual: false, expected: jasmine.undefined, message: "Expected false to be true." });
+    failResult.trace = jasmine.any(Object);
+    expect(spec.results().getItems()).toEqual([passResult, failResult]);
+  });
+
+  it("should pass args", function() {
+    var matcherCallArgs = [];
+    var spec;
+    var suite = env.describe('some suite', function() {
+      spec = env.it('spec with an expectation').runs(function () {
+        this.addMatchers({
+          toBeTrue: function() {
+            matcherCallArgs.push(jasmine.util.argsToArray(arguments));
+            return this.actual === true;
+          }
+        });
+        this.expect(true).toBeTrue();
+        this.expect(false).toBeTrue('arg');
+        this.expect(true).toBeTrue('arg1', 'arg2');
+      });
+    });
+
+    suite.execute();
+    var results = spec.results().getItems();
+    expect(results[0].expected).toEqual(jasmine.undefined);
+    expect(results[1].expected).toEqual('arg');
+    expect(results[2].expected).toEqual(['arg1', 'arg2']);
+
+    expect(matcherCallArgs).toEqual([[], ['arg'], ['arg1', 'arg2']]);
+  });
+});

spec/core/DelayedFunctionSchedulerSpec.js

@@ -1,246 +0,0 @@
-describe("DelayedFunctionScheduler", function() {
-  it("schedules a function for later execution", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(0);
-
-    expect(fn).toHaveBeenCalled();
-  });
-
-  it("schedules a string for later execution", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-        strfn = "horrible = true;";
-
-    scheduler.scheduleFunction(strfn, 0);
-
-    scheduler.tick(0);
-
-    expect(horrible).toEqual(true);
-  });
-
-  it("#tick defaults to 0", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick();
-
-    expect(fn).toHaveBeenCalled();
-  });
-
-  it("defaults delay to 0", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(0);
-
-    expect(fn).toHaveBeenCalled();
-  });
-
-  it("optionally passes params to scheduled functions", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 0, ['foo', 'bar']);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(0);
-
-    expect(fn).toHaveBeenCalledWith('foo', 'bar');
-  });
-
-  it("scheduled fns can optionally reoccur", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 20, [], true);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(20);
-
-    expect(fn.calls.count()).toBe(1);
-
-    scheduler.tick(40);
-
-    expect(fn.calls.count()).toBe(3);
-
-    scheduler.tick(21);
-
-    expect(fn.calls.count()).toBe(4);
-
-  });
-
-  it("increments scheduled fns ids unless one is passed", function() {
-    var scheduler = new j$.DelayedFunctionScheduler();
-
-    expect(scheduler.scheduleFunction(function() {
-    }, 0)).toBe(1);
-    expect(scheduler.scheduleFunction(function() {
-    }, 0)).toBe(2);
-    expect(scheduler.scheduleFunction(function() {
-    }, 0, [], false, 123)).toBe(123);
-    expect(scheduler.scheduleFunction(function() {
-    }, 0)).toBe(3);
-  });
-
-  it("#removeFunctionWithId removes a previously scheduled function with a given id", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn'),
-      timeoutKey;
-
-    timeoutKey = scheduler.scheduleFunction(fn, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.removeFunctionWithId(timeoutKey);
-
-    scheduler.tick(0);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
-  it("reset removes scheduled functions", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    scheduler.scheduleFunction(fn, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.reset();
-
-    scheduler.tick(0);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
-  it("reset resets the returned ids", function() {
-    var scheduler = new j$.DelayedFunctionScheduler();
-    expect(scheduler.scheduleFunction(function() { }, 0)).toBe(1);
-    expect(scheduler.scheduleFunction(function() { }, 0, [], false, 123)).toBe(123);
-
-    scheduler.reset();
-    expect(scheduler.scheduleFunction(function() { }, 0)).toBe(1);
-    expect(scheduler.scheduleFunction(function() { }, 0, [], false, 123)).toBe(123);
-  });
-
-  it("reset resets the current tick time", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn');
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(15);
-    scheduler.reset();
-
-    scheduler.scheduleFunction(fn, 20, [], false, 1, 20);
-
-    scheduler.tick(5);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
-  it("executes recurring functions interleaved with regular functions in the correct order", function() {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn'),
-      recurringCallCount = 0,
-      recurring = jasmine.createSpy('recurring').and.callFake(function() {
-        recurringCallCount++;
-        if (recurringCallCount < 5) {
-          expect(fn).not.toHaveBeenCalled();
-        }
-      });
-
-    scheduler.scheduleFunction(recurring, 10, [], true);
-    scheduler.scheduleFunction(fn, 50);
-
-    scheduler.tick(60);
-
-    expect(recurring).toHaveBeenCalled();
-    expect(recurring.calls.count()).toBe(6);
-    expect(fn).toHaveBeenCalled();
-  });
-
-  it("schedules a function for later execution during a tick", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn'),
-      fnDelay = 10;
-
-    scheduler.scheduleFunction(function () {
-      scheduler.scheduleFunction(fn, fnDelay);
-    }, 0);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(fnDelay);
-
-    expect(fn).toHaveBeenCalled();
-  });
-
-  it("#removeFunctionWithId removes a previously scheduled function with a given id during a tick", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn'),
-      fnDelay = 10,
-      timeoutKey;
-
-    scheduler.scheduleFunction(function () {
-      scheduler.removeFunctionWithId(timeoutKey);
-    }, 0);
-    timeoutKey = scheduler.scheduleFunction(fn, fnDelay);
-
-    expect(fn).not.toHaveBeenCalled();
-
-    scheduler.tick(fnDelay);
-
-    expect(fn).not.toHaveBeenCalled();
-  });
-
-  it("executes recurring functions interleaved with regular functions and functions scheduled during a tick in the correct order", function () {
-    var scheduler = new j$.DelayedFunctionScheduler(),
-      fn = jasmine.createSpy('fn'),
-      recurringCallCount = 0,
-      recurring = jasmine.createSpy('recurring').and.callFake(function() {
-        recurringCallCount++;
-        if (recurringCallCount < 5) {
-          expect(fn).not.toHaveBeenCalled();
-        }
-      }),
-      innerFn = jasmine.createSpy('innerFn').and.callFake(function() {
-        expect(recurring.calls.count()).toBe(4);
-        expect(fn).not.toHaveBeenCalled();
-      }),
-      scheduling = jasmine.createSpy('scheduling').and.callFake(function() {
-        expect(recurring.calls.count()).toBe(3);
-        expect(fn).not.toHaveBeenCalled();
-        scheduler.scheduleFunction(innerFn, 10);  // 41ms absolute
-      });
-
-    scheduler.scheduleFunction(recurring, 10, [], true);
-    scheduler.scheduleFunction(fn, 50);
-    scheduler.scheduleFunction(scheduling, 31);
-
-    scheduler.tick(60);
-
-    expect(recurring).toHaveBeenCalled();
-    expect(recurring.calls.count()).toBe(6);
-    expect(fn).toHaveBeenCalled();
-    expect(scheduling).toHaveBeenCalled();
-    expect(innerFn).toHaveBeenCalled();
-  });
-
-});
-

spec/core/EnvSpec.js

@@ -1,85 +1,159 @@
-// TODO: Fix these unit tests!
-describe("Env", function() {
+describe("jasmine.Env", function() {
   var env;
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmine.Env();
+    env.updateInterval = 0;
   });
 
-  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('ids', function () {
+    it('nextSpecId should return consecutive integers, starting at 0', function () {
+      expect(env.nextSpecId()).toEqual(0);
+      expect(env.nextSpecId()).toEqual(1);
+      expect(env.nextSpecId()).toEqual(2);
     });
   });
 
-  describe("#pending", function() {
-    it("throws the Pending Spec exception", function() {
-      expect(function() {
-        env.pending();
-      }).toThrow(j$.Spec.pendingSpecExceptionMessage);
+  describe("reporting", function() {
+    var fakeReporter;
+
+    beforeEach(function() {
+      fakeReporter = jasmine.createSpyObj("fakeReporter", ["log"]);
+    });
+
+    describe('version', function () {
+      var oldVersion;
+
+      beforeEach(function () {
+        oldVersion = jasmine.version_;
+      });
+
+      afterEach(function () {
+        jasmine.version_ = oldVersion;
+      });
+
+      it('should raise an error if version is not set', function () {
+        jasmine.version_ = null;
+        var exception;
+        try {
+          env.version();
+        }
+        catch (e) {
+          exception = e;
+        }
+        expect(exception.message).toEqual('Version not set');
+      });
+
+      it("version should return the current version as an int", function() {
+        jasmine.version_ = {
+          "major": 1,
+          "minor": 9,
+          "build": 7,
+          "revision": 8
+        };
+        expect(env.version()).toEqual({
+          "major": 1,
+          "minor": 9,
+          "build": 7,
+          "revision": 8
+        });
+      });
+
+      describe("versionString", function() {
+        it("should return a stringified version number", function() {
+          jasmine.version_ = {
+            "major": 1,
+            "minor": 9,
+            "build": 7,
+            "release_candidate": "1",
+            "revision": 8
+          };
+          expect(env.versionString()).toEqual("1.9.7.rc1 revision 8");
+        });
+
+        it("should return a nice string when version is unknown", function() {
+          jasmine.version_ = null;
+          expect(env.versionString()).toEqual("version unknown");
+        });
+      });
+    });
+
+    it("should allow reporters to be registered", function() {
+      env.addReporter(fakeReporter);
+      env.reporter.log("message");
+      expect(fakeReporter.log).toHaveBeenCalledWith("message");
     });
   });
 
-  describe("#topSuite", function() {
-    it("returns the Jasmine top suite for users to traverse the spec tree", function() {
-      var suite = env.topSuite();
-      expect(suite.description).toEqual('Jasmine__TopLevel__Suite');
+  describe("equality testing", function() {
+    describe("with custom equality testers", function() {
+      var aObj, bObj, isEqual;
+
+      beforeEach(function() {
+        env.addEqualityTester(function(a, b) {
+          aObj = a;
+          bObj = b;
+          return isEqual;
+        });
+      });
+
+      it("should call the custom equality tester with two objects for comparison", function() {
+        env.equals_("1", "2");
+        expect(aObj).toEqual("1");
+        expect(bObj).toEqual("2");
+      });
+
+      describe("when the custom equality tester returns false", function() {
+        beforeEach(function() {
+          isEqual = false;
+        });
+
+        it("should give custom equality testers precedence", function() {
+          expect(env.equals_('abc', 'abc')).toBeFalsy();
+          var o = {};
+          expect(env.equals_(o, o)).toBeFalsy();
+        });
+      });
+
+
+      describe("when the custom equality tester returns true", function() {
+        beforeEach(function() {
+          isEqual = true;
+        });
+
+        it("should give custom equality testers precedence", function() {
+          expect(env.equals_('abc', 'def')).toBeTruthy();
+          expect(env.equals_(true, false)).toBeTruthy();
+        });
+      });
+
+      describe("when the custom equality tester returns undefined", function() {
+        beforeEach(function() {
+          isEqual = jasmine.undefined;
+        });
+
+        it("should use normal equality rules", function() {
+          expect(env.equals_('abc', 'abc')).toBeTruthy();
+          expect(env.equals_('abc', 'def')).toBeFalsy();
+        });
+
+        describe("even if there are several", function() {
+          beforeEach(function() {
+            env.addEqualityTester(function(a, b) { return jasmine.undefined; });
+            env.addEqualityTester(function(a, b) { return jasmine.undefined; });
+          });
+
+          it("should use normal equality rules", function() {
+            expect(env.equals_('abc', 'abc')).toBeTruthy();
+            expect(env.equals_('abc', 'def')).toBeFalsy();
+          });
+        });
+      });
+
+      it("should evaluate custom equality testers in the order they are declared", function() {
+        isEqual = false;
+        env.addEqualityTester(function(a, b) { return true; });
+        expect(env.equals_('abc', 'abc')).toBeFalsy();
+      });
     });
   });
 });
-

spec/core/ExceptionFormatterSpec.js

@@ -1,56 +0,0 @@
-describe("ExceptionFormatter", function() {
-  describe("#message", function() {
-    it('formats Firefox exception messages', function() {
-      var sampleFirefoxException = {
-          fileName: 'foo.js',
-          lineNumber: '1978',
-          message: 'you got your foo in my bar',
-          name: 'A Classic Mistake'
-        },
-        exceptionFormatter = new j$.ExceptionFormatter(),
-        message = exceptionFormatter.message(sampleFirefoxException);
-
-      expect(message).toEqual('A Classic Mistake: you got your foo in my bar in foo.js (line 1978)');
-    });
-
-    it('formats Webkit exception messages', function() {
-      var sampleWebkitException = {
-          sourceURL: 'foo.js',
-          line: '1978',
-          message: 'you got your foo in my bar',
-          name: 'A Classic Mistake'
-        },
-        exceptionFormatter = new j$.ExceptionFormatter(),
-        message = exceptionFormatter.message(sampleWebkitException);
-
-      expect(message).toEqual('A Classic Mistake: you got your foo in my bar in foo.js (line 1978)');
-    });
-
-    it('formats V8 exception messages', function() {
-      var sampleV8 = {
-          message: 'you got your foo in my bar',
-          name: 'A Classic Mistake'
-        },
-        exceptionFormatter = new j$.ExceptionFormatter(),
-        message = exceptionFormatter.message(sampleV8);
-
-      expect(message).toEqual('A Classic Mistake: you got your foo in my bar');
-
-    });
-  });
-
-  describe("#stack", function() {
-    it("formats stack traces from Webkit, Firefox, node.js or IE10+", function() {
-      if (jasmine.getEnv().ieVersion < 10 || jasmine.getEnv().safariVersion < 6) { return; }
-
-      var error;
-      try { throw new Error("an error") } catch(e) { error = e; }
-
-      expect(new j$.ExceptionFormatter().stack(error)).toMatch(/ExceptionFormatterSpec\.js.*\d+/)
-    });
-
-    it("returns null if no Error provided", function() {
-      expect(new j$.ExceptionFormatter().stack()).toBeNull();
-    });
-  });
-});

spec/core/ExceptionsSpec.js

@@ -2,67 +2,148 @@ describe('Exceptions:', function() {
   var env;
 
   beforeEach(function() {
-    env = new j$.Env();
+    env = new jasmine.Env();
+    env.updateInterval = 0;
   });
 
-  describe('with break on exception', function() {
-    it('should not catch the exception', function() {
-      env.catchExceptions(false);
-      env.describe('suite for break on exceptions', function() {
-        env.it('should break when an exception is thrown', function() {
-          throw new Error('I should hit a breakpoint!');
-        });
-      });
-      var spy = jasmine.createSpy('spy');
+  it('jasmine.formatException formats Firefox exception messages as expected', function() {
+    var sampleFirefoxException = {
+      fileName: 'foo.js',
+      line: '1978',
+      message: 'you got your foo in my bar',
+      name: 'A Classic Mistake'
+    };
 
-      try {
-        env.execute();
-        spy();
-      }
-      catch (e) {}
+    var expected = 'A Classic Mistake: you got your foo in my bar in foo.js (line 1978)';
 
-      expect(spy).not.toHaveBeenCalled();
-    });
+    expect(jasmine.util.formatException(sampleFirefoxException)).toEqual(expected);
   });
 
-  describe("with catch on exception", function() {
-    it('should handle exceptions thrown, but continue', function(done) {
-      var secondTest = jasmine.createSpy('second test');
-      env.describe('Suite for handles exceptions', function () {
-        env.it('should be a test that fails because it throws an exception', function() {
-          throw new Error();
-        });
-        env.it('should be a passing test that runs after exceptions are thrown from a async test', secondTest);
+  it('jasmine.formatException formats Webkit exception messages as expected', function() {
+    var sampleWebkitException = {
+      sourceURL: 'foo.js',
+      lineNumber: '1978',
+      message: 'you got your foo in my bar',
+      name: 'A Classic Mistake'
+    };
+
+    var expected = 'A Classic Mistake: you got your foo in my bar in foo.js (line 1978)';
+
+    expect(jasmine.util.formatException(sampleWebkitException)).toEqual(expected);
+  });
+
+  it('should handle exceptions thrown, but continue', function() {
+    var fakeTimer = new jasmine.FakeTimer();
+    env.setTimeout = fakeTimer.setTimeout;
+    env.clearTimeout = fakeTimer.clearTimeout;
+    env.setInterval = fakeTimer.setInterval;
+    env.clearInterval = fakeTimer.clearInterval;
+    
+    //we run two exception tests to make sure we continue after throwing an exception
+    var suite = env.describe('Suite for handles exceptions', function () {
+      env.it('should be a test that fails because it throws an exception', function() {
+        throw new Error('fake error 1');
       });
 
-      expectations = function() {
-        expect(secondTest).toHaveBeenCalled();
-        done();
-      };
+      env.it('should be another test that fails because it throws an exception', function() {
+        this.runs(function () {
+          throw new Error('fake error 2');
+        });
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
 
-      env.addReporter({ jasmineDone: expectations });
-      env.execute();
+      env.it('should be a passing test that runs after exceptions are thrown', function() {
+        this.expect(true).toEqual(true);
+      });
+
+      env.it('should be another test that fails because it throws an exception after a wait', function() {
+        this.runs(function () {
+          var foo = 'foo';
+        });
+        this.waits(250);
+        this.runs(function () {
+          throw new Error('fake error 3');
+        });
+      });
+
+      env.it('should be a passing test that runs after exceptions are thrown from a async test', function() {
+        this.expect(true).toEqual(true);
+      });
     });
 
-    it("should handle exceptions thrown directly in top-level describe blocks and continue", function(done) {
-      var secondDescribe = jasmine.createSpy("second describe");
-      env.describe("a suite that throws an exception", function () {
-        env.it("is a test that should pass", function () {
+    var runner = env.currentRunner();
+    suite.execute();
+    fakeTimer.tick(2500);
+
+    var suiteResults = suite.results();
+    var specResults = suiteResults.getItems();
+
+    expect(suiteResults.passed()).toEqual(false);
+    //
+    expect(specResults.length).toEqual(5);
+    expect(specResults[0].passed()).toMatch(false);
+    var blockResults = specResults[0].getItems();
+    expect(blockResults[0].passed()).toEqual(false);
+    expect(blockResults[0].message).toMatch(/fake error 1/);
+
+    expect(specResults[1].passed()).toEqual(false);
+    blockResults = specResults[1].getItems();
+    expect(blockResults[0].passed()).toEqual(false);
+    expect(blockResults[0].message).toMatch(/fake error 2/);
+    expect(blockResults[1].passed()).toEqual(true);
+
+    expect(specResults[2].passed()).toEqual(true);
+
+    expect(specResults[3].passed()).toEqual(false);
+    blockResults = specResults[3].getItems();
+    expect(blockResults[0].message).toMatch(/fake error 3/);
+
+    expect(specResults[4].passed()).toEqual(true);
+  });
+
+
+  it("should handle exceptions thrown directly in top-level describe blocks and continue", function () {
+     var suite = env.describe("a top level describe block that throws an exception", function () {
+       env.it("is a test that should pass", function () {
          this.expect(true).toEqual(true);
-        });
+       });
 
-        throw new Error("top level error");
-      });
-      env.describe("a suite that doesn't throw an exception", secondDescribe);
+       throw new Error("top level error");
+     });
 
-      expectations = function() {
-        expect(secondDescribe).toHaveBeenCalled();
-        done();
-      };
+     suite.execute();
+     var suiteResults = suite.results();
+     var specResults = suiteResults.getItems();
 
-      env.addReporter({ jasmineDone: expectations });
-      env.execute();
-    });
-  });
-});
+     expect(suiteResults.passed()).toEqual(false);
+     expect(specResults.length).toEqual(2);
 
+     expect(specResults[1].description).toMatch(/encountered a declaration exception/);
+   });
+
+   it("should handle exceptions thrown directly in nested describe blocks and continue", function () {
+     var suite = env.describe("a top level describe", function () {
+       env.describe("a mid-level describe that throws an exception", function () {
+         env.it("is a test that should pass", function () {
+           this.expect(true).toEqual(true);
+         });
+
+         throw new Error("a mid-level error");
+       });
+     });
+
+     suite.execute();
+     var suiteResults = suite.results();
+     var specResults = suiteResults.getItems();
+
+     expect(suiteResults.passed()).toEqual(false);
+     expect(specResults.length).toEqual(1);
+
+     var nestedSpecResults = specResults[0].getItems();
+
+     expect(nestedSpecResults.length).toEqual(2);
+     expect(nestedSpecResults[1].description).toMatch(/encountered a declaration exception/);
+   });
+});

spec/core/ExpectationResultSpec.js

@@ -1,61 +0,0 @@
-describe("buildExpectationResult", function() {
-  it("defaults to passed", function() {
-    var result = j$.buildExpectationResult({passed: 'some-value'});
-    expect(result.passed).toBe('some-value');
-  });
-
-  it("message defaults to Passed for passing specs", function() {
-    var result = j$.buildExpectationResult({passed: true, message: 'some-value'});
-    expect(result.message).toBe('Passed.');
-  });
-
-  it("message returns the message for failing expectations", function() {
-    var result = j$.buildExpectationResult({passed: false, message: 'some-value'});
-    expect(result.message).toBe('some-value');
-  });
-
-  it("delegates message formatting to the provided formatter if there was an Error", function() {
-    var fakeError = {message: 'foo'},
-      messageFormatter = jasmine.createSpy("exception message formatter").and.returnValue(fakeError.message);
-
-    var result = j$.buildExpectationResult(
-      {
-        passed: false,
-        error: fakeError,
-        messageFormatter: messageFormatter
-      });
-
-    expect(messageFormatter).toHaveBeenCalledWith(fakeError);
-    expect(result.message).toEqual('foo');
-  });
-
-  it("delegates stack formatting to the provided formatter if there was an Error", function() {
-    var fakeError = {stack: 'foo'},
-      stackFormatter = jasmine.createSpy("stack formatter").and.returnValue(fakeError.stack);
-
-    var result = j$.buildExpectationResult(
-      {
-        passed: false,
-        error: fakeError,
-        stackFormatter: stackFormatter
-      });
-
-    expect(stackFormatter).toHaveBeenCalledWith(fakeError);
-    expect(result.stack).toEqual('foo');
-  });
-
-  it("matcherName returns passed matcherName", function() {
-    var result = j$.buildExpectationResult({matcherName: 'some-value'});
-    expect(result.matcherName).toBe('some-value');
-  });
-
-  it("expected returns passed expected", function() {
-    var result = j$.buildExpectationResult({expected: 'some-value'});
-    expect(result.expected).toBe('some-value');
-  });
-
-  it("actual returns passed actual", function() {
-    var result = j$.buildExpectationResult({actual: 'some-value'});
-    expect(result.actual).toBe('some-value');
-  });
-});

spec/core/ExpectationSpec.js

@@ -1,393 +0,0 @@
-describe("Expectation", function() {
-  it(".addMatchers makes matchers available to any expectation", function() {
-    var matchers = {
-        toFoo: function() {},
-        toBar: function() {}
-      },
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({});
-
-    expect(expectation.toFoo).toBeDefined();
-    expect(expectation.toBar).toBeDefined();
-  });
-
-  it(".addCoreMatchers makes matchers available to any expectation", function() {
-    var coreMatchers = {
-        toQuux: function() {}
-      },
-      expectation;
-
-    j$.Expectation.addCoreMatchers(coreMatchers);
-
-    expectation = new j$.Expectation({});
-
-    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();
-
-    expect(builtExpectation instanceof j$.Expectation).toBe(true);
-    expect(builtExpectation.not instanceof j$.Expectation).toBe(true);
-    expect(builtExpectation.not.isNot).toBe(true);
-  });
-
-  it("wraps matchers's compare functions, passing in matcher dependencies", function() {
-    var fakeCompare = function() { return { pass: true }; },
-      matcherFactory = jasmine.createSpy("matcher").and.returnValue({ compare: fakeCompare }),
-      matchers = {
-        toFoo: matcherFactory
-      },
-      util = {},
-      customEqualityTesters = ['a'],
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      util: util,
-      customEqualityTesters: customEqualityTesters,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult
-    });
-
-    expectation.toFoo("hello");
-
-    expect(matcherFactory).toHaveBeenCalledWith(util, customEqualityTesters)
-  });
-
-  it("wraps matchers's compare functions, passing the actual and expected", function() {
-    var fakeCompare = jasmine.createSpy('fake-compare').and.returnValue({pass: true}),
-      matchers = {
-        toFoo: function() {
-          return {
-            compare: fakeCompare
-          };
-        }
-      },
-      util = {
-        buildFailureMessage: jasmine.createSpy('buildFailureMessage')
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      util: util,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult
-    });
-
-    expectation.toFoo("hello");
-
-    expect(fakeCompare).toHaveBeenCalledWith("an actual", "hello");
-  });
-
-  it("reports a passing result to the spec when the comparison passes", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: true }; }
-          };
-        }
-      },
-      util = {
-        buildFailureMessage: jasmine.createSpy('buildFailureMessage')
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      util: util,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(true, {
-      matcherName: "toFoo",
-      passed: true,
-      message: "",
-      expected: "hello",
-      actual: "an actual"
-    });
-  });
-
-  it("reports a failing result to the spec when the comparison fails", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: false }; }
-          };
-        }
-      },
-      util = {
-        buildFailureMessage: function() { return ""; }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      util: util,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(false, {
-      matcherName: "toFoo",
-      passed: false,
-      expected: "hello",
-      actual: "an actual",
-      message: ""
-    });
-  });
-
-  it("reports a failing result and a custom fail message to the spec when the comparison fails", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() {
-              return {
-                pass: false,
-                message: "I am a custom message"
-              };
-            }
-          };
-        }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      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 passing result to the spec when the comparison fails for a negative expectation", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: false }; }
-          };
-        }
-      },
-      util = {
-        buildFailureMessage: function() { return ""; }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      actual = "an actual",
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult,
-      isNot: true
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(true, {
-      matcherName: "toFoo",
-      passed: true,
-      message: "",
-      expected: "hello",
-      actual: actual
-    });
-  });
-
-  it("reports a failing result to the spec when the comparison passes for a negative expectation", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: true }; }
-          };
-        }
-      },
-      util = {
-        buildFailureMessage: function() { return "default message"; }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      actual = "an actual",
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      util: util,
-      addExpectationResult: addExpectationResult,
-      isNot: true
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(false, {
-      matcherName: "toFoo",
-      passed: false,
-      expected: "hello",
-      actual: actual,
-      message: "default message"
-    });
-  });
-
-  it("reports a failing result and a custom fail message to the spec when the comparison passes for a negative expectation", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() {
-              return {
-                pass: true,
-                message: "I am a custom message"
-              };
-            }
-          };
-        }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      actual = "an actual",
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult,
-      isNot: true
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(false, {
-      matcherName: "toFoo",
-      passed: false,
-      expected: "hello",
-      actual: actual,
-      message: "I am a custom message"
-    });
-  });
-
-  it("reports a passing result to the spec when the 'not' comparison passes, given a negativeCompare", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: true }; },
-            negativeCompare: function() { return { pass: true }; }
-          };
-        }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      actual = "an actual",
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult,
-      isNot: true
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(true, {
-      matcherName: "toFoo",
-      passed: true,
-      expected: "hello",
-      actual: actual,
-      message: ""
-    });
-  });
-
-  it("reports a failing result and a custom fail message to the spec when the 'not' comparison fails, given a negativeCompare", function() {
-    var matchers = {
-        toFoo: function() {
-          return {
-            compare: function() { return { pass: true }; },
-            negativeCompare: function() {
-              return {
-                pass: false,
-                message: "I'm a custom message"
-              };
-            }
-          };
-        }
-      },
-      addExpectationResult = jasmine.createSpy("addExpectationResult"),
-      actual = "an actual",
-      expectation;
-
-    j$.Expectation.addMatchers(matchers);
-
-    expectation = new j$.Expectation({
-      matchers: matchers,
-      actual: "an actual",
-      addExpectationResult: addExpectationResult,
-      isNot: true
-    });
-
-    expectation.toFoo("hello");
-
-    expect(addExpectationResult).toHaveBeenCalledWith(false, {
-      matcherName: "toFoo",
-      passed: false,
-      expected: "hello",
-      actual: actual,
-      message: "I'm a custom message"
-    });
-  });
-
-});
-

spec/core/JsApiReporterSpec.js

@@ -1,11 +1,12 @@
-xdescribe('JsApiReporter (integration specs)', function() {
-  describe('results', function() {
-    var reporter, spec1, spec2;
+describe('jasmine.jsApiReporter', function() {
+  describe('results', function () {
+    var reporter, spec1, spec2, spec3, expectedSpec1Results, expectedSpec2Results;
     var env;
     var suite, nestedSuite, nestedSpec;
 
     beforeEach(function() {
-      env = new j$.Env();
+      env = new jasmine.Env();
+      env.updateInterval = 0;
 
       suite = env.describe("top-level suite", function() {
         spec1 = env.it("spec 1", function() {
@@ -23,24 +24,34 @@ xdescribe('JsApiReporter (integration specs)', function() {
           });
         });
 
+        spec3 = env.it("spec 3", function() {
+          this.log('some debug message');
+        });
       });
 
-      reporter = new j$.JsApiReporter({});
+      reporter = new jasmine.JsApiReporter();
       env.addReporter(reporter);
 
       env.execute();
 
+      expectedSpec1Results = {
+        messages: spec1.results().getItems(),
+        result: "passed"
+      };
+      expectedSpec2Results = {
+        messages: spec2.results().getItems(),
+        result: "failed"
+      };
     });
 
-    it('results() should return a hash of all results, indexed by spec id', function() {
-      var expectedSpec1Results = {
-          result: "passed"
-        },
-        expectedSpec2Results = {
-          result: "failed"
-        };
-      expect(reporter.results()[spec1.id].result).toEqual('passed');
-      expect(reporter.results()[spec2.id].result).toEqual('failed');
+    it('resultForSpec() should return the result for the given spec', function () {
+      expect(reporter.resultsForSpec(spec1.id)).toEqual(expectedSpec1Results);
+      expect(reporter.resultsForSpec(spec2.id)).toEqual(expectedSpec2Results);
+    });
+
+    it('results() should return a hash of all results, indexed by spec id', function () {
+      expect(reporter.results()[spec1.id]).toEqual(expectedSpec1Results);
+      expect(reporter.results()[spec2.id]).toEqual(expectedSpec2Results);
     });
 
     it("should return nested suites as children of their parents", function() {
@@ -54,6 +65,7 @@ xdescribe('JsApiReporter (integration specs)', function() {
                 { id: 2, name: 'nested spec', type: 'spec', children: [ ] }
               ]
             },
+            { id: 3, name: 'spec 3', type: 'spec', children: [ ] }
           ]
         }
       ]);
@@ -64,7 +76,12 @@ xdescribe('JsApiReporter (integration specs)', function() {
         var result = reporter.results()[spec1.id];
         var summarizedResult = reporter.summarizeResult_(result);
         expect(summarizedResult.result).toEqual('passed');
-        expect(summarizedResult.messages.length).toEqual(0);
+        expect(summarizedResult.messages.length).toEqual(1);
+        expect(summarizedResult.messages[0].message).toEqual(result.messages[0].message);
+        expect(summarizedResult.messages[0].passed).toBeTruthy();
+        expect(summarizedResult.messages[0].type).toEqual('expect');
+        expect(summarizedResult.messages[0].text).toBeUndefined();
+        expect(summarizedResult.messages[0].trace.stack).toBeUndefined();
       });
 
       it("should have a stack trace for failing specs", function() {
@@ -74,141 +91,13 @@ xdescribe('JsApiReporter (integration specs)', function() {
         expect(summarizedResult.messages[0].trace.stack).toEqual(result.messages[0].trace.stack);
       });
 
-    });
-  });
-});
-
-
-describe("JsApiReporter", function() {
-
-  it("knows when a full environment is started", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    expect(reporter.started).toBe(false);
-    expect(reporter.finished).toBe(false);
-
-    reporter.jasmineStarted();
-
-    expect(reporter.started).toBe(true);
-    expect(reporter.finished).toBe(false);
-  });
-
-  it("knows when a full environment is done", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    expect(reporter.started).toBe(false);
-    expect(reporter.finished).toBe(false);
-
-    reporter.jasmineStarted();
-    reporter.jasmineDone({});
-
-    expect(reporter.finished).toBe(true);
-  });
-
-  it("defaults to 'loaded' status", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    expect(reporter.status()).toEqual('loaded');
-  });
-
-  it("reports 'started' when Jasmine has started", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    reporter.jasmineStarted();
-
-    expect(reporter.status()).toEqual('started');
-  });
-
-  it("reports 'done' when Jasmine is done", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    reporter.jasmineDone({});
-
-    expect(reporter.status()).toEqual('done');
-  });
-
-  it("tracks a suite", function() {
-    var reporter = new j$.JsApiReporter({});
-
-    reporter.suiteStarted({
-      id: 123,
-      description: "A suite"
-    });
-
-    var suites = reporter.suites();
-
-    expect(suites).toEqual({123: {id: 123, description: "A suite"}});
-
-    reporter.suiteDone({
-      id: 123,
-      description: "A suite",
-      status: 'passed'
-    });
-
-    expect(suites).toEqual({123: {id: 123, description: "A suite", status: 'passed'}});
-  });
-
-  describe("#specResults", function() {
-    var reporter, specResult1, specResult2;
-    beforeEach(function() {
-      reporter = new j$.JsApiReporter({});
-      specResult1 = {
-        id: 1,
-        description: "A spec"
-      };
-      specResult2 = {
-        id: 2,
-        description: "Another spec"
-      };
-
-      reporter.specDone(specResult1);
-      reporter.specDone(specResult2);
-    });
-
-    it("should return a slice of results", function() {
-      expect(reporter.specResults(0, 1)).toEqual([specResult1]);
-      expect(reporter.specResults(1, 1)).toEqual([specResult2]);
-    });
-
-    describe("when the results do not exist", function() {
-      it("should return a slice of shorter length", function() {
-        expect(reporter.specResults(0, 3)).toEqual([specResult1, specResult2]);
-        expect(reporter.specResults(2, 3)).toEqual([]);
+      it("should have messages for specs with messages", function() {
+        var result = reporter.results()[spec3.id];
+        var summarizedResult = reporter.summarizeResult_(result);
+        expect(summarizedResult.result).toEqual('passed');
+        expect(summarizedResult.messages[0].type).toEqual('log');
+        expect(summarizedResult.messages[0].text).toEqual('some debug message');
       });
     });
   });
-
-  describe("#executionTime", function() {
-    it("should start the timer when jasmine starts", function() {
-      var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-          reporter = new j$.JsApiReporter({
-            timer: timerSpy
-          });
-
-      reporter.jasmineStarted();
-      expect(timerSpy.start).toHaveBeenCalled();
-    });
-
-    it("should return the time it took the specs to run, in ms", function() {
-      var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-          reporter = new j$.JsApiReporter({
-            timer: timerSpy
-          });
-
-      timerSpy.elapsed.and.returnValue(1000);
-      reporter.jasmineDone();
-      expect(reporter.executionTime()).toEqual(1000);
-    });
-
-    describe("when the specs haven't finished being run", function() {
-      it("should return undefined", function() {
-        var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
-            reporter = new j$.JsApiReporter({
-              timer: timerSpy
-            });
-
-        expect(reporter.executionTime()).toBeUndefined();
-      });
-    });
-  });
-});
+});

spec/core/MatchersSpec.js

@@ -0,0 +1,838 @@
+describe("jasmine.Matchers", function() {
+  var env, spec;
+
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+
+    var suite = env.describe("suite", function() {
+      spec = env.it("spec", function() {
+      });
+    });
+    spyOn(spec, 'addMatcherResult');
+
+    this.addMatchers({
+      toPass: function() {
+        return lastResult().passed();
+      },
+      toFail: function() {
+        return !lastResult().passed();
+      }
+    });
+  });
+
+  function match(value) {
+    return spec.expect(value);
+  }
+
+  function lastResult() {
+    return spec.addMatcherResult.mostRecentCall.args[0];
+  }
+
+  function catchException(fn) {
+    try {
+      fn.call();
+    } catch (e) {
+      return e;
+    }
+    throw new Error("expected function to throw an exception");
+  }
+
+  it("toEqual with primitives, objects, dates, etc.", function() {
+    expect(match(true).toEqual(true)).toPass();
+
+    expect(match({foo:'bar'}).toEqual(null)).toFail();
+
+    var functionA = function() {
+      return 'hi';
+    };
+    var functionB = function() {
+      return 'hi';
+    };
+    expect(match({foo:functionA}).toEqual({foo:functionB})).toFail();
+    expect(match({foo:functionA}).toEqual({foo:functionA})).toPass();
+
+    expect((match(false).toEqual(true))).toFail();
+
+    var circularGraph = {};
+    circularGraph.referenceToSelf = circularGraph;
+    expect((match(circularGraph).toEqual(circularGraph))).toPass();
+
+    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2009, 1, 3, 15, 17, 19, 1234)))).toFail();
+    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2008, 1, 3, 15, 17, 19, 1234)))).toPass();
+
+
+    expect(match(true).toNotEqual(false)).toPass();
+    expect((match(true).toNotEqual(true))).toFail();
+
+    expect((match(['a', 'b']).toEqual(['a', jasmine.undefined]))).toFail();
+    expect((match(['a', 'b']).toEqual(['a', 'b', jasmine.undefined]))).toFail();
+
+    expect((match("cat").toEqual("cat"))).toPass();
+    expect((match("cat").toNotEqual("cat"))).toFail();
+
+    expect((match(5).toEqual(5))).toPass();
+    expect((match(parseInt('5', 10)).toEqual(5))).toPass();
+    expect((match(5).toNotEqual(5))).toFail();
+    expect((match(parseInt('5', 10)).toNotEqual(5))).toFail();
+  });
+
+  it("toEqual to build an Expectation Result", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    var expected = 'b';
+    matcher.toEqual(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toEqual");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.expected).toEqual(expected);
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toNotEqual to build an Expectation Result", function() {
+    var str = 'a';
+    var matcher = match(str);
+    matcher.toNotEqual(str);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toNotEqual");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(str));
+    expect(result.message).toMatch('not');
+    expect(result.expected).toEqual(str);
+    expect(result.actual).toEqual(str);
+  });
+
+  it('toBe should return true only if the expected and actual items === each other', function() {
+    var a = {};
+    var b = {};
+    //noinspection UnnecessaryLocalVariableJS
+    var c = a;
+    expect((match(a).toBe(b))).toFail();
+    expect((match(a).toBe(a))).toPass();
+    expect((match(a).toBe(c))).toPass();
+    expect((match(a).toNotBe(b))).toPass();
+    expect((match(a).toNotBe(a))).toFail();
+    expect((match(a).toNotBe(c))).toFail();
+  });
+
+  it("toBe to build an ExpectationResult", function() {
+    var expected = 'b';
+    var actual = 'a';
+    var matcher = match(actual);
+    matcher.toBe(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBe");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.expected).toEqual(expected);
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toNotBe to build an ExpectationResult", function() {
+    var str = 'a';
+    var matcher = match(str);
+    matcher.toNotBe(str);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toNotBe");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(str);
+    expect(result.expected).toEqual(str);
+    expect(result.actual).toEqual(str);
+  });
+
+  it("toMatch and #toNotMatch should perform regular expression matching on strings", function() {
+    expect((match('foobarbel').toMatch(/bar/))).toPass();
+    expect((match('foobazbel').toMatch(/bar/))).toFail();
+
+    expect((match('foobarbel').toMatch("bar"))).toPass();
+    expect((match('foobazbel').toMatch("bar"))).toFail();
+
+    expect((match('foobarbel').toNotMatch(/bar/))).toFail();
+    expect((match('foobazbel').toNotMatch(/bar/))).toPass();
+
+    expect((match('foobarbel').toNotMatch("bar"))).toFail();
+    expect((match('foobazbel').toNotMatch("bar"))).toPass();
+  });
+
+  it("toMatch w/ RegExp to build an ExpectationResult", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    var expected = /b/;
+    matcher.toMatch(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toMatch");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch(expected.toString());
+    expect(result.expected).toEqual(expected);
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toMatch w/ String to build an ExpectationResult", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    var expected = 'b';
+    matcher.toMatch(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toMatch");
+    expect(result.passed()).toFail();
+    expect(result.message).toEqual("Expected 'a' to match 'b'.");
+    expect(result.expected).toEqual(expected);
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toNotMatch w/ RegExp to build an ExpectationResult", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    var expected = /a/;
+    matcher.toNotMatch(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toNotMatch");
+    expect(result.passed()).toFail();
+    expect(result.message).toEqual("Expected 'a' to not match /a/.");
+    expect(result.expected).toEqual(expected);
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toNotMatch w/ String to build an ExpectationResult", function() {
+    var str = 'a';
+    var matcher = match(str);
+    matcher.toNotMatch(str);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toNotMatch");
+    expect(result.passed()).toFail();
+    expect(result.message).toEqual("Expected 'a' to not match 'a'.");
+    expect(result.expected).toEqual(str);
+    expect(result.actual).toEqual(str);
+  });
+
+  it("toBeDefined", function() {
+    expect(match('foo').toBeDefined()).toPass();
+    expect(match(jasmine.undefined).toBeDefined()).toFail();
+  });
+
+  it("toBeDefined to build an ExpectationResult", function() {
+    var matcher = match(jasmine.undefined);
+    matcher.toBeDefined();
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeDefined");
+    expect(result.passed()).toFail();
+    expect(result.message).toEqual('Expected undefined to be defined.');
+    expect(result.actual).toEqual(jasmine.undefined);
+  });
+
+  it("toBeUndefined", function() {
+    expect(match('foo').toBeUndefined()).toFail();
+    expect(match(jasmine.undefined).toBeUndefined()).toPass();
+  });
+
+  it("toBeNull", function() {
+    expect(match(null).toBeNull()).toPass();
+    expect(match(jasmine.undefined).toBeNull()).toFail();
+    expect(match("foo").toBeNull()).toFail();
+  });
+
+  it("toBeNull w/ String to build an ExpectationResult", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    matcher.toBeNull();
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeNull");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch('null');
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toBeNull w/ Object to build an ExpectationResult", function() {
+    var actual = {a: 'b'};
+    var matcher = match(actual);
+    matcher.toBeNull();
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeNull");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch('null');
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toBeFalsy", function() {
+    expect(match(false).toBeFalsy()).toPass();
+    expect(match(true).toBeFalsy()).toFail();
+    expect(match(jasmine.undefined).toBeFalsy()).toPass();
+    expect(match(0).toBeFalsy()).toPass();
+    expect(match("").toBeFalsy()).toPass();
+  });
+
+  it("toBeFalsy to build an ExpectationResult", function() {
+    var actual = 'a';
+    var matcher = match(actual);
+    matcher.toBeFalsy();
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeFalsy");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch('falsy');
+    expect(result.actual).toEqual(actual);
+  });
+
+  it("toBeTruthy", function() {
+    expect(match(false).toBeTruthy()).toFail();
+    expect(match(true).toBeTruthy()).toPass();
+    expect(match(jasmine.undefined).toBeTruthy()).toFail();
+    expect(match(0).toBeTruthy()).toFail();
+    expect(match("").toBeTruthy()).toFail();
+    expect(match("hi").toBeTruthy()).toPass();
+    expect(match(5).toBeTruthy()).toPass();
+    expect(match({foo: 1}).toBeTruthy()).toPass();
+  });
+
+  it("toBeTruthy to build an ExpectationResult", function() {
+    var matcher = match(false);
+    matcher.toBeTruthy();
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeTruthy");
+    expect(result.passed()).toFail();
+    expect(result.message).toEqual("Expected false to be truthy.");
+    expect(result.actual).toFail();
+  });
+
+  it("toEqual", function() {
+    expect(match(jasmine.undefined).toEqual(jasmine.undefined)).toPass();
+    expect(match({foo:'bar'}).toEqual({foo:'bar'})).toPass();
+    expect(match("foo").toEqual({bar: jasmine.undefined})).toFail();
+    expect(match({foo: jasmine.undefined}).toEqual("goo")).toFail();
+    expect(match({foo: {bar :jasmine.undefined}}).toEqual("goo")).toFail();
+  });
+
+  it("toEqual with jasmine.any()", function() {
+    expect(match("foo").toEqual(jasmine.any(String))).toPass();
+    expect(match(3).toEqual(jasmine.any(Number))).toPass();
+    expect(match("foo").toEqual(jasmine.any(Function))).toFail();
+    expect(match("foo").toEqual(jasmine.any(Object))).toFail();
+    expect(match({someObj:'foo'}).toEqual(jasmine.any(Object))).toPass();
+    expect(match({someObj:'foo'}).toEqual(jasmine.any(Function))).toFail();
+    expect(match(
+      function() {
+      }).toEqual(jasmine.any(Object))).toFail();
+    expect(match(["foo", "goo"]).toEqual(["foo", jasmine.any(String)])).toPass();
+    expect(match(
+      function() {
+      }).toEqual(jasmine.any(Function))).toPass();
+    expect(match(["a", function() {
+    }]).toEqual(["a", jasmine.any(Function)])).toPass();
+  });
+
+  it("toEqual handles circular objects ok", function() {
+    expect(match({foo: "bar", baz: jasmine.undefined}).toEqual({foo: "bar", baz: jasmine.undefined})).toPass();
+    expect(match({foo:['bar','baz','quux']}).toEqual({foo:['bar','baz','quux']})).toPass();
+    expect(match({foo: {bar:'baz'}, quux:'corge'}).toEqual({foo:{bar:'baz'}, quux:'corge'})).toPass();
+
+    var circularObject = {};
+    var secondCircularObject = {};
+    circularObject.field = circularObject;
+    secondCircularObject.field = secondCircularObject;
+    expect(match(circularObject).toEqual(secondCircularObject)).toPass();
+  });
+
+  it("toNotEqual as slightly surprising behavior, but is it intentional?", function() {
+    expect(match({x:"x", y:"y", z:"w"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
+    expect(match({x:"x", y:"y", w:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
+    expect(match({x:"x", y:"y", z:"z"}).toNotEqual({w: "w", x:"x", y:"y", z:"z"})).toPass();
+    expect(match({w: "w", x:"x", y:"y", z:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
+  });
+
+  it("toEqual handles arrays", function() {
+    expect(match([1, "A"]).toEqual([1, "A"])).toPass();
+  });
+
+  it("toContain and toNotContain", function() {
+    expect(match('ABC').toContain('A')).toPass();
+    expect(match('ABC').toContain('X')).toFail();
+
+    expect(match(['A', 'B', 'C']).toContain('A')).toPass();
+    expect(match(['A', 'B', 'C']).toContain('F')).toFail();
+    expect(match(['A', 'B', 'C']).toNotContain('F')).toPass();
+    expect(match(['A', 'B', 'C']).toNotContain('A')).toFail();
+
+    expect(match(['A', {some:'object'}, 'C']).toContain({some:'object'})).toPass();
+    expect(match(['A', {some:'object'}, 'C']).toContain({some:'other object'})).toFail();
+  });
+
+  it("toContain to build an ExpectationResult", function() {
+    var actual = ['a','b','c'];
+    var matcher = match(actual);
+    var expected = 'x';
+    matcher.toContain(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toContain");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch('contain');
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.actual).toEqual(actual);
+    expect(result.expected).toEqual(expected);
+  });
+
+  it("toNotContain to build an ExpectationResult", function() {
+    var actual = ['a','b','c'];
+    var matcher = match(actual);
+    var expected = 'b';
+    matcher.toNotContain(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toNotContain");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual));
+    expect(result.message).toMatch('not contain');
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.actual).toEqual(actual);
+    expect(result.expected).toEqual(expected);
+  });
+
+  it("toBeLessThan should pass if actual is less than expected", function() {
+    expect(match(37).toBeLessThan(42)).toPass();
+    expect(match(37).toBeLessThan(-42)).toFail();
+    expect(match(37).toBeLessThan(37)).toFail();
+  });
+
+  it("toBeLessThan to build an ExpectationResult", function() {
+    var actual = 3;
+    var matcher = match(actual);
+    var expected = 1;
+    matcher.toBeLessThan(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeLessThan");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual) + ' to be less than');
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.actual).toEqual(actual);
+    expect(result.expected).toEqual(expected);
+  });
+
+  it("toBeGreaterThan should pass if actual is greater than expected", function() {
+    expect(match(37).toBeGreaterThan(42)).toFail();
+    expect(match(37).toBeGreaterThan(-42)).toPass();
+    expect(match(37).toBeGreaterThan(37)).toFail();
+  });
+
+  it("toBeGreaterThan to build an ExpectationResult", function() {
+    var actual = 1;
+    var matcher = match(actual);
+    var expected = 3;
+    matcher.toBeGreaterThan(expected);
+
+    var result = lastResult();
+
+    expect(result.matcherName).toEqual("toBeGreaterThan");
+    expect(result.passed()).toFail();
+    expect(result.message).toMatch(jasmine.pp(actual) + ' to be greater than');
+    expect(result.message).toMatch(jasmine.pp(expected));
+    expect(result.actual).toEqual(actual);
+    expect(result.expected).toEqual(expected);
+  });
+
+  describe("toBeCloseTo", function() {
+    it("returns 'true' iff actual and expected are equal within 2 decimal points of precision", function() {
+      expect(0).toBeCloseTo(0);
+      expect(1).toBeCloseTo(1);
+      expect(1).not.toBeCloseTo(1.1);
+      expect(1).not.toBeCloseTo(1.01);
+      expect(1).toBeCloseTo(1.001);
+
+      expect(1.23).toBeCloseTo(1.234);
+      expect(1.23).toBeCloseTo(1.233);
+      expect(1.23).toBeCloseTo(1.232);
+      expect(1.23).not.toBeCloseTo(1.24);
+
+      expect(-1.23).toBeCloseTo(-1.234);
+      expect(-1.23).not.toBeCloseTo(-1.24);
+    });
+
+    it("accepts an optional precision argument", function() {
+      expect(1).toBeCloseTo(1.1, 0);
+      expect(1.2).toBeCloseTo(1.23, 1);
+
+      expect(1.234).toBeCloseTo(1.2343, 3);
+      expect(1.234).not.toBeCloseTo(1.233, 3);
+    });
+
+    it("rounds", function() {
+      expect(1.23).toBeCloseTo(1.229);
+      expect(1.23).toBeCloseTo(1.226);
+      expect(1.23).toBeCloseTo(1.225);
+      expect(1.23).not.toBeCloseTo(1.2249999);
+
+      expect(1.23).toBeCloseTo(1.234);
+      expect(1.23).toBeCloseTo(1.2349999);
+      expect(1.23).not.toBeCloseTo(1.235);
+
+      expect(-1.23).toBeCloseTo(-1.234);
+      expect(-1.23).not.toBeCloseTo(-1.235);
+      expect(-1.23).not.toBeCloseTo(-1.236);
+    });
+  });
+
+  describe("toThrow", function() {
+    describe("when code block throws an exception", function() {
+      var throwingFn;
+
+      beforeEach(function() {
+        throwingFn = function() {
+          throw new Error("Fake Error");
+        };
+      });
+
+      it("should match any exception", function() {
+        expect(match(throwingFn).toThrow()).toPass();
+      });
+
+      it("should match exceptions specified by message", function() {
+        expect(match(throwingFn).toThrow("Fake Error")).toPass();
+        expect(match(throwingFn).toThrow("Other Error")).toFail();
+        expect(lastResult().message).toMatch("Other Error");
+      });
+
+      it("should match exceptions specified by Error", function() {
+        expect(match(throwingFn).toThrow(new Error("Fake Error"))).toPass();
+        expect(match(throwingFn).toThrow(new Error("Other Error"))).toFail();
+        expect(lastResult().message).toMatch("Other Error");
+      });
+
+      describe("and matcher is inverted with .not", function() {
+        it("should match any exception", function() {
+          expect(match(throwingFn).not.toThrow()).toFail();
+          expect(lastResult().message).toMatch(/Expected function not to throw an exception/);
+        });
+
+        it("should match exceptions specified by message", function() {
+          expect(match(throwingFn).not.toThrow("Fake Error")).toFail();
+//          expect(lastResult().message).toMatch(/Expected function not to throw Fake Error./);
+          expect(match(throwingFn).not.toThrow("Other Error")).toPass();
+        });
+
+        it("should match exceptions specified by Error", function() {
+          expect(match(throwingFn).not.toThrow(new Error("Fake Error"))).toFail();
+//          expect(lastResult().message).toMatch("Other Error");
+          expect(match(throwingFn).not.toThrow(new Error("Other Error"))).toPass();
+        });
+      });
+    });
+
+    describe("when actual is not a function", function() {
+      it("should fail with an exception", function() {
+        var exception = catchException(function() {
+          match('not-a-function').toThrow();
+        });
+        expect(exception).toBeDefined();
+        expect(exception.message).toEqual('Actual is not a function');
+      });
+
+      describe("and matcher is inverted with .not", function() {
+        it("should fail with an exception", function() {
+          var exception = catchException(function() {
+            match('not-a-function').not.toThrow();
+          });
+          expect(exception).toBeDefined();
+          expect(exception.message).toEqual('Actual is not a function');
+        });
+      });
+    });
+
+
+    describe("when code block does not throw an exception", function() {
+      it("should fail (or pass when inverted with .not)", function() {
+        expect(match(
+          function() {
+          }).toThrow()).toFail();
+        expect(lastResult().message).toEqual('Expected function to throw an exception.');
+      });
+    });
+  });
+
+  describe(".not.matcher", function() {
+    it("should invert the sense of any matcher", function() {
+      expect(match(37).not.toBeGreaterThan(42)).toPass();
+      expect(match(42).not.toBeGreaterThan(37)).toFail();
+      expect(match("abc").not.toEqual("def")).toPass();
+      expect(match("abc").not.toEqual("abc")).toFail();
+    });
+
+    it("should provide an inverted default message", function() {
+      match(37).not.toBeGreaterThan(42);
+      expect(lastResult().message).toEqual("Passed.");
+
+      match(42).not.toBeGreaterThan(37);
+      expect(lastResult().message).toEqual("Expected 42 not to be greater than 37.");
+    });
+
+    it("should use the second message when the matcher sets an array of custom messages", function() {
+      spec.addMatchers({
+        custom: function() {
+          this.message = function() {
+            return ['Expected it was called.', 'Expected it wasn\'t called.'];
+          };
+          return this.actual;
+        }
+      });
+
+      match(true).custom();
+      expect(lastResult().message).toEqual("Passed.");
+      match(false).custom();
+      expect(lastResult().message).toEqual("Expected it was called.");
+      match(true).not.custom();
+      expect(lastResult().message).toEqual("Expected it wasn't called.");
+      match(false).not.custom();
+      expect(lastResult().message).toEqual("Passed.");
+    });
+  });
+
+  describe("spy matchers >>", function() {
+    var TestClass;
+    beforeEach(function() {
+      TestClass = {
+        normalFunction: function() {
+        },
+        spyFunction: jasmine.createSpy("My spy")
+      };
+    });
+
+    function shouldThrowAnExceptionWhenInvokedOnANonSpy(methodName) {
+      return function() {
+        expect(
+          function() {
+            match(TestClass.normalFunction)[methodName]();
+          }).toThrow('Expected a spy, but got Function.');
+
+        expect(
+          function() {
+            match(jasmine.undefined)[methodName]();
+          }).toThrow('Expected a spy, but got undefined.');
+
+        expect(
+          function() {
+            match({some:'object'})[methodName]();
+          }).toThrow('Expected a spy, but got { some : \'object\' }.');
+
+        expect(
+          function() {
+            match("<b>")[methodName]();
+          }).toThrow('Expected a spy, but got \'<b>\'.');
+      };
+    }
+
+    describe("toHaveBeenCalled", function() {
+      it("should pass if the spy was called", function() {
+        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toFail();
+
+        TestClass.spyFunction();
+        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toPass();
+      });
+
+      it("should throw an exception when invoked with any arguments", function() {
+        expect(
+          function() {
+            match(TestClass.normalFunction).toHaveBeenCalled("unwanted argument");
+          }).toThrow('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
+      });
+
+      it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('toHaveBeenCalled'));
+    });
+
+    describe("wasCalled", function() {
+      it("should alias toHaveBeenCalled", function() {
+        spyOn(TestClass, 'normalFunction');
+
+        TestClass.normalFunction();
+
+        expect(TestClass.normalFunction).wasCalled();
+      });
+    });
+
+
+    describe("wasNotCalled", function() {
+      it("should pass iff the spy was not called", function() {
+        expect(match(TestClass.spyFunction).wasNotCalled()).toPass();
+
+        TestClass.spyFunction();
+        expect(match(TestClass.spyFunction).wasNotCalled()).toFail();
+      });
+
+      it("should throw an exception when invoked with any arguments", function() {
+        expect(
+          function() {
+            match(TestClass.normalFunction).wasNotCalled("unwanted argument");
+          }).toThrow('wasNotCalled does not take arguments');
+      });
+
+      it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('wasNotCalled'));
+    });
+
+    describe("toHaveBeenCalledWith", function() {
+      it('toHaveBeenCalledWith should return true if it was called with the expected args', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        expect(match(TestClass.spyFunction).toHaveBeenCalledWith('a', 'b', 'c')).toPass();
+      });
+
+      it('should return false if it was not called with the expected args', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toFail();
+        var result = lastResult();
+        expect(result.passed()).toFail();
+        expect(result.expected).toEqual(['c', 'b', 'a']);
+        expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
+        expect(result.message).toContain(jasmine.pp(result.expected));
+        expect(result.message).toContain(jasmine.pp(result.actual.mostRecentCall.args));
+      });
+
+      it('should return false if it was not called', function() {
+        var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toFail();
+        var result = lastResult();
+        expect(result.passed()).toFail();
+        expect(result.expected).toEqual(['c', 'b', 'a']);
+        expect(result.actual.argsForCall).toEqual([]);
+        expect(result.message).toContain(jasmine.pp(result.expected));
+      });
+
+      it('should allow matches across multiple calls', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('a', 'b', 'c')).toPass();
+        expect(expected.toHaveBeenCalledWith('d', 'e', 'f')).toPass();
+        expect(expected.toHaveBeenCalledWith('x', 'y', 'z')).toFail();
+      });
+
+      it("should return a decent message", function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('a', 'b')).toFail();
+        expect(lastResult().message).toEqual("Expected spy My spy to have been called with [ 'a', 'b' ] but was called with [ [ 'a', 'b', 'c' ], [ 'd', 'e', 'f' ] ]");
+      });
+
+      it("should return a decent message when inverted", function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.not.toHaveBeenCalledWith('a', 'b', 'c')).toFail();
+        expect(lastResult().message).toEqual("Expected spy My spy not to have been called with [ 'a', 'b', 'c' ] but was called with [ [ 'a', 'b', 'c' ], [ 'd', 'e', 'f' ] ]");
+      });
+
+      it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('toHaveBeenCalledWith'));
+
+      describe("to build an ExpectationResult", function () {
+        beforeEach(function() {
+          var currentSuite;
+          var spec;
+          currentSuite = env.describe('default current suite', function() {
+            spec = env.it();
+          }, spec);
+          TestClass = { someFunction: function(a, b) {
+          } };
+          spec.spyOn(TestClass, 'someFunction');
+        });
+
+        it("should should handle the case of a spy", function() {
+          TestClass.someFunction('a', 'c');
+          var matcher = match(TestClass.someFunction);
+          matcher.toHaveBeenCalledWith('a', 'b');
+
+          var result = lastResult();
+          expect(result.matcherName).toEqual("toHaveBeenCalledWith");
+          expect(result.passed()).toFail();
+          expect(result.message).toContain(jasmine.pp(['a', 'b']));
+          expect(result.message).toContain(jasmine.pp(['a', 'c']));
+          expect(result.actual).toEqual(TestClass.someFunction);
+          expect(result.expected).toEqual(['a','b']);
+        });
+      });
+    });
+
+    describe("wasCalledWith", function() {
+      it("should alias toHaveBeenCalledWith", function() {
+        spyOn(TestClass, 'normalFunction');
+
+        TestClass.normalFunction(123);
+
+        expect(TestClass.normalFunction).wasCalledWith(123);
+      });
+    });
+
+    describe("wasNotCalledWith", function() {
+      it('should return true if the spy was NOT called with the expected args', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        expect(match(TestClass.spyFunction).wasNotCalledWith('c', 'b', 'a')).toPass();
+      });
+
+      it('should return false if it WAS called with the expected args', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.wasNotCalledWith('a', 'b', 'c')).toFail();
+        var result = lastResult();
+        expect(result.passed()).toFail();
+        expect(result.expected).toEqual(['a', 'b', 'c']);
+        expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
+        expect(result.message).toContain(jasmine.pp(result.expected));
+      });
+
+      it('should return true if it was not called', function() {
+        var expected = match(TestClass.spyFunction);
+        expect(expected.wasNotCalledWith('c', 'b', 'a')).toPass();
+      });
+
+      it('should allow matches across multiple calls', function() {
+        var expected = match(TestClass.spyFunction);
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
+        expect(expected.wasNotCalledWith('a', 'b', 'c')).toFail();
+        expect(expected.wasNotCalledWith('d', 'e', 'f')).toFail();
+        expect(expected.wasNotCalledWith('x', 'y', 'z')).toPass();
+      });
+
+      it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('wasNotCalledWith'));
+    });
+  });
+
+  describe("all matchers", function() {
+    it("should return null, for future-proofing, since we might eventually allow matcher chaining", function() {
+      expect(match(true).toBe(true)).toBeUndefined();
+    });
+  });
+});

spec/core/MockClockSpec.js

@@ -0,0 +1,38 @@
+describe("MockClock", function () {
+
+  beforeEach(function() {
+    jasmine.Clock.useMock();    
+  });
+
+  describe("setTimeout", function () {
+    it("should mock the clock when useMock is in a beforeEach", function() {
+      var expected = false;
+      setTimeout(function() {
+        expected = true;
+      }, 30000);
+      expect(expected).toBe(false);
+      jasmine.Clock.tick(30001);
+      expect(expected).toBe(true);
+    });
+  });
+
+  describe("setInterval", function () {
+    it("should mock the clock when useMock is in a beforeEach", function() {
+      var interval = 0;
+      setInterval(function() {
+        interval++;
+      }, 30000);
+      expect(interval).toEqual(0);
+      jasmine.Clock.tick(30001);
+      expect(interval).toEqual(1);
+      jasmine.Clock.tick(30001);
+      expect(interval).toEqual(2);
+      jasmine.Clock.tick(1);
+      expect(interval).toEqual(2);
+    });
+  });
+
+  it("shouldn't complain if you call jasmine.Clock.useMock() more than once", function() {
+    jasmine.Clock.useMock();
+  });
+});

spec/core/MultiReporterSpec.js

@@ -0,0 +1,45 @@
+describe("jasmine.MultiReporter", function() {
+  var multiReporter, fakeReporter1, fakeReporter2;
+
+  beforeEach(function() {
+    multiReporter = new jasmine.MultiReporter();
+    fakeReporter1 = jasmine.createSpyObj("fakeReporter1", ["reportSpecResults"]);
+    fakeReporter2 = jasmine.createSpyObj("fakeReporter2", ["reportSpecResults", "reportRunnerStarting"]);
+    multiReporter.addReporter(fakeReporter1);
+    multiReporter.addReporter(fakeReporter2);
+  });
+
+  it("should support all the method calls that jasmine.Reporter supports", function() {
+    var delegate = {};
+    multiReporter.addReporter(delegate);
+
+    this.addMatchers({
+      toDelegateMethod: function(methodName) {
+        delegate[methodName] = jasmine.createSpy(methodName);
+        this.actual[methodName]("whatever argument");
+
+        return delegate[methodName].wasCalled && 
+               delegate[methodName].mostRecentCall.args.length == 1 && 
+               delegate[methodName].mostRecentCall.args[0] == "whatever argument";
+      }
+    });
+
+    expect(multiReporter).toDelegateMethod('reportRunnerStarting');
+    expect(multiReporter).toDelegateMethod('reportRunnerResults');
+    expect(multiReporter).toDelegateMethod('reportSuiteResults');
+    expect(multiReporter).toDelegateMethod('reportSpecStarting');
+    expect(multiReporter).toDelegateMethod('reportSpecResults');
+    expect(multiReporter).toDelegateMethod('log');
+  });
+
+  it("should delegate to any and all subreporters", function() {
+    multiReporter.reportSpecResults('blah', 'foo');
+    expect(fakeReporter1.reportSpecResults).toHaveBeenCalledWith('blah', 'foo');
+    expect(fakeReporter2.reportSpecResults).toHaveBeenCalledWith('blah', 'foo');
+  });
+
+  it("should quietly skip delegating to any subreporters which lack the given method", function() {
+    multiReporter.reportRunnerStarting('blah', 'foo');
+    expect(fakeReporter2.reportRunnerStarting).toHaveBeenCalledWith('blah', 'foo');
+  });
+});

spec/core/NestedResultsSpec.js

@@ -0,0 +1,54 @@
+describe('jasmine.NestedResults', function() {
+  it('#addResult increments counters', function() {
+    // Leaf case
+    var results = new jasmine.NestedResults();
+
+    results.addResult(new jasmine.ExpectationResult({
+      matcherName: "foo", passed: true, message: 'Passed.', actual: 'bar', expected: 'bar'}
+    ));
+
+    expect(results.getItems().length).toEqual(1);
+    expect(results.totalCount).toEqual(1);
+    expect(results.passedCount).toEqual(1);
+    expect(results.failedCount).toEqual(0);
+
+    results.addResult(new jasmine.ExpectationResult({
+      matcherName: "baz", passed: false, message: 'FAIL.', actual: "corge", expected: "quux"
+    }));
+
+    expect(results.getItems().length).toEqual(2);
+    expect(results.totalCount).toEqual(2);
+    expect(results.passedCount).toEqual(1);
+    expect(results.failedCount).toEqual(1);
+  });
+
+  it('should roll up counts for nested results', function() {
+    // Branch case
+    var leafResultsOne = new jasmine.NestedResults();
+    leafResultsOne.addResult(new jasmine.ExpectationResult({
+      matcherName: "toSomething", passed: true, message: 'message', actual: '', expected:''
+    }));
+
+    leafResultsOne.addResult(new jasmine.ExpectationResult({
+      matcherName: "toSomethingElse", passed: false, message: 'message', actual: 'a', expected: 'b'
+    }));
+
+    var leafResultsTwo = new jasmine.NestedResults();
+    leafResultsTwo.addResult(new jasmine.ExpectationResult({
+      matcherName: "toSomething", passed: true, message: 'message', actual: '', expected: ''
+    }));
+    leafResultsTwo.addResult(new jasmine.ExpectationResult({
+      matcherName: "toSomethineElse", passed: false, message: 'message', actual: 'c', expected: 'd'
+    }));
+
+    var branchResults = new jasmine.NestedResults();
+    branchResults.addResult(leafResultsOne);
+    branchResults.addResult(leafResultsTwo);
+
+    expect(branchResults.getItems().length).toEqual(2);
+    expect(branchResults.totalCount).toEqual(4);
+    expect(branchResults.passedCount).toEqual(2);
+    expect(branchResults.failedCount).toEqual(2);
+  });
+
+});

spec/core/ObjectContainingSpec.js

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

spec/core/PrettyPrintSpec.js

@@ -1,75 +1,45 @@
-describe("j$.pp", function () {
+describe("jasmine.pp", function () {
   it("should wrap strings in single quotes", function() {
-    expect(j$.pp("some string")).toEqual("'some string'");
-    expect(j$.pp("som' string")).toEqual("'som' string'");
+    expect(jasmine.pp("some string")).toEqual("'some string'");
+    expect(jasmine.pp("som' string")).toEqual("'som' string'");
   });
 
   it("should stringify primitives properly", function() {
-    expect(j$.pp(true)).toEqual("true");
-    expect(j$.pp(false)).toEqual("false");
-    expect(j$.pp(null)).toEqual("null");
-    expect(j$.pp(jasmine.undefined)).toEqual("undefined");
-    expect(j$.pp(3)).toEqual("3");
-    expect(j$.pp(-3.14)).toEqual("-3.14");
+    expect(jasmine.pp(true)).toEqual("true");
+    expect(jasmine.pp(false)).toEqual("false");
+    expect(jasmine.pp(null)).toEqual("null");
+    expect(jasmine.pp(jasmine.undefined)).toEqual("undefined");
+    expect(jasmine.pp(3)).toEqual("3");
+    expect(jasmine.pp(-3.14)).toEqual("-3.14");
   });
 
   it("should stringify arrays properly", function() {
-    expect(j$.pp([1, 2])).toEqual("[ 1, 2 ]");
-    expect(j$.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', {  }, undefined, null ]");
+    expect(jasmine.pp([1, 2])).toEqual("[ 1, 2 ]");
+    expect(jasmine.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', {  }, undefined, null ]");
   });
 
   it("should indicate circular array references", function() {
     var array1 = [1, 2];
     var array2 = [array1];
     array1.push(array2);
-    expect(j$.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
+    expect(jasmine.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
   });
 
   it("should stringify objects properly", function() {
-    expect(j$.pp({foo: 'bar'})).toEqual("{ foo : 'bar' }");
-    expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo : 'bar', baz : 3, nullValue : null, undefinedValue : undefined }");
-    expect(j$.pp({foo: function () {
+    expect(jasmine.pp({foo: 'bar'})).toEqual("{ foo : 'bar' }");
+    expect(jasmine.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo : 'bar', baz : 3, nullValue : null, undefinedValue : undefined }");
+    expect(jasmine.pp({foo: function () {
     }, bar: [1, 2, 3]})).toEqual("{ foo : Function, bar : [ 1, 2, 3 ] }");
   });
 
-  it("should not include inherited properties when stringifying an object", function() {
-    var SomeClass = function() {};
-    SomeClass.prototype.foo = "inherited foo";
-    var instance = new SomeClass();
-    instance.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() {
-    var originalMaxDepth = j$.MAX_PRETTY_PRINT_DEPTH;
-    var nestedObject = { level1: { level2: { level3: { level4: "leaf" } } } };
-    var nestedArray  = [1, [2, [3, [4, "leaf"]]]];
-
-    try {
-      j$.MAX_PRETTY_PRINT_DEPTH = 2;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : Object } }");
-      expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
-
-      j$.MAX_PRETTY_PRINT_DEPTH = 3;
-      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(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
-    } finally {
-      j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
-    }
-  });
-
   it("should stringify RegExp objects properly", function() {
-    expect(j$.pp(/x|y|z/)).toEqual("/x|y|z/");
+    expect(jasmine.pp(/x|y|z/)).toEqual("/x|y|z/");
   });
 
   it("should indicate circular object references", function() {
     var sampleValue = {foo: 'hello'};
     sampleValue.nested = sampleValue;
-    expect(j$.pp(sampleValue)).toEqual("{ foo : 'hello', nested : <circular reference: Object> }");
+    expect(jasmine.pp(sampleValue)).toEqual("{ foo : 'hello', nested : <circular reference: Object> }");
   });
 
   it("should indicate getters on objects as such", function() {
@@ -81,45 +51,37 @@ describe("j$.pp", function () {
       });
     }
     if (sampleValue.__defineGetter__) {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
+      expect(jasmine.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
     }
     else {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1 }");
+      expect(jasmine.pp(sampleValue)).toEqual("{ id : 1 }");
     }
   });
 
 
   it('should not do HTML escaping of strings', function() {
-    expect(j$.pp('some <b>html string</b> &', false)).toEqual('\'some <b>html string</b> &\'');
+    expect(jasmine.pp('some <b>html string</b> &', false)).toEqual('\'some <b>html string</b> &\'');
   });
 
   it("should abbreviate the global (usually window) object", function() {
-    expect(j$.pp(jasmine.getGlobal())).toEqual("<global>");
+    expect(jasmine.pp(jasmine.getGlobal())).toEqual("<global>");
   });
 
   it("should stringify Date objects properly", function() {
     var now = new Date();
-    expect(j$.pp(now)).toEqual("Date(" + now.toString() + ")");
+    expect(jasmine.pp(now)).toEqual("Date(" + now.toString() + ")");
   });
 
   it("should stringify spy objects properly", function() {
     var TestObject = {
-          someFunction: function() {}
-        },
-        env = new j$.Env();
-
-    env.spyOn(TestObject, 'someFunction');
-    expect(j$.pp(TestObject.someFunction)).toEqual("spy on someFunction");
-
-    expect(j$.pp(j$.createSpy("something"))).toEqual("spy on something");
-  });
-
-  it("should stringify objects that implement jasmineToString", function () {
-    var obj = {
-      jasmineToString: function () { return "strung"; }
+      someFunction: function() {
+      }
     };
+    spyOn(TestObject, 'someFunction');
+    expect(jasmine.pp(TestObject.someFunction)).toEqual("spy on someFunction");
 
-    expect(j$.pp(obj)).toEqual("strung");
+    expect(jasmine.pp(jasmine.createSpy("something"))).toEqual("spy on something");
   });
+
 });
 

spec/core/QueueRunnerSpec.js

@@ -1,172 +0,0 @@
-describe("QueueRunner", function() {
-
-  it("runs all the functions it's passed", function() {
-    var calls = [],
-      fn1 = jasmine.createSpy('fn1'),
-      fn2 = jasmine.createSpy('fn2'),
-      queueRunner = new j$.QueueRunner({
-        fns: [fn1, fn2]
-      });
-    fn1.and.callFake(function() {
-      calls.push('fn1');
-    });
-    fn2.and.callFake(function() {
-      calls.push('fn2');
-    });
-
-    queueRunner.execute();
-
-    expect(calls).toEqual(['fn1', 'fn2']);
-  });
-
-  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(); },
-        queueRunner = new j$.QueueRunner({
-          fns: [fn1, fn2, fn3]
-        }),
-        asyncContext;
-
-    queueRunner.execute();
-
-    var context = fn1.calls.first().object;
-    expect(context).toEqual({});
-    expect(fn2.calls.first().object).toBe(context);
-    expect(asyncContext).toBe(context);
-  });
-
-  describe("with an asynchronous function", function() {
-    beforeEach(function() {
-      jasmine.clock().install();
-    });
-
-    afterEach(function() {
-      jasmine.clock().uninstall();
-    });
-
-    it("supports asynchronous functions, only advancing to next function after a done() callback", function() {
-      //TODO: it would be nice if spy arity could match the fake, so we could do something like:
-      //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
-      });
-
-      queueRunner.execute();
-
-      expect(beforeCallback).toHaveBeenCalled();
-      expect(fnCallback).not.toHaveBeenCalled();
-      expect(afterCallback).not.toHaveBeenCalled();
-      expect(onComplete).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(fnCallback).toHaveBeenCalled();
-      expect(afterCallback).not.toHaveBeenCalled();
-      expect(onComplete).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(afterCallback).toHaveBeenCalled();
-      expect(onComplete).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(onComplete).toHaveBeenCalled();
-    });
-  });
-
-  it("calls an exception handler when an exception is thrown in a fn", function() {
-    var fn = function() {
-        throw new Error('fake error');
-      },
-      exceptionCallback = jasmine.createSpy('exception callback'),
-      queueRunner = new j$.QueueRunner({
-        fns: [fn],
-        onException: exceptionCallback
-      });
-
-    queueRunner.execute();
-
-    expect(exceptionCallback).toHaveBeenCalledWith(jasmine.any(Error));
-  });
-
-  it("rethrows an exception if told to", function() {
-    var fn = function() {
-        throw new Error('fake error');
-      },
-      queueRunner = new j$.QueueRunner({
-        fns: [fn],
-        catchException: function(e) { return false; }
-      });
-
-    expect(function() { queueRunner.execute(); }).toThrow();
-  });
-
-  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]
-    });
-
-    queueRunner.execute();
-    expect(nextFn).toHaveBeenCalled();
-  });
-
-  it("calls a provided complete callback when done", function() {
-    var fn = jasmine.createSpy('fn'),
-      completeCallback = jasmine.createSpy('completeCallback'),
-      queueRunner = new j$.QueueRunner({
-        fns: [fn],
-        onComplete: completeCallback
-      });
-
-    queueRunner.execute();
-
-    expect(completeCallback).toHaveBeenCalled();
-  });
-
-  it("calls a provided stack clearing function when done", function() {
-    var asyncFn = function(done) { done() },
-        afterFn = jasmine.createSpy('afterFn'),
-        completeCallback = jasmine.createSpy('completeCallback'),
-        clearStack = jasmine.createSpy('clearStack'),
-        queueRunner = new j$.QueueRunner({
-          fns: [asyncFn, afterFn],
-          clearStack: clearStack,
-          onComplete: completeCallback
-        });
-
-    clearStack.and.callFake(function(fn) { fn(); });
-
-    queueRunner.execute();
-    expect(afterFn).toHaveBeenCalled();
-    expect(clearStack).toHaveBeenCalledWith(completeCallback);
-  });
-});

spec/core/QueueSpec.js

@@ -0,0 +1,23 @@
+describe("jasmine.Queue", function() {
+  it("should not call itself recursively, so we don't get stack overflow errors", function() {
+    var queue = new jasmine.Queue(new jasmine.Env());
+    queue.add(new jasmine.Block(null, function() {}));
+    queue.add(new jasmine.Block(null, function() {}));
+    queue.add(new jasmine.Block(null, function() {}));
+    queue.add(new jasmine.Block(null, function() {}));
+
+    var nestCount = 0;
+    var maxNestCount = 0;
+    var nextCallCount = 0;
+    queue.next_ = function() {
+      nestCount++;
+      if (nestCount > maxNestCount) maxNestCount = nestCount;
+
+      jasmine.Queue.prototype.next_.apply(queue, arguments);
+      nestCount--;
+    };
+
+    queue.start();
+    expect(maxNestCount).toEqual(1);
+  });
+});

spec/core/ReportDispatcherSpec.js

@@ -1,40 +0,0 @@
-describe("ReportDispatcher", function() {
-
-  it("builds an interface of requested methods", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo', 'bar', 'baz']);
-
-    expect(dispatcher.foo).toBeDefined();
-    expect(dispatcher.bar).toBeDefined();
-    expect(dispatcher.baz).toBeDefined();
-  });
-
-  it("dispatches requested methods to added reporters", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo', 'bar']),
-      reporter = jasmine.createSpyObj('reporter', ['foo', 'bar']),
-      anotherReporter = jasmine.createSpyObj('reporter', ['foo', 'bar']);
-
-    dispatcher.addReporter(reporter);
-    dispatcher.addReporter(anotherReporter);
-
-    dispatcher.foo(123, 456);
-
-    expect(reporter.foo).toHaveBeenCalledWith(123, 456);
-    expect(anotherReporter.foo).toHaveBeenCalledWith(123, 456);
-
-    dispatcher.bar('a', 'b');
-
-    expect(reporter.bar).toHaveBeenCalledWith('a', 'b');
-    expect(anotherReporter.bar).toHaveBeenCalledWith('a', 'b');
-  });
-
-  it("does not dispatch to a reporter if the reporter doesn't accept the method", function() {
-    var dispatcher = new j$.ReportDispatcher(['foo']),
-      reporter = jasmine.createSpyObj('reporter', ['baz']);
-
-    dispatcher.addReporter(reporter);
-
-    expect(function() {
-      dispatcher.foo(123, 456);
-    }).not.toThrow();
-  });
-});

spec/core/ReporterSpec.js

@@ -0,0 +1,56 @@
+describe('jasmine.Reporter', function() {
+  var env;
+
+
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+  });
+
+  it('should get called from the test runner', function() {
+    env.describe('Suite for JSON Reporter with Callbacks', function () {
+      env.it('should be a test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
+      env.it('should be a failing test', function() {
+        this.runs(function () {
+          this.expect(false).toEqual(true);
+        });
+      });
+    });
+    env.describe('Suite for JSON Reporter with Callbacks 2', function () {
+      env.it('should be a test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
+
+    });
+
+    var foo = 0;
+    var bar = 0;
+    var baz = 0;
+
+    env.addReporter({
+      reportSpecResults: function() {
+        foo++;
+      },
+      reportSuiteResults: function() {
+        bar++;
+      },
+      reportRunnerResults: function() {
+        baz++;
+      }
+    });
+
+    var runner = env.currentRunner();
+    runner.execute();
+
+    expect(foo).toEqual(3); // 'foo was expected to be 3, was ' + foo);
+    expect(bar).toEqual(2); // 'bar was expected to be 2, was ' + bar);
+    expect(baz).toEqual(1); // 'baz was expected to be 1, was ' + baz);
+  });
+
+});

spec/core/RunnerSpec.js

@@ -0,0 +1,267 @@
+describe('RunnerTest', function() {
+  var fakeTimer;
+  var env;
+
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+
+    fakeTimer = new jasmine.FakeTimer();
+    env.setTimeout = fakeTimer.setTimeout;
+    env.clearTimeout = fakeTimer.clearTimeout;
+    env.setInterval = fakeTimer.setInterval;
+    env.clearInterval = fakeTimer.clearInterval;
+  });
+
+  describe('beforeEach', function() {
+    it('should run before each spec for all suites', function () {
+      var foo;
+      env.beforeEach(function () {
+        foo = 0;
+      });
+
+      env.describe('suite 1', function () {
+        env.it('test 1-1', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+        env.it('test 1-2', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+      });
+
+      env.describe('suite 2', function () {
+        env.it('test 2-1', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+      });
+
+      env.currentRunner().execute();
+
+      var runnerResults = env.currentRunner().results();
+      expect(runnerResults.totalCount).toEqual(3);
+      expect(runnerResults.passedCount).toEqual(3);
+    });
+
+
+    it('should provide all specs', function () {
+      var foo;
+      env.beforeEach(function () {
+        foo = 0;
+      });
+
+      env.describe('suite 1', function () {
+        env.it('test 1-1', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+        env.it('test 1-2', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+      });
+
+      env.describe('suite 2', function () {
+        env.it('test 2-1', function() {
+          foo++;
+          this.expect(foo).toEqual(1);
+        });
+      });
+
+      env.currentRunner().execute();
+
+
+      expect(env.currentRunner().specs().length).toEqual(3);
+    });
+  });
+
+  describe('afterEach', function() {
+    it('should run after each spec for all suites', function () {
+      var foo = 3;
+      env.afterEach(function () {
+        foo = foo - 1;
+      });
+
+      env.describe('suite 1', function () {
+        env.it('test 1-1', function() {
+          this.expect(foo).toEqual(3);
+        });
+        env.it('test 1-2', function() {
+          this.expect(foo).toEqual(2);
+        });
+      });
+
+      env.describe('suite 2', function () {
+        env.it('test 2-1', function() {
+          this.expect(foo).toEqual(1);
+        });
+      });
+
+      env.currentRunner().execute();
+
+      var runnerResults = env.currentRunner().results();
+      expect(runnerResults.totalCount).toEqual(3);
+      expect(runnerResults.passedCount).toEqual(3);
+    });
+  });
+
+
+  it('should run child suites and specs and generate results when execute is called', function() {
+    env.describe('one suite description', function () {
+      env.it('should be a test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
+    });
+
+    env.describe('another suite description', function () {
+      env.it('should be another test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(false);
+        });
+      });
+    });
+
+    env.currentRunner().execute();
+
+    var runnerResults = env.currentRunner().results();
+    expect(runnerResults.totalCount).toEqual(2);
+    expect(runnerResults.passedCount).toEqual(1);
+    expect(runnerResults.failedCount).toEqual(1);
+  });
+
+
+  it('should ignore suites that have been x\'d', function() {
+    env.xdescribe('one suite description', function () {
+      env.it('should be a test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
+    });
+
+    env.describe('another suite description', function () {
+      env.it('should be another test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(false);
+        });
+      });
+    });
+
+    env.currentRunner().execute();
+
+    var runnerResults = env.currentRunner().results();
+    expect(runnerResults.totalCount).toEqual(1);
+    expect(runnerResults.passedCount).toEqual(0);
+    expect(runnerResults.failedCount).toEqual(1);
+  });
+
+  it('should roll up results from all specs', function() {
+    env.describe('one suite description', function () {
+      env.it('should be a test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+      });
+    });
+
+    env.describe('another suite description', function () {
+      env.it('should be another test', function() {
+        this.runs(function () {
+          this.expect(true).toEqual(false);
+        });
+      });
+    });
+
+    env.currentRunner().execute();
+
+    var results = env.currentRunner().results();
+    expect(results.totalCount).toEqual(2);
+    expect(results.passedCount).toEqual(1);
+    expect(results.failedCount).toEqual(1);
+  });
+
+  describe('reporting', function () {
+    var fakeReporter;
+    beforeEach(function () {
+      fakeReporter = jasmine.createSpyObj("fakeReporter", ["log", "reportRunnerStarting", "reportRunnerResults"]);
+      env.addReporter(fakeReporter);
+    });
+
+    it('should report runner results when the runner has completed running', function() {
+      env.describe('one suite description', function () {
+        env.it('should be a test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+      });
+
+      env.describe('another suite description', function () {
+        env.it('should be another test', function() {
+          this.waits(200);
+          this.runs(function () {
+            this.expect(true).toEqual(false);
+          });
+        });
+      });
+
+      env.currentRunner().execute();
+      expect(fakeReporter.reportRunnerResults).not.toHaveBeenCalled();
+      fakeTimer.tick(200);
+      //This blows up the JSApiReporter.
+      //expect(fakeReporter.reportRunnerResults).toHaveBeenCalledWith(env.currentRunner);
+      expect(fakeReporter.reportRunnerResults).toHaveBeenCalled();
+      expect(fakeReporter.reportRunnerResults.mostRecentCall.args[0].results()).toEqual(env.currentRunner().results());
+    });
+  });
+
+  it("should report when the tests start running", function() {
+    var fakeReporter = jasmine.createSpyObj("fakeReporter", ["log", "reportRunnerStarting"]);
+    env.addReporter(fakeReporter);
+
+
+    var runner = new jasmine.Runner(env);
+    runner.arbitraryVariable = 'foo';
+    spyOn(runner.queue, 'start');
+    expect(fakeReporter.reportRunnerStarting).not.toHaveBeenCalled();
+    runner.execute();
+    expect(fakeReporter.reportRunnerStarting).toHaveBeenCalled();
+    var reportedRunner = fakeReporter.reportRunnerStarting.mostRecentCall.args[0];
+    expect(reportedRunner.arbitraryVariable).toEqual('foo');
+    expect(runner.queue.start).toHaveBeenCalled();
+  });
+
+  describe("when suites are nested", function() {
+    var suite1, suite2, suite3;
+
+    function suiteNames(suites) {
+      var suiteDescriptions = [];
+      for (var i = 0; i < suites.length; i++) {
+        suiteDescriptions.push(suites[i].getFullName());
+      }
+      return suiteDescriptions;
+    }
+
+    beforeEach(function() {
+      suite1 = env.describe("suite 1", function() {
+        suite2 = env.describe("suite 2", function() {
+        });
+      });
+      suite3 = env.describe("suite 3", function() {});
+    });
+
+    it("#suites should return a flat array of all suites, including nested suites", function() {
+      var suites = env.currentRunner().suites();
+      expect(suiteNames(suites)).toEqual([suite1.getFullName(), suite2.getFullName(), suite3.getFullName()]);
+    });
+
+    it("#topLevelSuites should return a flat array of all top-level suites only", function() {
+      var suites = env.currentRunner().topLevelSuites();
+      expect(suiteNames(suites)).toEqual([suite1.getFullName(), suite3.getFullName()]);
+    });
+  });
+});

spec/core/SpecSpec.js

@@ -1,321 +1,124 @@
-describe("Spec", function() {
-
-  it("#isPendingSpecException returns true for a pending spec exception", function() {
-    var e = new Error(j$.Spec.pendingSpecExceptionMessage);
-
-    expect(j$.Spec.isPendingSpecException(e)).toBe(true);
+describe('Spec', function () {
+  var env, suite;
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+    suite = new jasmine.Suite(env, 'suite 1');
   });
 
-  it("#isPendingSpecException returns true for a pending spec exception (even when FF bug is present)", function() {
-    var fakeError = {
-      toString: function() { return "Error: " + j$.Spec.pendingSpecExceptionMessage; }
-    };
+  describe('initialization', function () {
 
-    expect(j$.Spec.isPendingSpecException(fakeError)).toBe(true);
-  });
+    it('should raise an error if an env is not passed', function () {
+      try {
+        new jasmine.Spec();
+      }
+      catch (e) {
+        expect(e.message).toEqual('jasmine.Env() required');
+      }
+    });
 
-  it("#isPendingSpecException returns true for a pending spec exception", function() {
-    var e = new Error("foo");
+    it('should raise an error if a suite is not passed', function () {
+      try {
+        new jasmine.Spec(env);
+      }
+      catch (e) {
+        expect(e.message).toEqual('jasmine.Suite() required');
+      }
+    });
 
-    expect(j$.Spec.isPendingSpecException(e)).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() {},
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.execute();
-
-    expect(fakeQueueRunner).toHaveBeenCalled();
-  });
-
-  it("should call the start callback on execution", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      startCallback = jasmine.createSpy('startCallback'),
-      spec = new j$.Spec({
-        id: 123,
-        description: 'foo bar',
-        fn: function() {},
-        onStart: startCallback,
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.execute();
-
-    // TODO: due to some issue with the Pretty Printer, this line fails, but the other two pass.
-    // This means toHaveBeenCalledWith on IE8 will always be broken.
-
-    //   expect(startCallback).toHaveBeenCalledWith(spec);
-    expect(startCallback).toHaveBeenCalled();
-    expect(startCallback.calls.first().object).toEqual(spec);
-  });
-
-  it("should call the start callback on execution but before any befores are called", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      beforesWereCalled = false,
-      startCallback = jasmine.createSpy('start-callback').and.callFake(function() {
-        expect(beforesWereCalled).toBe(false);
-      }),
-      spec = new j$.Spec({
-        fn: function() {},
-        beforeFns: function() {
-          return [function() {
-            beforesWereCalled = true
-          }]
-        },
-        onStart: startCallback,
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.execute();
-
-    expect(startCallback).toHaveBeenCalled();
-  });
-
-  it("provides all before fns and after fns to be run", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      before = jasmine.createSpy('before'),
-      after = jasmine.createSpy('after'),
-      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]
-        },
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.execute();
-
-    var allSpecFns = fakeQueueRunner.calls.mostRecent().args[0].fns;
-    expect(allSpecFns).toEqual([before, fn, after]);
-  });
-
-  it("is marked pending if created without a function body", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-
-      startCallback = jasmine.createSpy('startCallback'),
-      resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
-        onStart: startCallback,
-        fn: null,
-        resultCallback: resultCallback,
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-
-    expect(spec.status()).toBe('pending');
-  });
-
-  it("can be disabled, but still calls callbacks", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      startCallback = jasmine.createSpy('startCallback'),
-      specBody = jasmine.createSpy('specBody'),
-      resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
-        onStart:startCallback,
-        fn: specBody,
-        resultCallback: resultCallback,
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.disable();
-
-    expect(spec.status()).toBe('disabled');
-
-    spec.execute();
-
-    expect(fakeQueueRunner).not.toHaveBeenCalled();
-    expect(specBody).not.toHaveBeenCalled();
-
-    expect(startCallback).toHaveBeenCalled();
-    expect(resultCallback).toHaveBeenCalled();
-  });
-
-  it("can be marked pending, but still calls callbacks when executed", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      startCallback = jasmine.createSpy('startCallback'),
-      resultCallback = jasmine.createSpy('resultCallback'),
-      spec = new j$.Spec({
-        onStart: startCallback,
-        resultCallback: resultCallback,
-        description: "with a spec",
-        getSpecName: function() {
-          return "a suite with a spec"
-        },
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.pend();
-
-    expect(spec.status()).toBe('pending');
-
-    spec.execute();
-
-    expect(fakeQueueRunner).not.toHaveBeenCalled();
-
-    expect(startCallback).toHaveBeenCalled();
-    expect(resultCallback).toHaveBeenCalledWith({
-      id: spec.id,
-      status: 'pending',
-      description: 'with a spec',
-      fullName: 'a suite with a spec',
-      failedExpectations: []
+    it('should assign sequential ids for specs belonging to the same env', function () {
+      var spec1 = new jasmine.Spec(env, suite);
+      var spec2 = new jasmine.Spec(env, suite);
+      var spec3 = new jasmine.Spec(env, suite);
+      expect(spec1.id).toEqual(0);
+      expect(spec2.id).toEqual(1);
+      expect(spec3.id).toEqual(2);
     });
   });
 
-  it("should call the done callback on execution complete", function() {
-    var done = jasmine.createSpy('done callback'),
-      spec = new j$.Spec({
-        fn: function() {},
-        catchExceptions: function() { return false; },
-        resultCallback: function() {},
-        queueRunnerFactory: function(attrs) { attrs.onComplete(); }
+  it('getFullName returns suite & spec description', function () {
+    var spec = new jasmine.Spec(env, suite, 'spec 1');
+    expect(spec.getFullName()).toEqual('suite 1 spec 1.');
+  });
+
+  describe('results', function () {
+    var spec, results;
+    beforeEach(function () {
+      spec = new jasmine.Spec(env, suite);
+      results = spec.results();
+      expect(results.totalCount).toEqual(0);
+      spec.runs(function () {
+        this.expect(true).toEqual(true);
+        this.expect(true).toEqual(true);
       });
-
-    spec.execute(done);
-
-    expect(done).toHaveBeenCalled();
-  });
-
-  it("#status returns passing by default", function() {
-    var spec = new j$.Spec({fn: jasmine.createSpy("spec body")});
-    expect(spec.status()).toEqual('passed');
-  });
-
-  it("#status returns passed if all expectations in the spec have passed", function() {
-    var spec = new j$.Spec({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") });
-    spec.addExpectationResult(true);
-    spec.addExpectationResult(false);
-    expect(spec.status()).toBe('failed');
-  });
-
-  it("can return its full name", function() {
-    var specNameSpy = jasmine.createSpy('specNameSpy').and.returnValue('expected val');
-
-    var spec = new j$.Spec({
-      getSpecName: specNameSpy
     });
 
-    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() {
-    it("should mark the spec as pending", function() {
-      var fakeQueueRunner = function(opts) {
-          opts.onException(new Error(j$.Spec.pendingSpecExceptionMessage));
-        },
-        spec = new j$.Spec({
-          description: 'my test',
-          id: 'some-id',
-          fn: function() { },
-          queueRunnerFactory: fakeQueueRunner
-        });
 
+    it('results shows the total number of expectations for each spec after execution', function () {
+      expect(results.totalCount).toEqual(0);
       spec.execute();
+      expect(results.totalCount).toEqual(2);
+    });
 
-      expect(spec.status()).toEqual("pending");
+    it('results shows the number of passed expectations for each spec after execution', function () {
+      expect(results.passedCount).toEqual(0);
+      spec.execute();
+      expect(results.passedCount).toEqual(2);
+    });
+
+    it('results shows the number of failed expectations for each spec after execution', function () {
+      spec.runs(function () {
+        this.expect(true).toEqual(false);
+      });
+      expect(results.failedCount).toEqual(0);
+      spec.execute();
+      expect(results.failedCount).toEqual(1);
+    });
+
+    describe('results.passed', function () {
+      it('is true if all spec expectations pass', function () {
+        spec.runs(function () {
+          this.expect(true).toEqual(true);
+        });
+        spec.execute();
+        expect(results.passed()).toEqual(true);
+      });
+
+      it('is false if one spec expectation fails', function () {
+        spec.runs(function () {
+          this.expect(true).toEqual(false);
+        });
+        spec.execute();
+        expect(results.passed()).toEqual(false);
+      });
+
+      it('a spec with no expectations will return true', function () {
+        var specWithoutExpectations = new jasmine.Spec(env, suite);
+        specWithoutExpectations.runs(function() {
+
+        });
+        specWithoutExpectations.execute();
+        expect(results.passed()).toEqual(true);
+      });
+
+      it('an unexecuted spec will return true', function () {
+        expect(results.passed()).toEqual(true);
+      });
+    });
+
+    it("includes log messages, which may contain arbitary objects", function() {
+      spec.runs(function() {
+        this.log("here's some log message", {key: 'value'}, 123);
+      });
+      spec.execute();
+      var items = results.getItems();
+      expect(items).toEqual([
+          jasmine.any(jasmine.ExpectationResult),
+          jasmine.any(jasmine.ExpectationResult),
+          jasmine.any(jasmine.MessageResult)
+      ]);
+      var logResult = items[2];
+      expect(logResult.values).toEqual(["here's some log message", {key: 'value'}, 123]);
     });
   });
-});
+});

spec/core/SpySpec.js

@@ -1,67 +1,201 @@
 describe('Spies', function () {
-  describe("createSpy", function() {
-    var TestClass;
+  it('should replace the specified function with a spy object', function() {
+    var originalFunctionWasCalled = false;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+      }
+    };
+    this.spyOn(TestClass, 'someFunction');
 
-    beforeEach(function() {
-      TestClass = function() {};
-      TestClass.prototype.someFunction = function() {};
-      TestClass.prototype.someFunction.bob = "test";
-    });
-    
-    it("preserves the properties of the spied function", function() {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+    expect(TestClass.someFunction.wasCalled).toEqual(false);
+    expect(TestClass.someFunction.callCount).toEqual(0);
+    TestClass.someFunction('foo');
+    expect(TestClass.someFunction.wasCalled).toEqual(true);
+    expect(TestClass.someFunction.callCount).toEqual(1);
+    expect(TestClass.someFunction.mostRecentCall.args).toEqual(['foo']);
+    expect(TestClass.someFunction.mostRecentCall.object).toEqual(TestClass);
+    expect(originalFunctionWasCalled).toEqual(false);
 
-      expect(spy.bob).toEqual("test");
+    TestClass.someFunction('bar');
+    expect(TestClass.someFunction.callCount).toEqual(2);
+    expect(TestClass.someFunction.mostRecentCall.args).toEqual(['bar']);
+  });
+
+  it('should allow you to view args for a particular call', function() {
+    var originalFunctionWasCalled = false;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+      }
+    };
+    this.spyOn(TestClass, 'someFunction');
+
+    TestClass.someFunction('foo');
+    TestClass.someFunction('bar');
+    expect(TestClass.someFunction.calls[0].args).toEqual(['foo']);
+    expect(TestClass.someFunction.calls[1].args).toEqual(['bar']);
+    expect(TestClass.someFunction.mostRecentCall.args).toEqual(['bar']);
+  });
+
+  it('should be possible to call through to the original method, or return a specific result', function() {
+    var originalFunctionWasCalled = false;
+    var passedArgs;
+    var passedObj;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+        passedArgs = arguments;
+        passedObj = this;
+        return "return value from original function";
+      }
+    };
+
+    this.spyOn(TestClass, 'someFunction').andCallThrough();
+    var result = TestClass.someFunction('arg1', 'arg2');
+    expect(result).toEqual("return value from original function");
+    expect(originalFunctionWasCalled).toEqual(true);
+    expect(passedArgs).toEqual(['arg1', 'arg2']);
+    expect(passedObj).toEqual(TestClass);
+    expect(TestClass.someFunction.wasCalled).toEqual(true);
+  });
+
+  it('should be possible to return a specific value', function() {
+    var originalFunctionWasCalled = false;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+        return "return value from original function";
+      }
+    };
+
+    this.spyOn(TestClass, 'someFunction').andReturn("some value");
+    originalFunctionWasCalled = false;
+    var result = TestClass.someFunction('arg1', 'arg2');
+    expect(result).toEqual("some value");
+    expect(originalFunctionWasCalled).toEqual(false);
+  });
+
+  it('should be possible to throw a specific error', function() {
+    var originalFunctionWasCalled = false;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+        return "return value from original function";
+      }
+    };
+
+    this.spyOn(TestClass, 'someFunction').andThrow(new Error('fake error'));
+    var exception;
+    try {
+      TestClass.someFunction('arg1', 'arg2');
+    } catch (e) {
+      exception = e;
+    }
+    expect(exception.message).toEqual('fake error');
+    expect(originalFunctionWasCalled).toEqual(false);
+  });
+
+  it('should be possible to call a specified function', function() {
+    var originalFunctionWasCalled = false;
+    var fakeFunctionWasCalled = false;
+    var passedArgs;
+    var passedObj;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+        return "return value from original function";
+      }
+    };
+
+    this.spyOn(TestClass, 'someFunction').andCallFake(function() {
+      fakeFunctionWasCalled = true;
+      passedArgs = arguments;
+      passedObj = this;
+      return "return value from fake function";
     });
 
-    it("warns the user that we intend to overwrite an existing property", function() {
-      TestClass.prototype.someFunction.and = "turkey";
+    var result = TestClass.someFunction('arg1', 'arg2');
+    expect(result).toEqual("return value from fake function");
+    expect(originalFunctionWasCalled).toEqual(false);
+    expect(fakeFunctionWasCalled).toEqual(true);
+    expect(passedArgs).toEqual(['arg1', 'arg2']);
+    expect(passedObj).toEqual(TestClass);
+    expect(TestClass.someFunction.wasCalled).toEqual(true);
+  });
 
-      expect(function() {
-        j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
-      }).toThrowError("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon");
-    });
+  it('is torn down when this.removeAllSpies is called', function() {
+    var originalFunctionWasCalled = false;
+    var TestClass = {
+      someFunction: function() {
+        originalFunctionWasCalled = true;
+      }
+    };
+    this.spyOn(TestClass, 'someFunction');
 
-    it("adds a spyStrategy and callTracker to the spy", function() {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+    TestClass.someFunction('foo');
+    expect(originalFunctionWasCalled).toEqual(false);
 
-      expect(spy.and).toEqual(jasmine.any(j$.SpyStrategy));
-      expect(spy.calls).toEqual(jasmine.any(j$.CallTracker));
-    });
+    this.removeAllSpies();
 
-    it("tracks the argument of calls", function () {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
-      var trackSpy = spyOn(spy.calls, "track");
+    TestClass.someFunction('foo');
+    expect(originalFunctionWasCalled).toEqual(true);
+  });
 
-      spy("arg");
+  it('calls removeAllSpies during spec finish', function() {
+    var test = new jasmine.Spec(new jasmine.Env(), {}, 'sample test');
 
-      expect(trackSpy.calls.mostRecent().args[0].args).toEqual(["arg"]);
-    });
+    this.spyOn(test, 'removeAllSpies');
 
-    it("tracks the context of calls", function () {
-      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
-      var trackSpy = spyOn(spy.calls, "track");
+    test.finish();
 
-      var contextObject = { spyMethod: spy };
-      contextObject.spyMethod();
+    expect(test.removeAllSpies).wasCalled();
+  });
 
-      expect(trackSpy.calls.mostRecent().args[0].object).toEqual(contextObject);
-    });
+  it('throws an exception when some method is spied on twice', function() {
+    var TestClass = { someFunction: function() {
+    } };
+    this.spyOn(TestClass, 'someFunction');
+    var exception;
+    try {
+      this.spyOn(TestClass, 'someFunction');
+    } catch (e) {
+      exception = e;
+    }
+    expect(exception).toBeDefined();
+  });
+
+  it('should be able to reset a spy', function() {
+    var TestClass = { someFunction: function() {} };
+    this.spyOn(TestClass, 'someFunction');
+
+    expect(TestClass.someFunction).not.toHaveBeenCalled();
+    TestClass.someFunction();
+    expect(TestClass.someFunction).toHaveBeenCalled();
+    TestClass.someFunction.reset();
+    expect(TestClass.someFunction).not.toHaveBeenCalled();
+    expect(TestClass.someFunction.callCount).toEqual(0);
   });
 
   describe("createSpyObj", function() {
     it("should create an object with a bunch of spy methods when you call jasmine.createSpyObj()", function() {
-      var spyObj = j$.createSpyObj('BaseName', ['method1', 'method2']);
-
+      var spyObj = jasmine.createSpyObj('BaseName', ['method1', 'method2']);
       expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function)});
-      expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
-      expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
+      expect(spyObj.method1.identity).toEqual('BaseName.method1');
+      expect(spyObj.method2.identity).toEqual('BaseName.method2');
     });
 
     it("should throw if you do not pass an array argument", function() {
       expect(function() {
-        j$.createSpyObj('BaseName');
-      }).toThrow("createSpyObj requires a non-empty array of method names to create spies for");
+        jasmine.createSpyObj('BaseName');
+      }).toThrow('createSpyObj requires a non-empty array of method names to create spies for');
+    });
+
+    it("should throw if you pass an empty array argument", function() {
+      expect(function() {
+        jasmine.createSpyObj('BaseName');
+      }).toThrow('createSpyObj requires a non-empty array of method names to create spies for');
     });
   });
+
 });

spec/core/SpyStrategySpec.js

@@ -1,111 +0,0 @@
-describe("SpyStrategy", function() {
-
-  it("defaults its name to unknown", function() {
-    var spyStrategy = new j$.SpyStrategy();
-
-    expect(spyStrategy.identity()).toEqual("unknown");
-  });
-
-  it("takes a name", function() {
-    var spyStrategy = new j$.SpyStrategy({name: "foo"});
-
-    expect(spyStrategy.identity()).toEqual("foo");
-  });
-
-  it("stubs an original function, if provided", function() {
-    var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
-
-    spyStrategy.exec();
-
-    expect(originalFn).not.toHaveBeenCalled();
-  });
-
-  it("allows an original function to be called, passed through the params and returns it's value", function() {
-    var originalFn = jasmine.createSpy("original").and.returnValue(42),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
-        returnValue;
-
-    spyStrategy.callThrough();
-    returnValue = spyStrategy.exec("foo");
-
-    expect(originalFn).toHaveBeenCalled();
-    expect(originalFn.calls.mostRecent().args).toEqual(["foo"]);
-    expect(returnValue).toEqual(42);
-  });
-
-  it("can return a specified value when executed", function() {
-    var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
-        returnValue;
-
-    spyStrategy.returnValue(17);
-    returnValue = spyStrategy.exec();
-
-    expect(originalFn).not.toHaveBeenCalled();
-    expect(returnValue).toEqual(17);
-  });
-
-  it("allows an exception to be thrown when executed", function() {
-    var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
-
-    spyStrategy.throwError(new TypeError("bar"));
-
-    expect(function() { spyStrategy.exec(); }).toThrowError(TypeError, "bar");
-    expect(originalFn).not.toHaveBeenCalled();
-  });
-
-  it("allows a non-Error to be thrown, wrapping it into an exception when executed", function() {
-    var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
-
-    spyStrategy.throwError("bar");
-
-    expect(function() { spyStrategy.exec(); }).toThrowError(Error, "bar");
-    expect(originalFn).not.toHaveBeenCalled();
-  });
-
-  it("allows a fake function to be called instead", function() {
-    var originalFn = jasmine.createSpy("original"),
-        fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
-        returnValue;
-
-    spyStrategy.callFake(fakeFn);
-    returnValue = spyStrategy.exec();
-
-    expect(originalFn).not.toHaveBeenCalled();
-    expect(returnValue).toEqual(67);
-  });
-
-  it("allows a return to plan stubbing after another strategy", function() {
-    var originalFn = jasmine.createSpy("original"),
-        fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
-        returnValue;
-
-    spyStrategy.callFake(fakeFn);
-    returnValue = spyStrategy.exec();
-
-    expect(originalFn).not.toHaveBeenCalled();
-    expect(returnValue).toEqual(67);
-    
-    spyStrategy.stub();
-    returnValue = spyStrategy.exec();
-
-    expect(returnValue).toEqual(void 0);
-  });
-
-  it("returns the spy after changing the strategy", function(){
-    var spy = {},
-        spyFn = jasmine.createSpy('spyFn').and.returnValue(spy),
-        spyStrategy = new j$.SpyStrategy({getSpy: spyFn});
-
-    expect(spyStrategy.callThrough()).toBe(spy);
-    expect(spyStrategy.returnValue()).toBe(spy);
-    expect(spyStrategy.throwError()).toBe(spy);
-    expect(spyStrategy.callFake()).toBe(spy);
-    expect(spyStrategy.stub()).toBe(spy);
-  });
-});

spec/core/SuiteSpec.js

@@ -1,182 +1,120 @@
-describe("Suite", function() {
+describe('Suite', function() {
+  var fakeTimer;
+  var env;
 
-  it("keeps its id", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
-        env: env,
-        id: 456,
-        description: "I am a suite"
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+
+    fakeTimer = new jasmine.FakeTimer();
+    env.setTimeout = fakeTimer.setTimeout;
+    env.clearTimeout = fakeTimer.clearTimeout;
+    env.setInterval = fakeTimer.setInterval;
+    env.clearInterval = fakeTimer.clearInterval;
+  });
+
+  describe('Specs', function () {
+    var suite;
+
+    beforeEach(function() {
+      suite = env.describe('Suite 1', function () {
+        env.it('Spec 1', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('Spec 2', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.describe('Suite 2', function () {
+          env.it('Spec 3', function() {
+            this.runs(function () {
+              this.expect(true).toEqual(true);
+            });
+          });
+        });
+        env.it('Spec 4', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
       });
+    });
+    
+    it('#specs should return all immediate children that are specs.', function () {
+      var suiteSpecs = suite.specs();
+      expect(suiteSpecs.length).toEqual(3);
+      expect(suiteSpecs[0].description).toEqual('Spec 1');
+      expect(suiteSpecs[1].description).toEqual('Spec 2');
+      expect(suiteSpecs[2].description).toEqual('Spec 4');
+    });
 
-    expect(suite.id).toEqual(456);
-  });
+    it("#suites should return all immediate children that are suites.", function() {
+      var nestedSuites = suite.suites();
+      expect(nestedSuites.length).toEqual(1);
+      expect(nestedSuites[0].description).toEqual('Suite 2');
+    });
 
-  it("returns its full name", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite"
-      });
-
-    expect(suite.getFullName()).toEqual("I am a suite");
-  });
-
-  it("returns its full name when it has parent suites", function() {
-    var env = new j$.Env(),
-      parentSuite = new j$.Suite({
-        env: env,
-        description: "I am a parent suite",
-        parentSuite: jasmine.createSpy('pretend top level suite')
-      }),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite",
-        parentSuite: parentSuite
-      });
-
-    expect(suite.getFullName()).toEqual("I am a parent suite I am a suite");
-  });
-
-  it("adds before functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite"
-      }),
-      outerBefore = jasmine.createSpy('outerBeforeEach'),
-      innerBefore = jasmine.createSpy('insideBeforeEach');
-
-    suite.beforeEach(outerBefore);
-    suite.beforeEach(innerBefore);
-
-    expect(suite.beforeFns).toEqual([innerBefore, outerBefore]);
-  });
-
-  it("adds after functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
-        env: env,
-        description: "I am a suite"
-      }),
-      outerAfter = jasmine.createSpy('outerAfterEach'),
-      innerAfter = jasmine.createSpy('insideAfterEach');
-
-    suite.afterEach(outerAfter);
-    suite.afterEach(innerAfter);
-
-    expect(suite.afterFns).toEqual([innerAfter, outerAfter]);
-  });
-
-  it("can be disabled", function() {
-    var env = new j$.Env(),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner
-      });
-
-    suite.disable();
-
-    expect(suite.disabled).toBe(true);
-
-    suite.execute();
-
-    expect(fakeQueueRunner).not.toHaveBeenCalled();
-  });
-
-  it("delegates execution of its specs and suites", function() {
-    var env = new j$.Env(),
-      parentSuiteDone = jasmine.createSpy('parent suite done'),
-      fakeQueueRunnerForParent = jasmine.createSpy('fake parent queue runner'),
-      parentSuite = new j$.Suite({
-        env: env,
-        description: "I am a parent suite",
-        queueRunner: fakeQueueRunnerForParent
-      }),
-      fakeQueueRunner = jasmine.createSpy('fake queue runner'),
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    spyOn(suite, "execute");
-
-    parentSuite.addChild(fakeSpec1);
-    parentSuite.addChild(suite);
-
-    parentSuite.execute(parentSuiteDone);
-
-    var parentSuiteFns = fakeQueueRunnerForParent.calls.mostRecent().args[0].fns;
-
-    parentSuiteFns[0]();
-    expect(fakeSpec1.execute).toHaveBeenCalled();
-    parentSuiteFns[1]();
-    expect(suite.execute).toHaveBeenCalled();
-  });
-
-  it("calls a provided onStart callback when starting", function() {
-    var env = new j$.Env(),
-      suiteStarted = jasmine.createSpy('suiteStarted'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        onStart: suiteStarted,
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.execute();
-
-    expect(suiteStarted).toHaveBeenCalledWith(suite);
-  });
-
-  it("calls a provided onComplete callback when done", function() {
-    var env = new j$.Env(),
-      suiteCompleted = jasmine.createSpy('parent suite done'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.execute(suiteCompleted);
-
-    expect(suiteCompleted).toHaveBeenCalled();
-  });
-
-  it("calls a provided result callback when done", function() {
-    var env = new j$.Env(),
-      suiteResultsCallback = jasmine.createSpy('suite result callback'),
-      fakeQueueRunner = function(attrs) { attrs.onComplete(); },
-      suite = new j$.Suite({
-        env: env,
-        description: "with a child suite",
-        queueRunner: fakeQueueRunner,
-        resultCallback: suiteResultsCallback
-      }),
-      fakeSpec1 = {
-        execute: jasmine.createSpy('fakeSpec1')
-      };
-
-    suite.execute();
-
-    expect(suiteResultsCallback).toHaveBeenCalledWith({
-      id: suite.id,
-      status: '',
-      description: "with a child suite",
-      fullName: "with a child suite"
+    it("#children should return all immediate children including suites and specs.", function() {
+      var children = suite.children();
+      expect(children.length).toEqual(4);
+      expect(children[0].description).toEqual('Spec 1');
+      expect(children[1].description).toEqual('Spec 2');
+      expect(children[2].description).toEqual('Suite 2');
+      expect(children[3].description).toEqual('Spec 4');
     });
   });
-});
+
+  describe('SpecCount', function () {
+
+    it('should keep a count of the number of specs that are run', function() {
+      var suite = env.describe('one suite description', function () {
+        env.it('should be a test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be another test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be a third test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+      });
+
+      expect(suite.specs().length).toEqual(3);
+    });
+
+    it('specCount should be correct even with runs/waits blocks', function() {
+      var suite = env.describe('one suite description', function () {
+        env.it('should be a test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be another test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+          this.waits(10);
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be a third test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+      });
+
+      expect(suite.specs().length).toEqual(3);
+    });
+  });
+});

spec/core/TimerSpec.js

@@ -1,13 +0,0 @@
-describe("Timer", function() {
-  it("reports the time elapsed", function() {
-    var fakeNow = jasmine.createSpy('fake Date.now'),
-        timer = new j$.Timer({now: fakeNow});
-
-    fakeNow.and.returnValue(100);
-    timer.start();
-
-    fakeNow.and.returnValue(200);
-
-    expect(timer.elapsed()).toEqual(100);
-  });
-});

spec/core/UtilSpec.js

@@ -1,28 +1,39 @@
-describe("j$.util", function() {
+describe("jasmine.util", function() {
+  describe("extend", function () {
+    it("should add properies to a destination object ", function() {
+      var destination = {baz: 'baz'};
+      jasmine.util.extend(destination, {
+        foo: 'foo', bar: 'bar'
+      });
+      expect(destination).toEqual({foo: 'foo', bar: 'bar', baz: 'baz'});
+    });
+
+    it("should replace properies that already exist on a destination object", function() {
+      var destination = {foo: 'foo'};
+      jasmine.util.extend(destination, {
+        foo: 'bar'
+      });
+      expect(destination).toEqual({foo: 'bar'});
+      jasmine.util.extend(destination, {
+        foo: null
+      });
+      expect(destination).toEqual({foo: null});
+    });
+  });
+
   describe("isArray_", function() {
     it("should return true if the argument is an array", function() {
-      expect(j$.isArray_([])).toBe(true);
-      expect(j$.isArray_(['a'])).toBe(true);
+      expect(jasmine.isArray_([])).toBe(true);
+      expect(jasmine.isArray_(['a'])).toBe(true);
     });
 
     it("should return false if the argument is not an array", function() {
-      expect(j$.isArray_(undefined)).toBe(false);
-      expect(j$.isArray_({})).toBe(false);
-      expect(j$.isArray_(function() {})).toBe(false);
-      expect(j$.isArray_('foo')).toBe(false);
-      expect(j$.isArray_(5)).toBe(false);
-      expect(j$.isArray_(null)).toBe(false);
-    });
-  });
-
-  describe("isUndefined", function() {
-    it("reports if a variable is defined", function() {
-      var a;
-      expect(j$.util.isUndefined(a)).toBe(true);
-      expect(j$.util.isUndefined(undefined)).toBe(true);
-
-      var undefined = "diz be undefined yo";
-      expect(j$.util.isUndefined(undefined)).toBe(false);
+      expect(jasmine.isArray_(undefined)).toBe(false);
+      expect(jasmine.isArray_({})).toBe(false);
+      expect(jasmine.isArray_(function() {})).toBe(false);
+      expect(jasmine.isArray_('foo')).toBe(false);
+      expect(jasmine.isArray_(5)).toBe(false);
+      expect(jasmine.isArray_(null)).toBe(false);
     });
   });
 });

spec/core/WaitsForBlockSpec.js

@@ -0,0 +1,118 @@
+describe('WaitsForBlock', function () {
+  var env, suite, timeout, spec, message, onComplete, fakeTimer;
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+    suite = new jasmine.Suite(env, 'suite 1');
+    timeout = 1000;
+    spec = new jasmine.Spec(env, suite);
+    message = "some error message";
+    onComplete = jasmine.createSpy("onComplete");
+  });
+
+  describe("jasmine.VERBOSE", function() {
+    var jasmineVerboseOriginal;
+    beforeEach(function() {
+      jasmineVerboseOriginal = jasmine.VERBOSE;
+      spyOn(env.reporter, 'log');
+
+    });
+    it('do not show information if jasmine.VERBOSE is set to false', function () {
+        jasmine.VERBOSE = false;
+        var latchFunction = function() {
+          return true;
+        };
+        var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+        expect(env.reporter.log).not.toHaveBeenCalled();
+        block.execute(onComplete);
+        expect(env.reporter.log).not.toHaveBeenCalled();
+        jasmine.VERBOSE = jasmineVerboseOriginal;
+      });
+    it('show information if jasmine.VERBOSE is set to true', function () {
+        jasmine.VERBOSE = true;
+        var latchFunction = function() {
+          return true;
+        };
+        var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+        expect(env.reporter.log).not.toHaveBeenCalled();
+        block.execute(onComplete);
+        expect(env.reporter.log).toHaveBeenCalled();
+        jasmine.VERBOSE = jasmineVerboseOriginal;
+      });
+  });
+
+  it('onComplete should be called if the latchFunction returns true', function () {
+    var latchFunction = function() {
+      return true;
+    };
+    var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+    expect(onComplete).not.toHaveBeenCalled();
+    block.execute(onComplete);
+    expect(onComplete).toHaveBeenCalled();
+  });
+
+  it('latchFunction should run in same scope as spec', function () {
+    var result;
+    var latchFunction = function() {
+      result = this.scopedValue;
+    };
+    spec.scopedValue = 'foo';
+    var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+    block.execute(onComplete);
+    expect(result).toEqual('foo');
+  });
+
+  it('should fail spec and call onComplete if there is an error in the latchFunction', function() {
+    var latchFunction = jasmine.createSpy('latchFunction').andThrow('some error');
+    spyOn(spec, 'fail');
+    var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+    block.execute(onComplete);
+    expect(spec.fail).toHaveBeenCalledWith('some error');
+    expect(onComplete).toHaveBeenCalled();
+  });
+
+  describe("if latchFunction returns false", function() {
+    var latchFunction, fakeTimer;
+    beforeEach(function() {
+      latchFunction = jasmine.createSpy('latchFunction').andReturn(false);
+      fakeTimer = new jasmine.FakeTimer();
+      env.setTimeout = fakeTimer.setTimeout;
+      env.clearTimeout = fakeTimer.clearTimeout;
+      env.setInterval = fakeTimer.setInterval;
+      env.clearInterval = fakeTimer.clearInterval;
+    });
+
+    it('latchFunction should be retried after 10 ms', function () {
+      var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+      expect(latchFunction).not.toHaveBeenCalled();
+      block.execute(onComplete);
+      expect(latchFunction.callCount).toEqual(1);
+      fakeTimer.tick(5);
+      expect(latchFunction.callCount).toEqual(1);
+      fakeTimer.tick(5);
+      expect(latchFunction.callCount).toEqual(2);
+    });
+
+    it('onComplete should be called if latchFunction returns true before timeout', function () {
+      var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+      expect(onComplete).not.toHaveBeenCalled();
+      block.execute(onComplete);
+      expect(onComplete).not.toHaveBeenCalled();
+      latchFunction.andReturn(true);
+      fakeTimer.tick(100);
+      expect(onComplete).toHaveBeenCalled();
+    });
+
+    it('spec should fail with the passed message if the timeout is reached (and not call onComplete)', function () {
+      spyOn(spec, 'fail');
+      var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
+      block.execute(onComplete);
+      expect(spec.fail).not.toHaveBeenCalled();
+      fakeTimer.tick(timeout);
+      expect(spec.fail).toHaveBeenCalled();
+      var failMessage = spec.fail.mostRecentCall.args[0].message;
+      expect(failMessage).toMatch(message);
+      expect(onComplete).toHaveBeenCalled();
+    });
+  });
+});

spec/core/integration/CustomMatchersSpec.js

@@ -1,149 +0,0 @@
-describe("Custom Matchers (Integration)", function() {
-  var env;
-  var fakeTimer;
-
-  beforeEach(function() {
-    env = new j$.Env();
-  });
-
-  it("allows adding more matchers local to a spec", function(done) {
-    env.it('spec defining a custom matcher', function() {
-      env.addMatchers({
-        matcherForSpec: function() {
-          return {
-            compare: function(actual, expected) {
-              return { pass: false, message: "matcherForSpec: actual: " + actual + "; expected: " + expected };
-            }
-          }
-        }
-      });
-
-      env.expect("zzz").matcherForSpec("yyy");
-    });
-
-    env.it("spec without custom matcher defined", function() {
-      expect(env.expect("zzz").matcherForSpec).toBeUndefined();
-    });
-
-    var specDoneSpy = jasmine.createSpy("specDoneSpy");
-    var expectations = function() {
-      var firstSpecResult = specDoneSpy.calls.first().args[0];
-      expect(firstSpecResult.status).toEqual("failed");
-      expect(firstSpecResult.failedExpectations[0].message).toEqual("matcherForSpec: actual: zzz; expected: yyy");
-      done();
-    };
-    env.addReporter({ specDone:specDoneSpy, jasmineDone: expectations});
-
-    env.execute();
-  });
-
-  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.expect(true).toBeReal();
-    });
-
-    var specExpectations = function(result) {
-      expect(result.status).toEqual('passed');
-    };
-
-    env.addReporter({ specDone: specExpectations, jasmineDone: done });
-    env.execute();
-  });
-
-  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.expect(true).not.toBeReal();
-    });
-
-    var specExpectations = function(result) {
-      expect(result.status).toEqual('passed');
-    }
-
-    env.addReporter({ specDone: specExpectations, jasmineDone: done });
-    env.execute();
-  });
-
-  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.expect("a").toBeReal();
-    });
-
-    var specExpectations = function(result) {
-      expect(result.failedExpectations[0].message).toEqual("Expected 'a' to be real.");
-    };
-
-    env.addReporter({ specDone: specExpectations, jasmineDone: done });
-    env.execute();
-  });
-
-  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.expect(true).toBeReal();
-      env.expect(true).toBeReal("arg");
-      env.expect(true).toBeReal("arg1", "arg2");
-    });
-
-    var specExpectations = function() {
-      expect(argumentSpy).toHaveBeenCalledWith(true);
-      expect(argumentSpy).toHaveBeenCalledWith(true, "arg");
-      expect(argumentSpy).toHaveBeenCalledWith(true, "arg1", "arg2");
-    };
-
-    env.addReporter({ specDone: specExpectations, jasmineDone: done });
-    env.execute();
-  });
-
-  it("passes the jasmine utility and current equality matchers to the expectation factory", function(done) {
-    var matcherFactory = function() { return { compare: function() { return {pass: true}; }}; },
-        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.expect(true).toBeReal();
-    });
-
-    var specExpectations = function() {
-      expect(argumentSpy).toHaveBeenCalledWith(j$.matchersUtil, [customEqualityFn]);
-    };
-
-    env.addReporter({ specDone: specExpectations, jasmineDone: done });
-    env.execute();
-  });
-});

spec/core/integration/EnvSpec.js

@@ -1,488 +0,0 @@
-describe("Env integration", function() {
-
-  it("Suites execute as expected (no nesting)", function(done) {
-    var env = new j$.Env(),
-        calls = [];
-
-    var assertions = function() {
-      expect(calls).toEqual([
-        "with a spec",
-        "and another spec"
-      ]);
-
-      done();
-    };
-
-    env.addReporter({ jasmineDone: assertions});
-
-    env.describe("A Suite", function() {
-      env.it("with a spec", function() {
-        calls.push("with a spec");
-      });
-      env.it("and another spec", function() {
-        calls.push("and another spec");
-      });
-    });
-
-    env.execute();
-  });
-
-  it("Nested Suites execute as expected", function(done) {
-    var env = new j$.Env(),
-        calls = [];
-
-    var assertions = function() {
-      expect(calls).toEqual([
-        'an outer spec',
-        'an inner spec',
-        'another inner spec'
-      ]);
-
-      done();
-    };
-
-    env.addReporter({ jasmineDone: assertions });
-
-    env.describe("Outer suite", function() {
-      env.it("an outer spec", function() {
-        calls.push('an outer spec')
-      });
-      env.describe("Inner suite", function() {
-        env.it("an inner spec", function() {
-          calls.push('an inner spec');
-        });
-        env.it("another inner spec", function() {
-          calls.push('another inner spec');
-        });
-      });
-    });
-
-    env.execute();
-  });
-
-  it("Multiple top-level Suites execute as expected", function(done) {
-    var env = new j$.Env(),
-        calls = [];
-
-    var assertions = function() {
-      expect(calls).toEqual([
-        'an outer spec',
-        'an inner spec',
-        'another inner spec',
-        'a 2nd outer spec'
-      ]);
-
-      done();
-    };
-
-    env.addReporter({ jasmineDone: assertions });
-
-
-    env.describe("Outer suite", function() {
-      env.it("an outer spec", function() {
-        calls.push('an outer spec')
-      });
-      env.describe("Inner suite", function() {
-        env.it("an inner spec", function() {
-          calls.push('an inner spec');
-        });
-        env.it("another inner spec", function() {
-          calls.push('another inner spec');
-        });
-      });
-    });
-
-    env.describe("Another outer suite", function() {
-      env.it("a 2nd outer spec", function() {
-        calls.push('a 2nd outer spec')
-      });
-    });
-
-    env.execute();
-  });
-
-  it("calls associated befores/specs/afters with the same 'this'", function(done) {
-    var env = new j$.Env();
-
-    env.addReporter({jasmineDone: done});
-
-    env.describe("tests", function() {
-      var firstTimeThrough = true, firstSpecContext, secondSpecContext;
-
-      env.beforeEach(function() {
-        if (firstTimeThrough) {
-          firstSpecContext = this;
-        } else {
-          secondSpecContext = this;
-        }
-        expect(this).toEqual({});
-      });
-
-      env.it("sync spec", function() {
-        expect(this).toBe(firstSpecContext);
-      });
-
-      env.it("another sync spec", function() {
-        expect(this).toBe(secondSpecContext);
-      });
-
-      env.afterEach(function() {
-        if (firstTimeThrough) {
-          expect(this).toBe(firstSpecContext);
-          firstTimeThrough = false;
-        } else {
-          expect(this).toBe(secondSpecContext);
-        }
-      });
-    });
-
-    env.execute();
-  });
-
-  it("calls associated befores/its/afters with the same 'this' for an async spec", function(done) {
-    var env = new j$.Env();
-
-    env.addReporter({jasmineDone: done});
-
-    env.describe("with an async spec", function() {
-      var specContext;
-
-      env.beforeEach(function() {
-        specContext = this;
-        expect(this).toEqual({});
-      });
-
-      env.it("sync spec", function(underTestCallback) {
-        expect(this).toBe(specContext);
-        underTestCallback();
-      });
-
-      env.afterEach(function() {
-        expect(this).toBe(specContext);
-      });
-    });
-
-    env.execute();
-  });
-
-  it("Allows specifying which specs and suites to run", function(done) {
-    var env = new j$.Env(),
-        calls = [],
-        suiteCallback = jasmine.createSpy('suite callback'),
-        firstSpec,
-        secondSuite;
-
-    var assertions = function() {
-      expect(calls).toEqual([
-        'third spec',
-        'first spec'
-      ]);
-      expect(suiteCallback).toHaveBeenCalled();
-      done();
-    };
-
-    env.addReporter({jasmineDone: assertions, suiteDone: suiteCallback});
-
-    env.describe("first suite", function() {
-      firstSpec = env.it("first spec", function() {
-        calls.push('first spec');
-      });
-      env.it("second spec", function() {
-        calls.push('second spec');
-      });
-    });
-
-    secondSuite = env.describe("second suite", function() {
-      env.it("third spec", function() {
-        calls.push('third spec');
-      });
-    });
-
-    env.execute([secondSuite.id, firstSpec.id]);
-  });
-
-  it("Functions can be spied on and have their calls tracked", function () {
-      var env = new j$.Env();
-
-      var originalFunctionWasCalled = false;
-      var subject = { spiedFunc: function() { originalFunctionWasCalled = true; } };
-
-      var spy = env.spyOn(subject, 'spiedFunc');
-
-      expect(subject.spiedFunc).toEqual(spy);
-
-      expect(subject.spiedFunc.calls.any()).toEqual(false);
-      expect(subject.spiedFunc.calls.count()).toEqual(0);
-
-      subject.spiedFunc('foo');
-
-      expect(subject.spiedFunc.calls.any()).toEqual(true);
-      expect(subject.spiedFunc.calls.count()).toEqual(1);
-      expect(subject.spiedFunc.calls.mostRecent().args).toEqual(['foo']);
-      expect(subject.spiedFunc.calls.mostRecent().object).toEqual(subject);
-      expect(originalFunctionWasCalled).toEqual(false);
-
-      subject.spiedFunc('bar');
-      expect(subject.spiedFunc.calls.count()).toEqual(2);
-      expect(subject.spiedFunc.calls.mostRecent().args).toEqual(['bar']);
-  });
-
-  it("Mock clock can be installed and used in tests", function(done) {
-    var globalSetTimeout = jasmine.createSpy('globalSetTimeout'),
-        delayedFunctionForGlobalClock = jasmine.createSpy('delayedFunctionForGlobalClock'),
-        delayedFunctionForMockClock = jasmine.createSpy('delayedFunctionForMockClock'),
-        env = new j$.Env({global: { setTimeout: globalSetTimeout }});
-
-    var assertions = function() {
-      expect(delayedFunctionForMockClock).toHaveBeenCalled();
-      expect(globalSetTimeout).toHaveBeenCalledWith(delayedFunctionForGlobalClock, 100);
-
-      done();
-    };
-
-    env.addReporter({ jasmineDone: assertions });
-
-    env.describe("tests", function() {
-      env.it("test with mock clock", function() {
-        env.clock.install();
-        env.clock.setTimeout(delayedFunctionForMockClock, 100);
-        env.clock.tick(100);
-        env.clock.uninstall();
-      });
-      env.it("test without mock clock", function() {
-        env.clock.setTimeout(delayedFunctionForGlobalClock, 100);
-      });
-    });
-
-    expect(globalSetTimeout).not.toHaveBeenCalled();
-    expect(delayedFunctionForMockClock).not.toHaveBeenCalled();
-
-    env.execute();
-  });
-
-  it("should run async specs in order, waiting for them to complete", function(done) {
-    var env = new j$.Env(), mutatedVar;
-
-    env.describe("tests", function() {
-      env.beforeEach(function() {
-        mutatedVar = 2;
-      });
-
-      env.it("async spec", function(underTestCallback) {
-        setTimeout(function() {
-          expect(mutatedVar).toEqual(2);
-          underTestCallback();
-          done();
-        }, 0);
-      });
-
-      env.it("after async spec", function() {
-        mutatedVar = 3;
-      });
-    });
-
-    env.execute();
-  });
-
-  describe("with a mock clock", function() {
-    var originalTimeout;
-
-    beforeEach(function() {
-      originalTimeout = j$.DEFAULT_TIMEOUT_INTERVAL;
-      jasmine.getEnv().clock.install();
-    });
-
-    afterEach(function() {
-      jasmine.getEnv().clock.uninstall();
-      j$.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
-    });
-
-    it("should wait a specified interval before failing specs haven't called done yet", function(done) {
-      var env = new j$.Env(),
-          reporter = jasmine.createSpyObj('fakeReporter', [ "specDone" ]);
-
-      reporter.specDone.and.callFake(function() {
-        expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({status: 'failed'}));
-        done();
-      });
-
-      env.addReporter(reporter);
-      j$.DEFAULT_TIMEOUT_INTERVAL = 8414;
-
-      env.it("async spec that doesn't call done", function(underTestCallback) {
-        env.expect(true).toBeTruthy();
-        jasmine.getEnv().clock.tick(8415);
-      });
-
-      env.execute();
-    });
-  });
-
-  // TODO: something is wrong with this spec
-  it("should report as expected", function(done) {
-    var env = new j$.Env(),
-        reporter = jasmine.createSpyObj('fakeReporter', [
-          "jasmineStarted",
-          "jasmineDone",
-          "suiteStarted",
-          "suiteDone",
-          "specStarted",
-          "specDone"
-        ]);
-
-    reporter.jasmineDone.and.callFake(function() {
-      expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-        totalSpecsDefined: 3
-      });
-      var suiteResult = reporter.suiteStarted.calls.first().args[0];
-      expect(suiteResult.description).toEqual("A Suite");
-
-      done();
-    });
-
-    env.addReporter(reporter);
-
-    env.describe("A Suite", function() {
-      env.it("with a top level spec", function() {
-        env.expect(true).toBe(true);
-      });
-      env.describe("with a nested suite", function() {
-        env.xit("with a pending spec", function() {
-          env.expect(true).toBe(true);
-        });
-        env.it("with a spec", function() {
-          env.expect(true).toBe(false);
-        });
-      });
-    });
-
-    env.execute();
-  });
-
-  it("should be possible to get full name from a spec", function() {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
-        topLevelSpec, nestedSpec, doublyNestedSpec;
-
-    env.describe("my tests", function() {
-      topLevelSpec = env.it("are sometimes top level", function() {
-      });
-      env.describe("are sometimes", function() {
-        nestedSpec = env.it("singly nested", function() {
-        });
-        env.describe("even", function() {
-          doublyNestedSpec = env.it("doubly nested", function() {
-          });
-        });
-      });
-    });
-
-    expect(topLevelSpec.getFullName()).toBe("my tests are sometimes top level");
-    expect(nestedSpec.getFullName()).toBe("my tests are sometimes singly nested");
-    expect(doublyNestedSpec.getFullName()).toBe("my tests are sometimes even doubly nested");
-  });
-
-  it("Custom equality testers should be per spec", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
-        reporter = jasmine.createSpyObj('fakeReporter', [
-          "jasmineStarted",
-          "jasmineDone",
-          "suiteStarted",
-          "suiteDone",
-          "specStarted",
-          "specDone"
-        ]);
-
-    reporter.jasmineDone.and.callFake(function() {
-      var firstSpecResult = reporter.specDone.calls.first().args[0],
-          secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
-
-      expect(firstSpecResult.status).toEqual("passed");
-      expect(secondSpecResult.status).toEqual("failed");
-
-      done();
-    });
-
-    env.addReporter(reporter);
-
-    env.describe("testing custom equality testers", function() {
-      env.it("with a custom tester", function() {
-        env.addCustomEqualityTester(function(a, b) { return true; });
-        env.expect("a").toEqual("b");
-      });
-
-      env.it("without a custom tester", function() {
-        env.expect("a").toEqual("b");
-      });
-    });
-
-    env.execute();
-  });
-
-  it("Custom matchers should be per spec", function() {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
-        matchers = {
-          toFoo: function() {}
-        },
-        reporter = jasmine.createSpyObj('fakeReporter', [
-          "jasmineStarted",
-          "jasmineDone",
-          "suiteStarted",
-          "suiteDone",
-          "specStarted",
-          "specDone"
-        ]);
-
-    env.addReporter(reporter);
-
-    env.describe("testing custom matchers", function() {
-      env.it("with a custom matcher", function() {
-        env.addMatchers(matchers);
-        expect(env.expect().toFoo).toBeDefined();
-      });
-
-      env.it("without a custom matcher", function() {
-        expect(env.expect().toFoo).toBeUndefined();
-      });
-    });
-
-    env.execute();
-  });
-
-  it("Custom equality testers for toContain should be per spec", function(done) {
-    var env = new j$.Env({global: { setTimeout: setTimeout }}),
-        reporter = jasmine.createSpyObj('fakeReporter', [
-          "jasmineStarted",
-          "jasmineDone",
-          "suiteStarted",
-          "suiteDone",
-          "specStarted",
-          "specDone"
-        ]);
-
-    reporter.jasmineDone.and.callFake(function() {
-      var firstSpecResult = reporter.specDone.calls.first().args[0],
-          secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
-
-      expect(firstSpecResult.status).toEqual("passed");
-      expect(secondSpecResult.status).toEqual("failed");
-
-      done();
-    });
-
-    env.addReporter(reporter);
-
-    env.describe("testing custom equality testers", function() {
-      env.it("with a custom tester", function() {
-        env.addCustomEqualityTester(function(a, b) { return true; });
-        env.expect(["a"]).toContain("b");
-      });
-
-      env.it("without a custom tester", function() {
-        env.expect("a").toContain("b");
-      });
-    });
-
-    env.execute();
-  });
-});
-

spec/core/integration/SpecRunningSpec.js

@@ -1,306 +0,0 @@
-describe("jasmine spec running", function () {
-  var env;
-  var fakeTimer;
-
-  beforeEach(function() {
-    env = new j$.Env();
-  });
-
-  it('should assign spec ids sequentially', function() {
-    var it0, it1, it2, it3, it4;
-    env.describe('test suite', function() {
-      it0 = env.it('spec 0', function() {
-      });
-      it1 = env.it('spec 1', function() {
-      });
-      it2 = env.xit('spec 2', function() {
-      });
-      it3 = env.it('spec 3', function() {
-      });
-    });
-    env.describe('test suite 2', function() {
-      it4 = env.it('spec 4', function() {
-      });
-    });
-
-    expect(it0.id).toEqual('spec0');
-    expect(it1.id).toEqual('spec1');
-    expect(it2.id).toEqual('spec2');
-    expect(it3.id).toEqual('spec3');
-    expect(it4.id).toEqual('spec4');
-  });
-
-  it('nested suites', function (done) {
-
-    var foo = 0;
-    var bar = 0;
-    var baz = 0;
-    var quux = 0;
-    var nested = env.describe('suite', function () {
-      env.describe('nested', function () {
-        env.it('should run nested suites', function () {
-          foo++;
-        });
-        env.it('should run nested suites', function () {
-          bar++;
-        });
-      });
-
-      env.describe('nested 2', function () {
-        env.it('should run suites following nested suites', function () {
-          baz++;
-        });
-      });
-
-      env.it('should run tests following nested suites', function () {
-        quux++;
-      });
-    });
-
-    expect(foo).toEqual(0);
-    expect(bar).toEqual(0);
-    expect(baz).toEqual(0);
-    expect(quux).toEqual(0);
-    nested.execute(function() {
-      expect(foo).toEqual(1);
-      expect(bar).toEqual(1);
-      expect(baz).toEqual(1);
-      expect(quux).toEqual(1);
-      done();
-    });
-  });
-
-  it("should permit nested describes", function(done) {
-    var actions = [];
-
-    env.beforeEach(function () {
-      actions.push('topSuite beforeEach');
-    });
-
-    env.afterEach(function () {
-      actions.push('topSuite afterEach');
-    });
-
-    env.describe('Something', function() {
-      env.beforeEach(function() {
-        actions.push('outer beforeEach');
-      });
-
-      env.afterEach(function() {
-        actions.push('outer afterEach');
-      });
-
-      env.it('does it 1', function() {
-        actions.push('outer it 1');
-      });
-
-      env.describe('Inner 1', function() {
-        env.beforeEach(function() {
-          actions.push('inner 1 beforeEach');
-        });
-
-        env.afterEach(function() {
-          actions.push('inner 1 afterEach');
-        });
-
-        env.it('does it 2', function() {
-          actions.push('inner 1 it');
-        });
-      });
-
-      env.it('does it 3', function() {
-        actions.push('outer it 2');
-      });
-
-      env.describe('Inner 2', function() {
-        env.beforeEach(function() {
-          actions.push('inner 2 beforeEach');
-        });
-
-        env.afterEach(function() {
-          actions.push('inner 2 afterEach');
-        });
-
-        env.it('does it 2', function() {
-          actions.push('inner 2 it');
-        });
-      });
-    });
-
-    var assertions = function() {
-      var expected = [
-        "topSuite beforeEach",
-        "outer beforeEach",
-        "outer it 1",
-        "outer afterEach",
-        "topSuite afterEach",
-
-        "topSuite beforeEach",
-        "outer beforeEach",
-        "inner 1 beforeEach",
-        "inner 1 it",
-        "inner 1 afterEach",
-        "outer afterEach",
-        "topSuite afterEach",
-
-        "topSuite beforeEach",
-        "outer beforeEach",
-        "outer it 2",
-        "outer afterEach",
-        "topSuite afterEach",
-
-        "topSuite beforeEach",
-        "outer beforeEach",
-        "inner 2 beforeEach",
-        "inner 2 it",
-        "inner 2 afterEach",
-        "outer afterEach",
-        "topSuite afterEach"
-      ];
-      expect(actions).toEqual(expected);
-      done();
-    }
-
-    env.addReporter({jasmineDone: assertions});
-
-    env.execute();
-  });
-
-  it("should run multiple befores and afters in the order they are declared", function(done) {
-    var actions = [];
-
-    env.beforeEach(function () {
-      actions.push('runner beforeEach1');
-    });
-
-    env.afterEach(function () {
-      actions.push('runner afterEach1');
-    });
-
-    env.beforeEach(function () {
-      actions.push('runner beforeEach2');
-    });
-
-    env.afterEach(function () {
-      actions.push('runner afterEach2');
-    });
-
-    env.describe('Something', function() {
-      env.beforeEach(function() {
-        actions.push('beforeEach1');
-      });
-
-      env.afterEach(function() {
-        actions.push('afterEach1');
-      });
-
-      env.beforeEach(function() {
-        actions.push('beforeEach2');
-      });
-
-      env.afterEach(function() {
-        actions.push('afterEach2');
-      });
-
-      env.it('does it 1', function() {
-        actions.push('outer it 1');
-      });
-    });
-
-    var assertions = function() {
-      var expected = [
-        "runner beforeEach1",
-        "runner beforeEach2",
-        "beforeEach1",
-        "beforeEach2",
-        "outer it 1",
-        "afterEach2",
-        "afterEach1",
-        "runner afterEach2",
-        "runner afterEach1"
-      ];
-      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() {
-      env.xdescribe('with a disabled suite', function(){
-        env.it('spec inside a disabled suite', specInADisabledSuite);
-      });
-    });
-
-    suite.execute(function() {
-      expect(specInADisabledSuite).not.toHaveBeenCalled();
-      done();
-    });
-  });
-
-  it("should set all pending specs to pending when a suite is run", function(done) {
-    var pendingSpec,
-      suite = env.describe('default current suite', function() {
-        pendingSpec = env.it("I am a pending spec");
-      });
-
-    suite.execute(function() {
-      expect(pendingSpec.status()).toBe("pending");
-      done();
-    });
-  });
-
-
-  // TODO: is this useful? It doesn't catch syntax errors
-  xit("should recover gracefully when there are errors in describe functions", function() {
-    var specs = [];
-    var superSimpleReporter = new j$.Reporter();
-    superSimpleReporter.reportSpecResults = function(result) {
-      specs.push("Spec: " + result.fullName);
-    };
-
-    try {
-      env.describe("outer1", function() {
-        env.describe("inner1", function() {
-          env.it("should thingy", function() {
-            this.expect(true).toEqual(true);
-          });
-
-          throw new Error("fake error");
-        });
-
-        env.describe("inner2", function() {
-          env.it("should other thingy", function() {
-            this.expect(true).toEqual(true);
-          });
-        });
-
-        throw new Error("fake error");
-
-      });
-    } catch(e) {
-    }
-
-    env.describe("outer2", function() {
-      env.it("should xxx", function() {
-        this.expect(true).toEqual(true);
-      });
-    });
-
-    env.addReporter(superSimpleReporter);
-    env.execute();
-
-    expect(specs.join('')).toMatch(new RegExp(
-      'Spec: outer1 inner1 should thingy.' +
-      'Spec: outer1 inner1 encountered a declaration exception.' +
-      'Spec: outer1 inner2 should other thingy.' +
-      'Spec: outer1 encountered a declaration exception.' +
-      'Spec: outer2 should xxx.'
-    ));
-
-  });
-});

spec/core/matchers/matchersUtilSpec.js

@@ -1,231 +0,0 @@
-describe("matchersUtil", function() {
-  describe("equals", function() {
-    it("passes for literals that are triple-equal", function() {
-      expect(j$.matchersUtil.equals(null, null)).toBe(true);
-      expect(j$.matchersUtil.equals(void 0, void 0)).toBe(true);
-    });
-
-    it("fails for things that are not equivalent", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, 1)).toBe(false);
-    });
-
-    it("passes for Strings that are equivalent", function() {
-      expect(j$.matchersUtil.equals("foo", "foo")).toBe(true);
-    });
-
-    it("fails for Strings that are not equivalent", function() {
-      expect(j$.matchersUtil.equals("foo", "bar")).toBe(false);
-    });
-
-    it("passes for Numbers that are equivalent", function() {
-      expect(j$.matchersUtil.equals(123, 123)).toBe(true);
-    });
-
-    it("fails for Numbers that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(123, 456)).toBe(false);
-    });
-
-    it("passes for Dates that are equivalent", function() {
-      expect(j$.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Jan 1, 1970"))).toBe(true);
-    });
-
-    it("fails for Dates that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(new Date("Jan 1, 1970"), new Date("Feb 3, 1991"))).toBe(false);
-    });
-
-    it("passes for Booleans that are equivalent", function() {
-      expect(j$.matchersUtil.equals(true, true)).toBe(true);
-    });
-
-    it("fails for Booleans that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(true, false)).toBe(false);
-    });
-
-    it("passes for RegExps that are equivalent", function() {
-      expect(j$.matchersUtil.equals(/foo/, /foo/)).toBe(true);
-    });
-
-    it("fails for RegExps that are not equivalent", function() {
-      expect(j$.matchersUtil.equals(/foo/, /bar/)).toBe(false);
-      expect(j$.matchersUtil.equals(new RegExp("foo", "i"), new RegExp("foo"))).toBe(false);
-    });
-
-    it("passes for Arrays that are equivalent", function() {
-      expect(j$.matchersUtil.equals([1, 2], [1, 2])).toBe(true);
-    });
-
-    it("fails for Arrays that are not equivalent", function() {
-      expect(j$.matchersUtil.equals([1, 2], [1, 2, 3])).toBe(false);
-    });
-
-    it("passes for Errors that are the same type and have the same message", function() {
-      expect(j$.matchersUtil.equals(new Error("foo"), new Error("foo"))).toBe(true);
-    });
-
-    it("fails for Errors that are the same type and have different messages", function() {
-      expect(j$.matchersUtil.equals(new Error("foo"), new Error("bar"))).toBe(false);
-    });
-
-    it("passes for Objects that are equivalent (simple case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, {a: "foo"})).toBe(true);
-    });
-
-    it("fails for Objects that are not equivalent (simple case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo"}, {a: "bar"})).toBe(false);
-    });
-
-    it("passes for Objects that are equivalent (deep case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo", b: { c: "bar"}}, {a: "foo", b: { c: "bar"}})).toBe(true);
-    });
-
-    it("fails for Objects that are not equivalent (deep case)", function() {
-      expect(j$.matchersUtil.equals({a: "foo", b: { c: "baz"}}, {a: "foo", b: { c: "bar"}})).toBe(false);
-    });
-
-    it("passes for Objects that are equivalent (with cycles)", function() {
-      var actual = { a: "foo" },
-        expected = { a: "foo" };
-
-      actual.b = actual;
-      expected.b = actual;
-
-      expect(j$.matchersUtil.equals(actual, expected)).toBe(true);
-    });
-
-    it("fails for Objects that are not equivalent (with cycles)", function() {
-      var actual = { a: "foo" },
-        expected = { a: "bar" };
-
-      actual.b = actual;
-      expected.b = actual;
-
-      expect(j$.matchersUtil.equals(actual, expected)).toBe(false);
-    });
-
-    it("fails when comparing an empty object to an empty array (issue #114)", function() {
-      var emptyObject = {},
-        emptyArray = [];
-
-      expect(j$.matchersUtil.equals(emptyObject, emptyArray)).toBe(false);
-      expect(j$.matchersUtil.equals(emptyArray, emptyObject)).toBe(false);
-    });
-
-    it("passes for equivalent frozen objects (GitHub issue #266)", function() {
-      if (jasmine.getEnv().ieVersion < 9) { return; }
-
-      var a = { foo: 1 },
-        b = {foo: 1 };
-
-      Object.freeze(a);
-      Object.freeze(b);
-
-      expect(j$.matchersUtil.equals(a,b)).toBe(true);
-    });
-
-    it("passes when Any is used", function() {
-      var number = 3,
-        anyNumber = new j$.Any(Number);
-
-      expect(j$.matchersUtil.equals(number, anyNumber)).toBe(true);
-      expect(j$.matchersUtil.equals(anyNumber, number)).toBe(true);
-    });
-
-    it("fails when Any is compared to something unexpected", function() {
-      var number = 3,
-        anyString = new j$.Any(String);
-
-      expect(j$.matchersUtil.equals(number, anyString)).toBe(false);
-      expect(j$.matchersUtil.equals(anyString, number)).toBe(false);
-    });
-
-    it("passes when ObjectContaining is used", function() {
-      var obj = {
-        foo: 3,
-        bar: 7
-      };
-
-      expect(j$.matchersUtil.equals(obj, new j$.ObjectContaining({foo: 3}))).toBe(true);
-    });
-
-    it("passes when a custom equality matcher returns true", function() {
-      var tester = function(a, b) { return true; };
-
-      expect(j$.matchersUtil.equals(1, 2, [tester])).toBe(true);
-    });
-
-    it("passes for two empty Objects", function () {
-      expect(j$.matchersUtil.equals({}, {})).toBe(true);
-    });
-
-    describe("when a custom equality matcher is installed that returns 'undefined'", function () {
-      var tester = function(a, b) { return jasmine.undefined; };
-
-      it("passes for two empty Objects", function () {
-        expect(j$.matchersUtil.equals({}, {}, [tester])).toBe(true);
-      });
-    });
-
-    it("fails for equivalents when a custom equality matcher returns false", function() {
-      var tester = function(a, b) { return false; };
-
-      expect(j$.matchersUtil.equals(1, 1, [tester])).toBe(false);
-    });
-  });
-
-  describe("contains", function() {
-    it("passes when expected is a substring of actual", function() {
-      expect(j$.matchersUtil.contains("ABC", "B")).toBe(true);
-    });
-
-    it("fails when expected is a not substring of actual", function() {
-      expect(j$.matchersUtil.contains("ABC", "X")).toBe(false);
-    });
-
-    it("passes when expected is an element in an actual array", function() {
-      expect(j$.matchersUtil.contains(['foo', 'bar'], 'foo')).toBe(true);
-    });
-
-    it("fails when expected is not an element in an actual array", function() {
-      expect(j$.matchersUtil.contains(['foo', 'bar'], 'baz')).toBe(false);
-    });
-
-    it("passes with mixed-element arrays", function() {
-      expect(j$.matchersUtil.contains(["foo", {some: "bar"}], "foo")).toBe(true);
-      expect(j$.matchersUtil.contains(["foo", {some: "bar"}], {some: "bar"})).toBe(true);
-    });
-
-    it("uses custom equality testers if passed in and actual is an Array", function() {
-      var customTester = function(a, b) {return true;};
-
-      expect(j$.matchersUtil.contains([1, 2], 2, [customTester])).toBe(true);
-    });
-  });
-
-  describe("buildMessage", function() {
-
-    it("builds an English sentence for a failure case", function() {
-      var actual = "foo",
-        name = "toBar",
-        message = j$.matchersUtil.buildFailureMessage(name, false, actual);
-
-      expect(message).toEqual("Expected 'foo' to bar.");
-    });
-
-    it("builds an English sentence for a 'not' failure case", function() {
-      var actual = "foo",
-        name = "toBar",
-        isNot = true,
-        message = message = j$.matchersUtil.buildFailureMessage(name, isNot, actual);
-
-      expect(message).toEqual("Expected 'foo' not to bar.");
-    });
-
-    it("builds an English sentence for an arbitrary array of expected arguments", function() {
-      var actual = "foo",
-        name = "toBar",
-        message = j$.matchersUtil.buildFailureMessage(name, false, actual, "quux", "corge");
-
-      expect(message).toEqual("Expected 'foo' to bar 'quux', 'corge'.");
-    });
-  });
-});

spec/core/matchers/toBeCloseToSpec.js

@@ -1,51 +0,0 @@
-describe("toBeCloseTo", function() {
-  it("passes when within two decimal places by default", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
-      result;
-
-    result = matcher.compare(0, 0);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.001);
-    expect(result.pass).toBe(true);
-  });
-
-  it("fails when not within two decimal places by default", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
-      result;
-
-    result = matcher.compare(0, 0.01);
-    expect(result.pass).toBe(false);
-  });
-
-  it("accepts an optional precision argument", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
-      result;
-
-    result = matcher.compare(0, 0.1, 0);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.0001, 3);
-    expect(result.pass).toBe(true);
-  });
-
-  it("rounds expected values", function() {
-    var matcher = j$.matchers.toBeCloseTo(),
-      result;
-
-    result = matcher.compare(1.23, 1.229);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(1.23, 1.226);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(1.23, 1.225);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(1.23, 1.2249999);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(1.23, 1.234);
-    expect(result.pass).toBe(true);
-  });
-});

spec/core/matchers/toBeDefinedSpec.js

@@ -1,18 +0,0 @@
-describe("toBeDefined", function() {
-  it("matches for defined values", function() {
-    var matcher = j$.matchers.toBeDefined(),
-      result;
-
-
-    result = matcher.compare('foo');
-    expect(result.pass).toBe(true);
-  });
-
-  it("fails when matching undefined values", function() {
-    var matcher = j$.matchers.toBeDefined(),
-      result;
-
-    result = matcher.compare(void 0);
-    expect(result.pass).toBe(false);
-  })
-});

spec/core/matchers/toBeFalsySpec.js

@@ -1,38 +0,0 @@
-describe("toBeFalsy", function() {
-  it("passes for 'falsy' values", function() {
-    var matcher = j$.matchers.toBeFalsy(),
-      result;
-
-    result = matcher.compare(false);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare('');
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(null);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(void 0);
-    expect(result.pass).toBe(true);
-  });
-
-  it("fails for 'truthy' values", function() {
-    var matcher = j$.matchers.toBeFalsy(),
-      result;
-
-    result = matcher.compare(true);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(1);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare("foo");
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare({});
-    expect(result.pass).toBe(false);
-  });
-});

spec/core/matchers/toBeGreaterThanSpec.js

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

spec/core/matchers/toBeLessThanSpec.js

@@ -1,20 +0,0 @@
-describe("toBeLessThan", function() {
-  it("passes when actual < expected", function() {
-    var matcher = j$.matchers.toBeLessThan(),
-      result;
-
-    result = matcher.compare(1, 2);
-    expect(result.pass).toBe(true);
-  });
-
-  it("fails when actual <= expected", function() {
-    var matcher = j$.matchers.toBeLessThan(),
-      result;
-
-    result = matcher.compare(1, 1);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(2, 1);
-    expect(result.pass).toBe(false);
-  });
-});

spec/core/matchers/toBeNaNSpec.js

@@ -1,36 +0,0 @@
-describe("toBeNaN", function() {
-  it("passes for NaN with a custom .not fail", function() {
-    var matcher = j$.matchers.toBeNaN(),
-      result;
-
-    result = matcher.compare(Number.NaN);
-    expect(result.pass).toBe(true);
-    expect(result.message).toEqual("Expected actual not to be NaN.");
-  });
-
-  it("fails for anything not a NaN", function() {
-    var matcher = j$.matchers.toBeNaN();
-
-    result = matcher.compare(1);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(null);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(void 0);
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare('');
-    expect(result.pass).toBe(false);
-
-    result = matcher.compare(Number.POSITIVE_INFINITY);
-    expect(result.pass).toBe(false);
-  });
-
-  it("has a custom message on failure", function() {
-    var matcher = j$.matchers.toBeNaN(),
-      result = matcher.compare(0);
-
-    expect(result.message).toEqual("Expected 0 to be NaN.");
-  });
-});