TrivialReporter IE compatibility

Let's keep it around though so we can run tests without Ruby, eh?

This reverts commit e33ecf3665.

.gitignore

@@ -1,2 +1,2 @@
 .idea/
-.idea/inspectionProfiles/
+.svn/

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,8 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-    <scopes />
-    <list size="0" />
-  </settings>
-</component>

README.markdown

@@ -2,6 +2,45 @@ Jasmine
 =======
 **YET ANOTHER JavaScript testing framework**
 
+Quick Start
+----------
+
+### Ruby Suite Running
+
+    sudo gem sources -a http://gems.github.com
+    sudo gem install json thin
+    git clone git://github.com/pivotal/jasmine.git
+    cd jasmine/examples/ruby
+    rake jasmine_server
+
+open `http://localhost:8888/` in your favorite browser.
+
+### HTML Suite Running
+
+    git clone git://github.com/pivotal/jasmine.git
+
+open `examples/test/html/example_suite.html` in your favorite browser.
+
+### Automatic Suite Running (w/ Selenium)
+
+    sudo gem sources -a http://gems.github.com
+    sudo gem install json thin pivotal-selenium-rc selenium-client
+    git clone git://github.com/pivotal/jasmine.git
+    cd jasmine/examples/ruby
+    rake test:ci
+
+Releases
+----------
+0.9.0 beta [[download]](http://github.com/pivotal/jasmine/zipball/master)
+`git clone git://github.com/pivotal/jasmine.git`
+
+0.8.0 [[download]](http://github.com/pivotal/jasmine/zipball/0.8.0)
+
+### Which Release Should I Use?
+
+Please use the latest version unless you have a good reason not to. Some of this documentation may not be applicable to older versions.
+
+
 Why Another Frickin' JS TDD/BDD Framework?
 -----------
 
@@ -222,11 +261,30 @@ A suite can have a beforeEach declaration. It takes a function that is run befor
 
       beforeEach(function () {
         suiteWideFoo = 1;
-      }
+      });
 
       it('should equal bar', function () {
         expect(suiteWideFoo).toEqual(1);
-      };
+      });
+    });
+
+A runner can also have beforeEach declarations. Runner beforeEach functions are executed before every spec in all suites, and execute BEFORE suite beforeEach functions. For example:
+
+    var runnerWideFoo = [];
+
+    beforeEach(function () {
+      runnerWideFoo.push('runner');
+    });
+
+    describe('some suite', function () {
+
+      beforeEach(function () {
+        runnerWideFoo.push('suite');
+      });
+
+      it('should equal bar', function () {
+        expect(runnerWideFoo).toEqual(['runner', 'suite']);
+      });
     });
 
 #### afterEach
@@ -238,14 +296,37 @@ Similarly, there is an afterEach declaration.  It takes a function that is run a
       var suiteWideFoo;
       afterEach(function () {
         suiteWideFoo = 0;
-      }
+      });
 
       it('should equal 1', function () {
         expect(suiteWideFoo).toEqual(1);
-      };
+      });
 
       it('should equal 0 after', function () {
-      expect(suiteWideFoo).toEqual(0);
+        expect(suiteWideFoo).toEqual(0);
+      };
+    });
+
+A runner can also have an afterEach declarations. Runner afterEach functions are executed after every spec in all suites, and execute AFTER suite afterEach functions. For example:
+
+    var runnerWideFoo = [];
+
+    afterEach(function () {
+      runnerWideFoo.push('runner');
+    });
+
+    describe('some suite', function () {
+
+      afterEach(function () {
+        runnerWideFoo.push('suite');
+      });
+
+      it('should be empty', function () {
+        expect(runnerWideFoo).toEqual([]);
+      });
+
+      it('should be populated after', function () {
+        expect(runnerWideFoo).toEqual(['suite', 'runner']);
       };
     });
 
@@ -269,14 +350,14 @@ Jasmine supports nested describes. An example:
         it('nested expectation', function () {
           expect(suiteWideFoo).toEqual(0);
           expect(nestedSuiteBar).toEqual(1);
-        };
+        });
       
       });
 
       it('top-level describe', function () {
         expect(suiteWideFoo).toEqual(0);
         expect(nestedSuiteBar).toEqual(undefined);
-      };
+      });
     });
 
 ### Spies
@@ -286,15 +367,15 @@ Jasmine integrates 'spies' that permit many spying, mocking, and faking behavior
 Here are a few examples:
 
     var Klass = function () {
-    }
+    };
 
     var Klass.prototype.method = function (arg) {
       return arg;
-    }
+    };
 
     var Klass.prototype.methodWithCallback = function (callback) {
       return callback('foo');
-    }
+    };
     
     ...
 
@@ -427,15 +508,14 @@ We now have a Google Group for support & discussion.
 
 ## Maintainers
 
-* [Davis W. Frank](dwfrank@pivotallabs.com), Pivotal Labs
-* [Rajan Agaskar](rajan@pivotallabs.com), Pivotal Labs
+* [Davis W. Frank](mailto:dwfrank@pivotallabs.com), Pivotal Labs
+* [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
 
 ## Acknowledgments
 * A big shout out to the various JavaScript test framework authors, especially TJ for [JSpec](http://github.com/visionmedia/jspec/tree/master) - we played with it a bit before deciding that we really needed to roll our own.
 * Thanks to Pivot [Jessica Miller](http://www.jessicamillerworks.com/) for our fancy pass/fail/pending icons
-* Huge contributions have been made by [Christian Williams](xian@pivotallabs.com) (the master "spy" coder), [Erik Hanson](erik@pivotallabs.com), [Adam Abrons](adam@pivotallabs.com) and [Carl Jackson](carl@pivotallabs.com), and many other Pivots.
+* Huge contributions have been made by [Christian Williams](mailto:xian@pivotallabs.com) (the master "spy" coder), [Erik Hanson](mailto:erik@pivotallabs.com), [Adam Abrons](mailto:adam@pivotallabs.com) and [Carl Jackson](mailto:carl@pivotallabs.com), and many other Pivots.
 
 ## TODO List
 
 * Pending & Disabled counts should be included in results
-* BUG: describe blocks can't be empty - specs will stall

Rakefile

@@ -1,14 +1,94 @@
-desc 'Builds lib/jasmine from source'
-task :build do
+require File.expand_path(File.join(File.dirname(__FILE__), "spec/jasmine_helper.rb"))
 
-  # these files must be better
-  sources  = ["src/base.js", "src/util.js", "src/Env.js", "src/ActionCollection.js", "src/Reporter.js"]
-
-  sources += Dir.glob('src/*.js').reject{|f| sources.include?(f)}
-
-  jasmine = File.new('lib/jasmine.js', 'w')
-  sources.each do |source_filename|
-    jasmine.puts(File.read(source_filename))
-  end
+def jasmine_sources
+  sources  = ["src/base.js", "src/util.js", "src/Env.js", "src/Reporter.js", "src/Block.js"]
+  sources += Dir.glob('src/*.js').reject{|f| f == 'src/base.js' || sources.include?(f)}.sort
 end
 
+def jasmine_filename(version)
+  "jasmine-#{version['major']}.#{version['minor']}.#{version['build']}.js"
+end
+
+def version_hash
+  JSON.parse(File.new("src/version.json").read);
+end
+
+def start_jasmine_server(jasmine_includes = nil)
+  require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
+
+  puts "your tests are here:"
+  puts "  http://localhost:8888/run.html"
+
+  Jasmine::SimpleServer.start(8888,
+                              lambda { JasmineHelper.spec_file_urls },
+                              JasmineHelper.dir_mappings,
+                              jasmine_includes)
+end
+
+namespace :jasmine do
+  desc 'Builds lib/jasmine from source'
+  task :build => 'jasmine:doc' do
+    puts 'Building Jasmine from source'
+    require 'json'
+    sources = jasmine_sources
+    version = version_hash
+    old_jasmine_files = Dir.glob('lib/jasmine*.js')
+    old_jasmine_files.each do |file|
+      File.delete(file)
+    end
+    jasmine = File.new("lib/#{jasmine_filename version}", 'w')
+    jasmine.puts(File.read(sources.shift))
+    jasmine.puts %{
+jasmine.version_= {
+  "major": #{version['major']},
+  "minor": #{version['minor']},
+  "build": #{version['build']},
+  "revision": #{Time.now.to_i}
+  };
+}
+    sources.each do |source_filename|
+      jasmine.puts(File.read(source_filename))
+    end
+    jasmine.close
+  end
+
+  desc "Build jasmine documentation"
+  task :doc do
+    puts 'Creating Jasmine Documentation'
+    require 'rubygems'
+    #sudo gem install ragaskar-jsdoc_helper
+    require 'jsdoc_helper'
+
+
+    JsdocHelper::Rake::Task.new(:lambda_jsdoc)
+    Rake::Task[:lambda_jsdoc].invoke
+  end
+
+
+  desc "Run jasmine tests of source via server"
+  task :server do
+    jasmine_includes = lambda { jasmine_sources + ['lib/TrivialReporter.js'] }
+    start_jasmine_server(jasmine_includes)
+  end
+
+  desc "Build jasmine and run tests via server"
+  task :server_build => 'jasmine:build' do
+
+    start_jasmine_server
+  end
+
+  namespace :test do
+    desc "Run continuous integration tests"
+    task :ci => 'jasmine:build' do
+      require "spec"
+      require 'spec/rake/spectask'
+      Spec::Rake::SpecTask.new(:lambda_ci) do |t|
+        t.spec_opts = ["--color", "--format", "specdoc"]
+        t.spec_files = ["spec/jasmine_spec.rb"]
+      end
+      Rake::Task[:lambda_ci].invoke
+    end
+
+  end
+
+end

contrib/ruby/jasmine_runner.rb

@@ -1,7 +1,12 @@
 require 'socket'
 require 'erb'
+require 'json'
 
 module Jasmine
+  def self.root
+    File.expand_path(File.join(File.dirname(__FILE__), '../..'))
+  end
+
   # this seemingly-over-complex method is necessary to get an open port on at least some of our Macs
   def self.open_socket_on_unused_port
     infos = Socket::getaddrinfo("localhost", nil, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
@@ -43,15 +48,38 @@ module Jasmine
     Process.kill signal, -process_group_id # negative pid means kill process group. (see man 2 kill)
   end
 
+  def self.cachebust(files, root_dir="", replace=nil, replace_with=nil)
+    files.collect do |file_name|
+      real_file_name = replace && replace_with ? file_name.sub(replace, replace_with) : file_name
+      begin
+        digest = Digest::MD5.hexdigest(File.read("#{root_dir}#{real_file_name}"))
+      rescue
+        digest = "MISSING-FILE"
+      end
+      "#{file_name}?cachebust=#{digest}"
+    end
+  end
+
   class RunAdapter
-    def initialize(spec_files_or_proc)
+    def initialize(spec_files_or_proc, jasmine_files = nil, stylesheets = [])
       @spec_files_or_proc = spec_files_or_proc
+      @jasmine_files = jasmine_files || [
+        "/__JASMINE_ROOT__/lib/" + File.basename(Dir.glob("#{Jasmine.root}/lib/jasmine*.js").first),
+        "/__JASMINE_ROOT__/lib/TrivialReporter.js",
+        "/__JASMINE_ROOT__/lib/json2.js"
+      ]
+      @stylesheets = ["/__JASMINE_ROOT__/lib/jasmine.css"] + stylesheets
     end
 
     def call(env)
       spec_files = @spec_files_or_proc
       spec_files = spec_files.call if spec_files.respond_to?(:call)
 
+      jasmine_files = @jasmine_files
+      jasmine_files = jasmine_files.call if jasmine_files.respond_to?(:call)
+
+      css_files = @stylesheets
+
       body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html"))).result(binding)
       [
         200,
@@ -61,18 +89,48 @@ module Jasmine
     end
   end
 
+  class Redirect
+    def initialize(url)
+      @url = url
+    end
+
+    def call(env)
+      [
+        302,
+        { 'Location' => @url },
+        []
+      ]
+    end
+  end
+
+  class JsAlert
+    def call(env)
+      [
+        200,
+        { 'Content-Type' => 'application/javascript' },
+        "document.write('<p>Couldn\\'t load #{env["PATH_INFO"]}!</p>');"
+      ]
+    end
+  end
+
   class SimpleServer
-    def self.start(port, spec_files_or_proc, mappings)
+    def self.start(port, spec_files_or_proc, mappings, jasmine_files = nil, stylesheets = [])
       require 'thin'
 
       config = {
-        '/run.html' => Jasmine::RunAdapter.new(spec_files_or_proc)
+        '/run.html' => Jasmine::Redirect.new('/'),
+        '/' => Jasmine::RunAdapter.new(spec_files_or_proc, jasmine_files, stylesheets)
       }
       mappings.each do |from, to|
         config[from] = Rack::File.new(to)
       end
 
-      app = Rack::URLMap.new(config)
+      config["/__JASMINE_ROOT__"] = Rack::File.new(Jasmine.root)
+
+      app = Rack::Cascade.new([
+        Rack::URLMap.new(config),
+        JsAlert.new
+      ])
 
       Thin::Server.start('0.0.0.0', port, app)
     end
@@ -80,7 +138,7 @@ module Jasmine
 
   class SimpleClient
     def initialize(selenium_host, selenium_port, selenium_browser_start_command, http_address)
-      require 'selenium'
+      require 'selenium/client'
       @driver = Selenium::Client::Driver.new(
         selenium_host,
         selenium_port,
@@ -96,7 +154,7 @@ module Jasmine
 
     def connect
       @driver.start
-      @driver.open("/run.html")
+      @driver.open("/")
     end
 
     def disconnect
@@ -108,24 +166,28 @@ module Jasmine
         sleep 0.1
       end
 
-      puts @driver.get_eval("window.getResults()")
-      failed_count = @driver.get_eval("window.jasmine.getEnv().currentRunner.getResults().failedCount").to_i
+      puts @driver.get_eval("window.results()")
+      failed_count = @driver.get_eval("window.jasmine.getEnv().currentRunner.results().failedCount").to_i
       failed_count == 0
     end
 
     def eval_js(script)
       escaped_script = "'" + script.gsub(/(['\\])/) { '\\' + $1 } + "'"
 
-      result = @driver.get_eval("window.eval(#{escaped_script})")
+      result = @driver.get_eval(" try { eval(#{escaped_script}, window); } catch(err) { window.eval(#{escaped_script}); }")
       JSON.parse("[#{result}]")[0]
     end
   end
 
   class Runner
-    def initialize(selenium_jar_path, spec_files, dir_mappings)
+    def initialize(selenium_jar_path, spec_files, dir_mappings, jasmine_files = nil, options={})
       @selenium_jar_path = selenium_jar_path
       @spec_files = spec_files
       @dir_mappings = dir_mappings
+      @jasmine_files = jasmine_files
+      @browser = options[:browser] || 'firefox'
+      @stylesheets = options[:stylesheets] || []
+
 
       @selenium_pid = nil
       @jasmine_server_pid = nil
@@ -133,7 +195,7 @@ module Jasmine
 
     def start
       start_servers
-      @client = Jasmine::SimpleClient.new("localhost", @selenium_server_port, "*firefox", "http://localhost:#{@jasmine_server_port}/")
+      @client = Jasmine::SimpleClient.new("localhost", @selenium_server_port, "*#{@browser}", "http://localhost:#{@jasmine_server_port}/")
       @client.connect
     end
 
@@ -154,7 +216,7 @@ module Jasmine
 
       @jasmine_server_pid = fork do
         Process.setpgrp
-        Jasmine::SimpleServer.start(@jasmine_server_port, @spec_files, @dir_mappings)
+        Jasmine::SimpleServer.start(@jasmine_server_port, @spec_files, @dir_mappings, @jasmine_files, @stylesheets)
         exit! 0
       end
       puts "jasmine server started.  pid is #{@jasmine_server_pid}"

contrib/ruby/jasmine_spec_builder.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_runner.rb"))
-
+require 'enumerator'
 module Jasmine
 
   class SpecBuilder
@@ -8,6 +8,7 @@ module Jasmine
     def initialize(spec_files, runner)
       @spec_files = spec_files
       @runner = runner
+      @spec_ids = []
     end
 
     def start
@@ -15,7 +16,7 @@ module Jasmine
 
       @runner.start
       load_suite_info
-      @spec_results = {}
+      wait_for_suites_to_finish_running
     end
 
     def stop
@@ -51,24 +52,33 @@ module Jasmine
     end
 
     def load_suite_info
-      while !eval_js('jsApiReporter.started') do
+      started = Time.now
+      while !eval_js('jsApiReporter && jsApiReporter.started') do
+        raise "couldn't connect to Jasmine after 60 seconds" if (started + 60 < Time.now)
         sleep 0.1
       end
 
-      @suites = eval_js('JSON.stringify(jsApiReporter.suites)')
+      @suites = eval_js('JSON.stringify(jsApiReporter.suites())')
     end
 
     def results_for(spec_id)
-      spec_id = spec_id.to_s
-      return @spec_results[spec_id] if @spec_results[spec_id]
+      @spec_results ||= load_results
+      @spec_results[spec_id.to_s]
+    end
 
-      @spec_results[spec_id] = eval_js("JSON.stringify(jsApiReporter.results[#{spec_id}])")
-      while @spec_results[spec_id].nil? do
-        sleep 0.1
-        @spec_results[spec_id] = eval_js("JSON.stringify(jsApiReporter.results[#{spec_id}])")
+    def load_results
+      @spec_results = {}
+      @spec_ids.each_slice(50) do |slice|
+        @spec_results.merge!(eval_js("JSON.stringify(jsApiReporter.resultsForSpecs(#{JSON.generate(slice)}))"))
       end
+      @spec_results
+    end
 
-      @spec_results[spec_id]
+    def wait_for_suites_to_finish_running
+      puts "Waiting for suite to finish in browser ..."
+      while !eval_js('jsApiReporter.finished') do
+        sleep 0.1
+      end
     end
 
     def declare_suites
@@ -97,7 +107,7 @@ module Jasmine
     def declare_spec(parent, spec)
       me = self
       example_name = spec["name"]
-
+      @spec_ids << spec["id"]
       backtrace = @example_locations[parent.description + " " + example_name]
       parent.it example_name, {}, backtrace do
         me.report_spec(spec["id"])
@@ -114,13 +124,15 @@ module Jasmine
             puts message["text"]
             puts "\n"
           else
-            STDERR << message["message"]
-            STDERR << "\n"
+            unless message["message"] =~ /^Passed.$/
+              STDERR << message["message"]
+              STDERR << "\n"
 
-            out << message["message"]
-            out << "\n"
+              out << message["message"]
+              out << "\n"
+            end
 
-            unless message["passed"]
+            if !message["passed"] && message["trace"]["stack"]
               stack_trace = message["trace"]["stack"].gsub(/<br \/>/, "\n").gsub(/<\/?b>/, " ")
               STDERR << stack_trace.gsub(/\(.*\)@http:\/\/localhost:[0-9]+\/specs\//, "/spec/")
               STDERR << "\n"
@@ -129,7 +141,7 @@ module Jasmine
 
       end
       fail out unless spec_results['result'] == 'passed'
-      puts out
+      puts out unless out.empty?
     end
 
     private
@@ -139,4 +151,3 @@ module Jasmine
     end
   end
 end
-  

contrib/ruby/run.html

@@ -3,25 +3,39 @@
 <head>
   <meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
   <title>Jasmine suite</title>
-  <script src="/jasmine/lib/jasmine.js"></script>
-  <script src="/jasmine/lib/json2.js"></script><!-- todo: don't load JSON in the test runner! [20090710 xw] -->
-  <script src="/jasmine/lib/TrivialReporter.js"></script>
-  <script src="/specs/javascripts/screw-jasmine-compat.js"></script>
-  <script type="text/javascript"></script>
-  <link href="/jasmine/lib/jasmine.css" rel="stylesheet"/>
+  <% css_files.each do |css_file| %>
+  <link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
+  <% end %>
+
+  <% jasmine_files.each do |jasmine_file| %>
+  <script src="<%= jasmine_file %>" type="text/javascript"></script>
+  <% end %>
+
   <script type="text/javascript">
-    var jasmineEnv = jasmine.getEnv();
-    var jsApiReporter = new jasmine.JsApiReporter();
-    jasmineEnv.addReporter(jsApiReporter);
-    jasmineEnv.addReporter(new jasmine.TrivialReporter());
-    window.onload = function() {
-      jasmineEnv.execute();
-    };
+    var jsApiReporter;
+    (function() {
+      var jasmineEnv = jasmine.getEnv();
+
+      jsApiReporter = new jasmine.JsApiReporter();
+      var trivialReporter = new jasmine.TrivialReporter();
+
+      jasmineEnv.addReporter(jsApiReporter);
+      jasmineEnv.addReporter(trivialReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return trivialReporter.specFilter(spec);
+      };
+
+      window.onload = function() {
+        jasmineEnv.execute();
+      };
+    })();
   </script>
 
   <% spec_files.each do |spec_file| %>
-    <script src="<%= spec_file %>" type="text/javascript"></script>
+  <script src="<%= spec_file %>" type="text/javascript"></script>
   <% end %>
+
 </head>
 <body>
 <div id="jasmine_content"></div>

contrib/ruby/spec/jasmine_runner_spec.rb

@@ -1,6 +1,6 @@
 require 'spec'
 require 'open-uri'
-require File.dirname(__FILE__) + '/jasmine_runner'
+require File.dirname(__FILE__) + '/../jasmine_runner'
 
 describe Jasmine::SimpleServer do
   before do
@@ -20,7 +20,7 @@ describe Jasmine::SimpleServer do
 
     Jasmine::wait_for_listener(@port)
 
-    run_html = open("http://localhost:#{@port}/run.html").read
+    run_html = open("http://localhost:#{@port}/").read
     run_html.should =~ /<script src="file1"/
     run_html.should =~ /<script src="file2"/
   end
@@ -39,11 +39,11 @@ describe Jasmine::SimpleServer do
 
     Jasmine::wait_for_listener(@port)
 
-    run_html = open("http://localhost:#{@port}/run.html").read
+    run_html = open("http://localhost:#{@port}/").read
     run_html.should =~ /<script src="file1"/
     run_html.should =~ /<script src="file2"/
 
-    run_html = open("http://localhost:#{@port}/run.html").read
+    run_html = open("http://localhost:#{@port}/").read
     run_html.should =~ /<script src="file1"/
     run_html.should =~ /<script src="file2"/
     run_html.should =~ /<script src="file3"/

doc/files.html

@@ -188,16 +188,16 @@ ul.inheritsList
 	
 	<li><a href="symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -219,7 +219,31 @@ ul.inheritsList
 			
 			
 			<div>
-				<h2><a href="symbols/src/lib_jasmine.js.html">lib/jasmine.js</a></h2>
+				<h2><a href="symbols/src/lib_jasmine-0.9.0.js.html">lib/jasmine-0.9.0.js</a></h2>
+				
+				<dl>
+					
+					
+					
+					
+				</dl>
+			</div>
+			<hr />
+			
+			<div>
+				<h2><a href="symbols/src/lib_json2.js.html">lib/json2.js</a></h2>
+				
+				<dl>
+					
+					
+					
+					
+				</dl>
+			</div>
+			<hr />
+			
+			<div>
+				<h2><a href="symbols/src/lib_TrivialReporter.js.html">lib/TrivialReporter.js</a></h2>
 				
 				<dl>
 					
@@ -234,7 +258,7 @@ ul.inheritsList
 		</div>
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/index.html

@@ -2,7 +2,7 @@
         "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=utf-8" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8"" />
 		
 		<title>JsDoc Reference - Index</title>
 		<meta name="generator" content="JsDoc Toolkit" />
@@ -188,16 +188,16 @@ ul.inheritsList
 	
 	<li><a href="symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -231,7 +231,7 @@ ul.inheritsList
 			<hr />
 			
 			<div>
-				<h2><a href="symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></h2>
+				<h2><a href="symbols/jasmine.Block.html">jasmine.Block</a></h2>
 				
 			</div>
 			<hr />
@@ -242,6 +242,12 @@ ul.inheritsList
 			</div>
 			<hr />
 			
+			<div>
+				<h2><a href="symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></h2>
+				
+			</div>
+			<hr />
+			
 			<div>
 				<h2><a href="symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></h2>
 				
@@ -254,12 +260,6 @@ ul.inheritsList
 			</div>
 			<hr />
 			
-			<div>
-				<h2><a href="symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></h2>
-				
-			</div>
-			<hr />
-			
 			<div>
 				<h2><a href="symbols/jasmine.Reporter.html">jasmine.Reporter</a></h2>
 				
@@ -300,7 +300,7 @@ ul.inheritsList
 		</div>
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/_global_.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -389,7 +389,7 @@ ul.inheritsList
 Used for restoring any state that is hijacked during spec execution.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -430,7 +430,7 @@ Used for restoring any state that is hijacked during spec execution.
 Used for spec setup, including validating assumptions.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -473,7 +473,7 @@ are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be
 of setup in some tests.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -527,7 +527,7 @@ It is passed an Object that is the actual value and should chain to one of the m
 jasmine.Matchers functions.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -568,7 +568,7 @@ jasmine.Matchers functions.
 // TODO: pending tests
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -619,7 +619,7 @@ jasmine.Matchers functions.
 						Defines part of a jasmine spec.  Used in cominbination with waits or waitsFor in asynchrnous specs.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -658,7 +658,7 @@ jasmine.Matchers functions.
 						Function that installs a spy on an existing object's method name.  Used within a Spec to create a spy.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -725,7 +725,7 @@ spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
 						Waits for a timeout before moving to the next runs()-defined block.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -764,7 +764,7 @@ spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
 						Waits for the latchFunction to return true before proceeding to the next runs()-defined block.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -815,7 +815,7 @@ spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
 						Disables a suite of specifications.  Used to disable some suites in a file, or files, temporarily during development.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -862,7 +862,7 @@ spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
 A convenience method that allows existing specs to be disabled temporarily during development.
 						
 							<br />
-							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+							<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 						
 						
 					</div>
@@ -908,7 +908,7 @@ A convenience method that allows existing specs to be disabled temporarily durin
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:18 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Block.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="JsDoc Toolkit" />
 		
-		<title>JsDoc Reference - jasmine.QueuedFunction</title>
+		<title>JsDoc Reference - jasmine.Block</title>
 
 		<style type="text/css">
 			/* default.css */
@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -224,7 +224,7 @@ ul.inheritsList
 <!-- ============================== class title ============================ -->
 			<h1 class="classTitle">
 				
-				Class jasmine.QueuedFunction
+				Class jasmine.Block
 			</h1>
 
 <!-- ============================== class summary ========================== -->			
@@ -234,13 +234,13 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
 <!-- ============================== constructor summary ==================== -->			
 			
-			<table class="summaryTable" cellspacing="0" summary="A summary of the constructor documented in the class jasmine.QueuedFunction.">
+			<table class="summaryTable" cellspacing="0" summary="A summary of the constructor documented in the class jasmine.Block.">
 				<caption>Class Summary</caption>
 				<thead>
 					<tr>
@@ -253,9 +253,9 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.QueuedFunction.html#constructor">jasmine.QueuedFunction</a></b>(env, func, timeout, latchFunction, spec)
+								<b><a href="../symbols/jasmine.Block.html">jasmine.Block</a></b>(env, func, spec)
 							</div>
-							<div class="description">QueuedFunction is how ActionCollections' actions are implemented</div>
+							<div class="description">Blocks are functions with executable code that make up a spec.</div>
 						</td>
 					</tr>
 				</tbody>
@@ -278,11 +278,11 @@ ul.inheritsList
 				</div>
 				
 				<div class="fixedFont">
-						<b>jasmine.QueuedFunction</b>(env, func, timeout, latchFunction, spec)
+						<b>jasmine.Block</b>(env, func, spec)
 				</div>
 				
 				<div class="description">
-					QueuedFunction is how ActionCollections' actions are implemented
+					Blocks are functions with executable code that make up a spec.
 					
 				</div>
 				
@@ -305,18 +305,6 @@ ul.inheritsList
 							</dt>
 								<dd></dd>
 						
-							<dt>
-								<span class="light fixedFont">{Number}</span>  <b>timeout</b>
-								
-							</dt>
-								<dd></dd>
-						
-							<dt>
-								<span class="light fixedFont">{Function}</span>  <b>latchFunction</b>
-								
-							</dt>
-								<dd></dd>
-						
 							<dt>
 								<span class="light fixedFont">{<a href="../symbols/jasmine.Spec.html">jasmine.Spec</a>}</span>  <b>spec</b>
 								
@@ -351,7 +339,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Env.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Env.html#constructor">jasmine.Env</a></b>()
+								<b><a href="../symbols/jasmine.Env.html">jasmine.Env</a></b>()
 							</div>
 							<div class="description">Environment for Jasmine</div>
 						</td>
@@ -288,6 +288,33 @@ ul.inheritsList
 							</td>
 						</tr>
 					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Env.html#nextSpecId">nextSpecId</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Env.html#nextSuiteId">nextSuiteId</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Env.html#version">version</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
 					</tbody>
 				</table>
 				
@@ -370,6 +397,102 @@ ul.inheritsList
 						
 						
 
+					<hr />
+				
+					<a name="nextSpecId"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>nextSpecId</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+							<dl class="detailList">
+							<dt class="heading">Returns:</dt>
+							
+								<dd>a sequential integer starting at 0</dd>
+							
+							</dl>
+						
+						
+						
+
+					<hr />
+				
+					<a name="nextSuiteId"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>nextSuiteId</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+							<dl class="detailList">
+							<dt class="heading">Returns:</dt>
+							
+								<dd>a sequential integer starting at 0</dd>
+							
+							</dl>
+						
+						
+						
+
+					<hr />
+				
+					<a name="version"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>version</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+							<dl class="detailList">
+							<dt class="heading">Returns:</dt>
+							
+								<dd>an object containing jasmine version build info, if set.</dd>
+							
+							</dl>
+						
+						
+						
+
 					
 				
 			
@@ -384,7 +507,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.JsApiReporter.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<meta name="generator" content="JsDoc Toolkit" />
 		
-		<title>JsDoc Reference - jasmine.ActionCollection</title>
+		<title>JsDoc Reference - jasmine.JsApiReporter</title>
 
 		<style type="text/css">
 			/* default.css */
@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -224,7 +224,7 @@ ul.inheritsList
 <!-- ============================== class title ============================ -->
 			<h1 class="classTitle">
 				
-				Class jasmine.ActionCollection
+				Class jasmine.JsApiReporter
 			</h1>
 
 <!-- ============================== class summary ========================== -->			
@@ -234,13 +234,13 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
 <!-- ============================== constructor summary ==================== -->			
 			
-			<table class="summaryTable" cellspacing="0" summary="A summary of the constructor documented in the class jasmine.ActionCollection.">
+			<table class="summaryTable" cellspacing="0" summary="A summary of the constructor documented in the class jasmine.JsApiReporter.">
 				<caption>Class Summary</caption>
 				<thead>
 					<tr>
@@ -253,11 +253,9 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.ActionCollection.html#constructor">jasmine.ActionCollection</a></b>(env)
+								<b><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></b>()
 							</div>
-							<div class="description">base for Runner & Suite: allows for a queue of functions to get executed, allowing for
-  any one action to complete, including asynchronous calls, before going to the next
-  action.</div>
+							<div class="description">JavaScript API reporter.</div>
 						</td>
 					</tr>
 				</tbody>
@@ -269,60 +267,6 @@ ul.inheritsList
 
 <!-- ============================== methods summary ======================== -->
 			
-				
-				
-				<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.ActionCollection.">
-					<caption>Method Summary</caption>
-					<thead>
-						<tr>
-							<th scope="col">Method Attributes</th>
-							<th scope="col">Method Name and Description</th>
-						</tr>
-					</thead>
-					<tbody>
-					
-						<tr>
-							<td class="attributes">&nbsp;</td>
-							<td class="nameDescription">
-								<div class="fixedFont"><b><a href="../symbols/jasmine.ActionCollection.html#execute">execute</a></b>()
-								</div>
-								<div class="description">Starts executing the queue of functions/actions.</div>
-							</td>
-						</tr>
-					
-						<tr>
-							<td class="attributes">&nbsp;</td>
-							<td class="nameDescription">
-								<div class="fixedFont"><b><a href="../symbols/jasmine.ActionCollection.html#finish">finish</a></b>()
-								</div>
-								<div class="description">Marks the collection as done & calls the finish callback, if there is one</div>
-							</td>
-						</tr>
-					
-						<tr>
-							<td class="attributes">&nbsp;</td>
-							<td class="nameDescription">
-								<div class="fixedFont"><b><a href="../symbols/jasmine.ActionCollection.html#getCurrentAction">getCurrentAction</a></b>()
-								</div>
-								<div class="description">Gets the current action.</div>
-							</td>
-						</tr>
-					
-						<tr>
-							<td class="attributes">&nbsp;</td>
-							<td class="nameDescription">
-								<div class="fixedFont"><b><a href="../symbols/jasmine.ActionCollection.html#next">next</a></b>()
-								</div>
-								<div class="description">Executes the next queued function/action.</div>
-							</td>
-						</tr>
-					
-					</tbody>
-				</table>
-				
-				
-				
-			
 <!-- ============================== events summary ======================== -->
 			
 
@@ -334,13 +278,11 @@ ul.inheritsList
 				</div>
 				
 				<div class="fixedFont">
-						<b>jasmine.ActionCollection</b>(env)
+						<b>jasmine.JsApiReporter</b>()
 				</div>
 				
 				<div class="description">
-					base for Runner & Suite: allows for a queue of functions to get executed, allowing for
-  any one action to complete, including asynchronous calls, before going to the next
-  action.
+					JavaScript API reporter.
 					
 				</div>
 				
@@ -348,17 +290,6 @@ ul.inheritsList
 				
 				
 					
-						<dl class="detailList">
-						<dt class="heading">Parameters:</dt>
-						
-							<dt>
-								<span class="light fixedFont">{<a href="../symbols/jasmine.Env.html">jasmine.Env</a>}</span>  <b>env</b>
-								
-							</dt>
-								<dd></dd>
-						
-						</dl>
-					
 					
 					
 					
@@ -374,111 +305,6 @@ ul.inheritsList
 
 <!-- ============================== method details ========================= -->		
 			
-				<div class="sectionTitle">
-					Method Detail
-				</div>
-				
-					<a name="execute"> </a>
-					<div class="fixedFont">
-					
-					
-					<b>execute</b>()
-					
-					</div>
-					<div class="description">
-						Starts executing the queue of functions/actions.
-						
-						
-					</div>
-					
-					
-					
-						
-						
-						
-						
-						
-						
-						
-
-					<hr />
-				
-					<a name="finish"> </a>
-					<div class="fixedFont">
-					
-					
-					<b>finish</b>()
-					
-					</div>
-					<div class="description">
-						Marks the collection as done & calls the finish callback, if there is one
-						
-						
-					</div>
-					
-					
-					
-						
-						
-						
-						
-						
-						
-						
-
-					<hr />
-				
-					<a name="getCurrentAction"> </a>
-					<div class="fixedFont">
-					
-					
-					<b>getCurrentAction</b>()
-					
-					</div>
-					<div class="description">
-						Gets the current action.
-						
-						
-					</div>
-					
-					
-					
-						
-						
-						
-						
-						
-						
-						
-
-					<hr />
-				
-					<a name="next"> </a>
-					<div class="fixedFont">
-					
-					
-					<b>next</b>()
-					
-					</div>
-					<div class="description">
-						Executes the next queued function/action. If there are no more in the queue, calls #finish.
-						
-						
-					</div>
-					
-					
-					
-						
-						
-						
-						
-						
-						
-						
-
-					
-				
-			
 			
 <!-- ============================== event details ========================= -->		
 			
@@ -490,7 +316,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:18 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.MultiReporter.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.MultiReporter.html#constructor">jasmine.MultiReporter</a></b>()
+								<b><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></b>()
 							</div>
 							<div class="description"></div>
 						</td>
@@ -316,7 +316,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.NestedResults.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.NestedResults.html#constructor">jasmine.NestedResults</a></b>()
+								<b><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></b>()
 							</div>
 							<div class="description">Holds results for a set of Jasmine spec.</div>
 						</td>
@@ -700,7 +700,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Reporter.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Reporter.html#constructor">jasmine.Reporter</a></b>()
+								<b><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></b>()
 							</div>
 							<div class="description">No-op base class for Jasmine reporters.</div>
 						</td>
@@ -316,7 +316,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Runner.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Runner.html#constructor">jasmine.Runner</a></b>(env)
+								<b><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></b>(env)
 							</div>
 							<div class="description">Runner</div>
 						</td>
@@ -267,6 +267,42 @@ ul.inheritsList
 
 <!-- ============================== methods summary ======================== -->
 			
+				
+				
+				<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Runner.">
+					<caption>Method Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Method Attributes</th>
+							<th scope="col">Method Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Runner.html#getAllSuites">getAllSuites</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Runner.html#getResults">getResults</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+					</tbody>
+				</table>
+				
+				
+				
+			
 <!-- ============================== events summary ======================== -->
 			
 
@@ -316,6 +352,61 @@ ul.inheritsList
 
 <!-- ============================== method details ========================= -->		
 			
+				<div class="sectionTitle">
+					Method Detail
+				</div>
+				
+					<a name="getAllSuites"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>getAllSuites</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+						
+						
+
+					<hr />
+				
+					<a name="getResults"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>getResults</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+						
+						
+
+					
+				
+			
 			
 <!-- ============================== event details ========================= -->		
 			
@@ -327,7 +418,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Spec.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Spec.html#constructor">jasmine.Spec</a></b>(env, suite, description)
+								<b><a href="../symbols/jasmine.Spec.html">jasmine.Spec</a></b>(env, suite, description)
 							</div>
 							<div class="description">Internal representation of a Jasmine specification, or test.</div>
 						</td>
@@ -267,6 +267,33 @@ ul.inheritsList
 
 <!-- ============================== methods summary ======================== -->
 			
+				
+				
+				<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Spec.">
+					<caption>Method Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Method Attributes</th>
+							<th scope="col">Method Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Spec.html#getResults">getResults</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+					</tbody>
+				</table>
+				
+				
+				
+			
 <!-- ============================== events summary ======================== -->
 			
 
@@ -328,6 +355,36 @@ ul.inheritsList
 
 <!-- ============================== method details ========================= -->		
 			
+				<div class="sectionTitle">
+					Method Detail
+				</div>
+				
+					<a name="getResults"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>getResults</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+						
+						
+
+					
+				
+			
 			
 <!-- ============================== event details ========================= -->		
 			
@@ -339,7 +396,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Spy.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Spy.html#constructor">jasmine.Spy</a></b>(name)
+								<b><a href="../symbols/jasmine.Spy.html">jasmine.Spy</a></b>(name)
 							</div>
 							<div class="description">Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.</div>
 						</td>
@@ -845,7 +845,7 @@ expect(foo.bar.callCount).toEqual(0);</pre>
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.Suite.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.Suite.html#constructor">jasmine.Suite</a></b>(env, description, specDefinitions, parentSuite)
+								<b><a href="../symbols/jasmine.Suite.html">jasmine.Suite</a></b>(env, description, specDefinitions, parentSuite)
 							</div>
 							<div class="description">Internal representation of a Jasmine suite.</div>
 						</td>
@@ -267,6 +267,42 @@ ul.inheritsList
 
 <!-- ============================== methods summary ======================== -->
 			
+				
+				
+				<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Suite.">
+					<caption>Method Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Method Attributes</th>
+							<th scope="col">Method Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Suite.html#getResults">getResults</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/jasmine.Suite.html#specCount">specCount</a></b>()
+								</div>
+								<div class="description"></div>
+							</td>
+						</tr>
+					
+					</tbody>
+				</table>
+				
+				
+				
+			
 <!-- ============================== events summary ======================== -->
 			
 
@@ -334,6 +370,61 @@ ul.inheritsList
 
 <!-- ============================== method details ========================= -->		
 			
+				<div class="sectionTitle">
+					Method Detail
+				</div>
+				
+					<a name="getResults"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>getResults</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+						
+						
+
+					<hr />
+				
+					<a name="specCount"> </a>
+					<div class="fixedFont">
+					
+					
+					<b>specCount</b>()
+					
+					</div>
+					<div class="description">
+						
+						
+						
+					</div>
+					
+					
+					
+						
+						
+						
+						
+						
+						
+						
+
+					
+				
+			
 			
 <!-- ============================== event details ========================= -->		
 			
@@ -345,7 +436,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.html#constructor">jasmine</a></b>
+								<b><a href="../symbols/jasmine.html">jasmine</a></b>
 							</div>
 							<div class="description">Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.</div>
 						</td>
@@ -266,6 +266,29 @@ ul.inheritsList
 			
 				
 				
+				<table class="summaryTable" cellspacing="0" summary="A summary of the fields documented in the class jasmine.">
+					<caption>Field Summary</caption>
+					<thead>
+						<tr>
+							<th scope="col">Field Attributes</th>
+							<th scope="col">Field Name and Description</th>
+						</tr>
+					</thead>
+					<tbody>
+					
+						<tr>
+							<td class="attributes">&lt;static&gt; &nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont">
+								jasmine.<b><a href="../symbols/jasmine.html#.UPDATE_INTERVAL">UPDATE_INTERVAL</a></b>
+								</div>
+								<div class="description">Large or small values here may result in slow test running & "Too much recursion" errors</div>
+							</td>
+						</tr>
+					
+					</tbody>
+				</table>
+				
 				
 				
 			
@@ -389,6 +412,33 @@ Jasmine environment.</div>
 
 <!-- ============================== field details ========================== -->		
 			
+				<div class="sectionTitle">
+					Field Detail
+				</div>
+				
+					<a name=".UPDATE_INTERVAL"> </a>
+					<div class="fixedFont">&lt;static&gt; 
+					
+					
+					<span class="light">jasmine.</span><b>UPDATE_INTERVAL</b>
+					
+					</div>
+					<div class="description">
+						Large or small values here may result in slow test running & "Too much recursion" errors
+						
+						
+					</div>
+					
+					
+
+						
+						
+						
+						
+
+					
+				
+			
 
 <!-- ============================== method details ========================= -->		
 			
@@ -678,7 +728,7 @@ Jasmine environment.
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:18 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/jasmine.util.html

@@ -193,16 +193,16 @@ ul.inheritsList
 	
 	<li><a href="../symbols/jasmine.html">jasmine</a></li>
 	
-	<li><a href="../symbols/jasmine.ActionCollection.html">jasmine.ActionCollection</a></li>
+	<li><a href="../symbols/jasmine.Block.html">jasmine.Block</a></li>
 	
 	<li><a href="../symbols/jasmine.Env.html">jasmine.Env</a></li>
 	
+	<li><a href="../symbols/jasmine.JsApiReporter.html">jasmine.JsApiReporter</a></li>
+	
 	<li><a href="../symbols/jasmine.MultiReporter.html">jasmine.MultiReporter</a></li>
 	
 	<li><a href="../symbols/jasmine.NestedResults.html">jasmine.NestedResults</a></li>
 	
-	<li><a href="../symbols/jasmine.QueuedFunction.html">jasmine.QueuedFunction</a></li>
-	
 	<li><a href="../symbols/jasmine.Reporter.html">jasmine.Reporter</a></li>
 	
 	<li><a href="../symbols/jasmine.Runner.html">jasmine.Runner</a></li>
@@ -234,7 +234,7 @@ ul.inheritsList
 				
 				
 				
-					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine.js.html">jasmine.js</a>.
+					<br /><i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.9.0.js.html">jasmine-0.9.0.js</a>.
 				
 			</p>
 
@@ -253,7 +253,7 @@ ul.inheritsList
 						<td class="attributes">&nbsp;</td>
 						<td class="nameDescription" >
 							<div class="fixedFont">
-								<b><a href="../symbols/jasmine.util.html#constructor">jasmine.util</a></b>
+								<b><a href="../symbols/jasmine.util.html">jasmine.util</a></b>
 							</div>
 							<div class="description"></div>
 						</td>
@@ -316,7 +316,7 @@ ul.inheritsList
 <!-- ============================== footer ================================= -->
 		<div class="fineprint" style="clear:both">
 			
-			Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.3.0 on Thu Jul 09 2009 21:42:19 GMT-0700 (PDT)
+			Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
 		</div>
 	</body>
 </html>

doc/symbols/src/lib_TrivialReporter.js.html

@@ -0,0 +1,144 @@
+<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"> <style>
+	.KEYW {color: #933;}
+	.COMM {color: #bbb; font-style: italic;}
+	.NUMB {color: #393;}
+	.STRN {color: #393;}
+	.REGX {color: #339;}
+	.line {border-right: 1px dotted #666; color: #666; font-style: normal;}
+	</style></head><body><pre><span class='line'>  1</span> <span class="NAME">jasmine.TrivialReporter</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">doc</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>  2</span> </span><span class="WHIT">  </span><span class="NAME">this.document</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">doc</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="NAME">document</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>  3</span> </span><span class="WHIT">  </span><span class="NAME">this.suiteDivs</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>  4</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>  5</span> 
+<span class='line'>  6</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.createDom</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">type</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">attrs</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">childrenVarArgs</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>  7</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">el</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">document.createElement</span><span class="PUNC">(</span><span class="NAME">type</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>  8</span> 
+<span class='line'>  9</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">2</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">arguments.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 10</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">child</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">arguments</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 11</span> 
+<span class='line'> 12</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">child</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'string'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 13</span> </span><span class="WHIT">      </span><span class="NAME">el.appendChild</span><span class="PUNC">(</span><span class="NAME">document.createTextNode</span><span class="PUNC">(</span><span class="NAME">child</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 14</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT"> </span><span class="KEYW">else</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 15</span> </span><span class="WHIT">      </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">child</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">el.appendChild</span><span class="PUNC">(</span><span class="NAME">child</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 16</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 17</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 18</span> 
+<span class='line'> 19</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">attr</span><span class="WHIT"> </span><span class="KEYW">in</span><span class="WHIT"> </span><span class="NAME">attrs</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 20</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">attr</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">'className'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 21</span> </span><span class="WHIT">      </span><span class="NAME">el.setAttribute</span><span class="PUNC">(</span><span class="STRN">'class'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">attrs</span><span class="PUNC">[</span><span class="NAME">attr</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 22</span> </span><span class="WHIT">      </span><span class="COMM">//twice for ie</span><span class="WHIT">
+<span class='line'> 23</span> </span><span class="WHIT">      </span><span class="NAME">el.setAttribute</span><span class="PUNC">(</span><span class="STRN">'className'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">attrs</span><span class="PUNC">[</span><span class="NAME">attr</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 24</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT"> </span><span class="KEYW">else</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 25</span> </span><span class="WHIT">      </span><span class="NAME">el</span><span class="PUNC">[</span><span class="NAME">attr</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">attrs</span><span class="PUNC">[</span><span class="NAME">attr</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 26</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 27</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 28</span> 
+<span class='line'> 29</span> </span><span class="WHIT">  </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">el</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 30</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 31</span> 
+<span class='line'> 32</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.reportRunnerStarting</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">runner</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 33</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">suites</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">runner.suites</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 34</span> 
+<span class='line'> 35</span> </span><span class="WHIT">  </span><span class="NAME">this.runnerDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'div'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'runner running'</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 36</span> </span><span class="WHIT">      </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'run_spec'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?'</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"run all"</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 37</span> </span><span class="WHIT">      </span><span class="NAME">this.runnerMessageSpan</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'span'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"Running..."</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 38</span> </span><span class="WHIT">  </span><span class="NAME">this.document.body.appendChild</span><span class="PUNC">(</span><span class="NAME">this.runnerDiv</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 39</span> 
+<span class='line'> 40</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">suites.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 41</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">suite</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">suites</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 42</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">suiteDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'div'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'suite'</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 43</span> </span><span class="WHIT">        </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'run_spec'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?spec='</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">encodeURIComponent</span><span class="PUNC">(</span><span class="NAME">suite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"run"</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 44</span> </span><span class="WHIT">        </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'description'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?spec='</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">encodeURIComponent</span><span class="PUNC">(</span><span class="NAME">suite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">suite.description</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 45</span> </span><span class="WHIT">    </span><span class="NAME">this.suiteDivs</span><span class="PUNC">[</span><span class="NAME">suite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">suiteDiv</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 46</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">parentDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.document.body</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 47</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">suite.parentSuite</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 48</span> </span><span class="WHIT">      </span><span class="NAME">parentDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.suiteDivs</span><span class="PUNC">[</span><span class="NAME">suite.parentSuite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 49</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 50</span> </span><span class="WHIT">    </span><span class="NAME">parentDiv.appendChild</span><span class="PUNC">(</span><span class="NAME">suiteDiv</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 51</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 52</span> 
+<span class='line'> 53</span> </span><span class="WHIT">  </span><span class="NAME">this.startedAt</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">Date</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 54</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 55</span> 
+<span class='line'> 56</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.reportRunnerResults</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">runner</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 57</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">results</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">runner.results</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 58</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">className</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">results.failedCount</span><span class="WHIT"> </span><span class="PUNC">></span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">"runner failed"</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">"runner passed"</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 59</span> </span><span class="WHIT">  </span><span class="NAME">this.runnerDiv.setAttribute</span><span class="PUNC">(</span><span class="STRN">"class"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 60</span> </span><span class="WHIT">  </span><span class="COMM">//do it twice for IE</span><span class="WHIT">
+<span class='line'> 61</span> </span><span class="WHIT">  </span><span class="NAME">this.runnerDiv.setAttribute</span><span class="PUNC">(</span><span class="STRN">"className"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 62</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">specs</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">runner.specs</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 63</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">specCount</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 64</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">specs.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 65</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">this.specFilter</span><span class="PUNC">(</span><span class="NAME">specs</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 66</span> </span><span class="WHIT">      </span><span class="NAME">specCount</span><span class="PUNC">++</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 67</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 68</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 69</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">message</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">""</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">specCount</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">" spec"</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">specCount</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">""</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">"s"</span><span class="WHIT"> </span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">", "</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">results.failedCount</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">" failure"</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">(</span><span class="NAME">results.failedCount</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">""</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">"s"</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 70</span> </span><span class="WHIT">  </span><span class="NAME">message</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">" in "</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">(</span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">Date</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">getTime</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">-</span><span class="WHIT"> </span><span class="NAME">this.startedAt.getTime</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">/</span><span class="WHIT"> </span><span class="NUMB">1000</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">"s"</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 71</span> </span><span class="WHIT">  </span><span class="NAME">this.runnerMessageSpan.replaceChild</span><span class="PUNC">(</span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'description'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?'</span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">message</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">this.runnerMessageSpan.firstChild</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 72</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 73</span> 
+<span class='line'> 74</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.reportSuiteResults</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">suite</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 75</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">results</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">suite.results</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 76</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">status</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">results.passed</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'passed'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'failed'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 77</span> </span><span class="WHIT">  </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">results.totalCount</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="COMM">// todo: change this to check results.skipped</span><span class="WHIT">
+<span class='line'> 78</span> </span><span class="WHIT">    </span><span class="NAME">status</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">'skipped'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 79</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 80</span> </span><span class="WHIT">  </span><span class="NAME">this.suiteDivs</span><span class="PUNC">[</span><span class="NAME">suite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">className</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">" "</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">status</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 81</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 82</span> 
+<span class='line'> 83</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.reportSpecResults</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">spec</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 84</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">results</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">spec.results</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 85</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">status</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">results.passed</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'passed'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'failed'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 86</span> </span><span class="WHIT">  </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">results.skipped</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 87</span> </span><span class="WHIT">    </span><span class="NAME">status</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">'skipped'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 88</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'> 89</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">specDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'div'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'spec '</span><span class="WHIT">  </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">status</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 90</span> </span><span class="WHIT">      </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'run_spec'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?spec='</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">encodeURIComponent</span><span class="PUNC">(</span><span class="NAME">spec.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"run"</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'> 91</span> </span><span class="WHIT">      </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'a'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'description'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">href</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'?spec='</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">encodeURIComponent</span><span class="PUNC">(</span><span class="NAME">spec.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">spec.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 92</span> 
+<span class='line'> 93</span> 
+<span class='line'> 94</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">resultItems</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">results.getItems</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 95</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">resultItems.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 96</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">result</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">resultItems</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 97</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">result.passed</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="PUNC">!</span><span class="NAME">result.passed</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'> 98</span> </span><span class="WHIT">      </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">resultMessageDiv</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'div'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'resultMessage fail'</span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'> 99</span> </span><span class="WHIT">      </span><span class="NAME">resultMessageDiv.innerHTML</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">result.message</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="COMM">// todo: lame; mend</span><span class="WHIT">
+<span class='line'>100</span> </span><span class="WHIT">      </span><span class="NAME">specDiv.appendChild</span><span class="PUNC">(</span><span class="NAME">resultMessageDiv</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>101</span> </span><span class="WHIT">      </span><span class="NAME">specDiv.appendChild</span><span class="PUNC">(</span><span class="NAME">this.createDom</span><span class="PUNC">(</span><span class="STRN">'div'</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="NAME">className</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'stackTrace'</span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">result.trace.stack</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>102</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>103</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>104</span> 
+<span class='line'>105</span> </span><span class="WHIT">  </span><span class="NAME">this.suiteDivs</span><span class="PUNC">[</span><span class="NAME">spec.suite.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">appendChild</span><span class="PUNC">(</span><span class="NAME">specDiv</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>106</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>107</span> 
+<span class='line'>108</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.log</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>109</span> </span><span class="WHIT">  </span><span class="NAME">console.log.apply</span><span class="PUNC">(</span><span class="NAME">console</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">arguments</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>110</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>111</span> 
+<span class='line'>112</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.getLocation</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>113</span> </span><span class="WHIT">  </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.document.location</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>114</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>115</span> 
+<span class='line'>116</span> </span><span class="NAME">jasmine.TrivialReporter.prototype.specFilter</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">spec</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>117</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">paramMap</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>118</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">params</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.getLocation</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">search.substring</span><span class="PUNC">(</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">split</span><span class="PUNC">(</span><span class="STRN">'&'</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>119</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">params.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>120</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">p</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">params</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">split</span><span class="PUNC">(</span><span class="STRN">'='</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>121</span> </span><span class="WHIT">    </span><span class="NAME">paramMap</span><span class="PUNC">[</span><span class="NAME">decodeURIComponent</span><span class="PUNC">(</span><span class="NAME">p</span><span class="PUNC">[</span><span class="NUMB">0</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">decodeURIComponent</span><span class="PUNC">(</span><span class="NAME">p</span><span class="PUNC">[</span><span class="NUMB">1</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>122</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>123</span> 
+<span class='line'>124</span> </span><span class="WHIT">  </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">paramMap</span><span class="PUNC">[</span><span class="STRN">"spec"</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="KEYW">true</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>125</span> </span><span class="WHIT">  </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">spec.getFullName</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">indexOf</span><span class="PUNC">(</span><span class="NAME">paramMap</span><span class="PUNC">[</span><span class="STRN">"spec"</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>126</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>127</span> 
+<span class='line'>128</span> </span><span class="COMM">//protect against console.log incidents</span><span class="WHIT">
+<span class='line'>129</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="PUNC">(</span><span class="STRN">"console"</span><span class="WHIT"> </span><span class="KEYW">in</span><span class="WHIT"> </span><span class="NAME">window</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="PUNC">!</span><span class="PUNC">(</span><span class="STRN">"firebug"</span><span class="WHIT"> </span><span class="KEYW">in</span><span class="WHIT"> </span><span class="NAME">console</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>130</span> </span><span class="WHIT">  </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">names</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">[</span><span class="STRN">"log"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"debug"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"info"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"warn"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"error"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"assert"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"dir"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"dirxml"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"group"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"groupEnd"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"time"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"timeEnd"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"count"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"trace"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"profile"</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">"profileEnd"</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>131</span> </span><span class="WHIT">  </span><span class="NAME">window.console</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>132</span> </span><span class="WHIT">  </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">len</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">names.length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">len</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">++</span><span class="NAME">i</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>133</span> </span><span class="WHIT">    </span><span class="NAME">window.console</span><span class="PUNC">[</span><span class="NAME">names</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>134</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>135</span> </span><span class="WHIT">  </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>136</span> </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>137</span> </span></pre></body></html>

doc/symbols/src/lib_json2.js.html

@@ -0,0 +1,486 @@
+<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"> <style>
+	.KEYW {color: #933;}
+	.COMM {color: #bbb; font-style: italic;}
+	.NUMB {color: #393;}
+	.STRN {color: #393;}
+	.REGX {color: #339;}
+	.line {border-right: 1px dotted #666; color: #666; font-style: normal;}
+	</style></head><body><pre><span class='line'>  1</span> <span class="COMM">/*
+<span class='line'>  2</span>     http://www.JSON.org/json2.js
+<span class='line'>  3</span>     2009-08-17
+<span class='line'>  4</span> 
+<span class='line'>  5</span>     Public Domain.
+<span class='line'>  6</span> 
+<span class='line'>  7</span>     NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+<span class='line'>  8</span> 
+<span class='line'>  9</span>     See http://www.JSON.org/js.html
+<span class='line'> 10</span> 
+<span class='line'> 11</span>     This file creates a global JSON object containing two methods: stringify
+<span class='line'> 12</span>     and parse.
+<span class='line'> 13</span> 
+<span class='line'> 14</span>         JSON.stringify(value, replacer, space)
+<span class='line'> 15</span>             value       any JavaScript value, usually an object or array.
+<span class='line'> 16</span> 
+<span class='line'> 17</span>             replacer    an optional parameter that determines how object
+<span class='line'> 18</span>                         values are stringified for objects. It can be a
+<span class='line'> 19</span>                         function or an array of strings.
+<span class='line'> 20</span> 
+<span class='line'> 21</span>             space       an optional parameter that specifies the indentation
+<span class='line'> 22</span>                         of nested structures. If it is omitted, the text will
+<span class='line'> 23</span>                         be packed without extra whitespace. If it is a number,
+<span class='line'> 24</span>                         it will specify the number of spaces to indent at each
+<span class='line'> 25</span>                         level. If it is a string (such as '\t' or '&nbsp;'),
+<span class='line'> 26</span>                         it contains the characters used to indent at each level.
+<span class='line'> 27</span> 
+<span class='line'> 28</span>             This method produces a JSON text from a JavaScript value.
+<span class='line'> 29</span> 
+<span class='line'> 30</span>             When an object value is found, if the object contains a toJSON
+<span class='line'> 31</span>             method, its toJSON method will be called and the result will be
+<span class='line'> 32</span>             stringified. A toJSON method does not serialize: it returns the
+<span class='line'> 33</span>             value represented by the name/value pair that should be serialized,
+<span class='line'> 34</span>             or undefined if nothing should be serialized. The toJSON method
+<span class='line'> 35</span>             will be passed the key associated with the value, and this will be
+<span class='line'> 36</span>             bound to the value
+<span class='line'> 37</span> 
+<span class='line'> 38</span>             For example, this would serialize Dates as ISO strings.
+<span class='line'> 39</span> 
+<span class='line'> 40</span>                 Date.prototype.toJSON = function (key) {
+<span class='line'> 41</span>                     function f(n) {
+<span class='line'> 42</span>                         // Format integers to have at least two digits.
+<span class='line'> 43</span>                         return n &lt; 10 ? '0' + n : n;
+<span class='line'> 44</span>                     }
+<span class='line'> 45</span> 
+<span class='line'> 46</span>                     return this.getUTCFullYear()   + '-' +
+<span class='line'> 47</span>                          f(this.getUTCMonth() + 1) + '-' +
+<span class='line'> 48</span>                          f(this.getUTCDate())      + 'T' +
+<span class='line'> 49</span>                          f(this.getUTCHours())     + ':' +
+<span class='line'> 50</span>                          f(this.getUTCMinutes())   + ':' +
+<span class='line'> 51</span>                          f(this.getUTCSeconds())   + 'Z';
+<span class='line'> 52</span>                 };
+<span class='line'> 53</span> 
+<span class='line'> 54</span>             You can provide an optional replacer method. It will be passed the
+<span class='line'> 55</span>             key and value of each member, with this bound to the containing
+<span class='line'> 56</span>             object. The value that is returned from your method will be
+<span class='line'> 57</span>             serialized. If your method returns undefined, then the member will
+<span class='line'> 58</span>             be excluded from the serialization.
+<span class='line'> 59</span> 
+<span class='line'> 60</span>             If the replacer parameter is an array of strings, then it will be
+<span class='line'> 61</span>             used to select the members to be serialized. It filters the results
+<span class='line'> 62</span>             such that only members with keys listed in the replacer array are
+<span class='line'> 63</span>             stringified.
+<span class='line'> 64</span> 
+<span class='line'> 65</span>             Values that do not have JSON representations, such as undefined or
+<span class='line'> 66</span>             functions, will not be serialized. Such values in objects will be
+<span class='line'> 67</span>             dropped; in arrays they will be replaced with null. You can use
+<span class='line'> 68</span>             a replacer function to replace those with JSON values.
+<span class='line'> 69</span>             JSON.stringify(undefined) returns undefined.
+<span class='line'> 70</span> 
+<span class='line'> 71</span>             The optional space parameter produces a stringification of the
+<span class='line'> 72</span>             value that is filled with line breaks and indentation to make it
+<span class='line'> 73</span>             easier to read.
+<span class='line'> 74</span> 
+<span class='line'> 75</span>             If the space parameter is a non-empty string, then that string will
+<span class='line'> 76</span>             be used for indentation. If the space parameter is a number, then
+<span class='line'> 77</span>             the indentation will be that many spaces.
+<span class='line'> 78</span> 
+<span class='line'> 79</span>             Example:
+<span class='line'> 80</span> 
+<span class='line'> 81</span>             text = JSON.stringify(['e', {pluribus: 'unum'}]);
+<span class='line'> 82</span>             // text is '["e",{"pluribus":"unum"}]'
+<span class='line'> 83</span> 
+<span class='line'> 84</span> 
+<span class='line'> 85</span>             text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+<span class='line'> 86</span>             // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+<span class='line'> 87</span> 
+<span class='line'> 88</span>             text = JSON.stringify([new Date()], function (key, value) {
+<span class='line'> 89</span>                 return this[key] instanceof Date ?
+<span class='line'> 90</span>                     'Date(' + this[key] + ')' : value;
+<span class='line'> 91</span>             });
+<span class='line'> 92</span>             // text is '["Date(---current time---)"]'
+<span class='line'> 93</span> 
+<span class='line'> 94</span> 
+<span class='line'> 95</span>         JSON.parse(text, reviver)
+<span class='line'> 96</span>             This method parses a JSON text to produce an object or array.
+<span class='line'> 97</span>             It can throw a SyntaxError exception.
+<span class='line'> 98</span> 
+<span class='line'> 99</span>             The optional reviver parameter is a function that can filter and
+<span class='line'>100</span>             transform the results. It receives each of the keys and values,
+<span class='line'>101</span>             and its return value is used instead of the original value.
+<span class='line'>102</span>             If it returns what it received, then the structure is not modified.
+<span class='line'>103</span>             If it returns undefined then the member is deleted.
+<span class='line'>104</span> 
+<span class='line'>105</span>             Example:
+<span class='line'>106</span> 
+<span class='line'>107</span>             // Parse the text. Values that look like ISO date strings will
+<span class='line'>108</span>             // be converted to Date objects.
+<span class='line'>109</span> 
+<span class='line'>110</span>             myData = JSON.parse(text, function (key, value) {
+<span class='line'>111</span>                 var a;
+<span class='line'>112</span>                 if (typeof value === 'string') {
+<span class='line'>113</span>                     a =
+<span class='line'>114</span> /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+<span class='line'>115</span>                     if (a) {
+<span class='line'>116</span>                         return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+<span class='line'>117</span>                             +a[5], +a[6]));
+<span class='line'>118</span>                     }
+<span class='line'>119</span>                 }
+<span class='line'>120</span>                 return value;
+<span class='line'>121</span>             });
+<span class='line'>122</span> 
+<span class='line'>123</span>             myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+<span class='line'>124</span>                 var d;
+<span class='line'>125</span>                 if (typeof value === 'string' &&
+<span class='line'>126</span>                         value.slice(0, 5) === 'Date(' &&
+<span class='line'>127</span>                         value.slice(-1) === ')') {
+<span class='line'>128</span>                     d = new Date(value.slice(5, -1));
+<span class='line'>129</span>                     if (d) {
+<span class='line'>130</span>                         return d;
+<span class='line'>131</span>                     }
+<span class='line'>132</span>                 }
+<span class='line'>133</span>                 return value;
+<span class='line'>134</span>             });
+<span class='line'>135</span> 
+<span class='line'>136</span> 
+<span class='line'>137</span>     This is a reference implementation. You are free to copy, modify, or
+<span class='line'>138</span>     redistribute.
+<span class='line'>139</span> 
+<span class='line'>140</span>     This code should be minified before deployment.
+<span class='line'>141</span>     See http://javascript.crockford.com/jsmin.html
+<span class='line'>142</span> 
+<span class='line'>143</span>     USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+<span class='line'>144</span>     NOT CONTROL.
+<span class='line'>145</span> */</span><span class="WHIT">
+<span class='line'>146</span> 
+<span class='line'>147</span> </span><span class="COMM">/*jslint evil: true */</span><span class="WHIT">
+<span class='line'>148</span> 
+<span class='line'>149</span> </span><span class="COMM">/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+<span class='line'>150</span>     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+<span class='line'>151</span>     getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+<span class='line'>152</span>     lastIndex, length, parse, prototype, push, replace, slice, stringify,
+<span class='line'>153</span>     test, toJSON, toString, valueOf
+<span class='line'>154</span> */</span><span class="WHIT">
+<span class='line'>155</span> 
+<span class='line'>156</span> </span><span class="STRN">"use strict"</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>157</span> 
+<span class='line'>158</span> </span><span class="COMM">// Create a JSON object only if one does not already exist. We create the</span><span class="WHIT">
+<span class='line'>159</span> </span><span class="COMM">// methods in a closure to avoid creating global variables.</span><span class="WHIT">
+<span class='line'>160</span> 
+<span class='line'>161</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">this.JSON</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>162</span> </span><span class="WHIT">    </span><span class="NAME">this.JSON</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>163</span> </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>164</span> 
+<span class='line'>165</span> </span><span class="PUNC">(</span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>166</span> 
+<span class='line'>167</span> </span><span class="WHIT">    </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">n</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>168</span> </span><span class="WHIT">        </span><span class="COMM">// Format integers to have at least two digits.</span><span class="WHIT">
+<span class='line'>169</span> </span><span class="WHIT">        </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">n</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NUMB">10</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'0'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">n</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">n</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>170</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>171</span> 
+<span class='line'>172</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">Date.prototype.toJSON</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>173</span> 
+<span class='line'>174</span> </span><span class="WHIT">        </span><span class="NAME">Date.prototype.toJSON</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">key</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>175</span> 
+<span class='line'>176</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">isFinite</span><span class="PUNC">(</span><span class="NAME">this.valueOf</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT">
+<span class='line'>177</span> </span><span class="WHIT">                   </span><span class="NAME">this.getUTCFullYear</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT">   </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'-'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>178</span> </span><span class="WHIT">                 </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">this.getUTCMonth</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'-'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>179</span> </span><span class="WHIT">                 </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">this.getUTCDate</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT">      </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'T'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>180</span> </span><span class="WHIT">                 </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">this.getUTCHours</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT">     </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">':'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>181</span> </span><span class="WHIT">                 </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">this.getUTCMinutes</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT">   </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">':'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>182</span> </span><span class="WHIT">                 </span><span class="NAME">f</span><span class="PUNC">(</span><span class="NAME">this.getUTCSeconds</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT">   </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'Z'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">null</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>183</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>184</span> 
+<span class='line'>185</span> </span><span class="WHIT">        </span><span class="NAME">String.prototype.toJSON</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT">
+<span class='line'>186</span> </span><span class="WHIT">        </span><span class="NAME">Number.prototype.toJSON</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT">
+<span class='line'>187</span> </span><span class="WHIT">        </span><span class="NAME">Boolean.prototype.toJSON</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">key</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>188</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.valueOf</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>189</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>190</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>191</span> 
+<span class='line'>192</span> </span><span class="WHIT">    </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">cx</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="REGX">/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>193</span> </span><span class="WHIT">        </span><span class="NAME">escapable</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="REGX">/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>194</span> </span><span class="WHIT">        </span><span class="NAME">gap</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>195</span> </span><span class="WHIT">        </span><span class="NAME">indent</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>196</span> </span><span class="WHIT">        </span><span class="NAME">meta</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">    </span><span class="COMM">// table of character substitutions</span><span class="WHIT">
+<span class='line'>197</span> </span><span class="WHIT">            </span><span class="STRN">'\b'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\b'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>198</span> </span><span class="WHIT">            </span><span class="STRN">'\t'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\t'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>199</span> </span><span class="WHIT">            </span><span class="STRN">'\n'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\n'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>200</span> </span><span class="WHIT">            </span><span class="STRN">'\f'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\f'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>201</span> </span><span class="WHIT">            </span><span class="STRN">'\r'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\r'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>202</span> </span><span class="WHIT">            </span><span class="STRN">'"'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\"'</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>203</span> </span><span class="WHIT">            </span><span class="STRN">'\\'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'\\\\'</span><span class="WHIT">
+<span class='line'>204</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>205</span> </span><span class="WHIT">        </span><span class="NAME">rep</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>206</span> 
+<span class='line'>207</span> 
+<span class='line'>208</span> </span><span class="WHIT">    </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="NAME">quote</span><span class="PUNC">(</span><span class="NAME">string</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>209</span> 
+<span class='line'>210</span> </span><span class="COMM">// If the string contains no control characters, no quote characters, and no</span><span class="WHIT">
+<span class='line'>211</span> </span><span class="COMM">// backslash characters, then we can safely slap some quotes around it.</span><span class="WHIT">
+<span class='line'>212</span> </span><span class="COMM">// Otherwise we must also replace the offending characters with safe escape</span><span class="WHIT">
+<span class='line'>213</span> </span><span class="COMM">// sequences.</span><span class="WHIT">
+<span class='line'>214</span> 
+<span class='line'>215</span> </span><span class="WHIT">        </span><span class="NAME">escapable.lastIndex</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>216</span> </span><span class="WHIT">        </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">escapable.test</span><span class="PUNC">(</span><span class="NAME">string</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT">
+<span class='line'>217</span> </span><span class="WHIT">            </span><span class="STRN">'"'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">string.replace</span><span class="PUNC">(</span><span class="NAME">escapable</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">a</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>218</span> </span><span class="WHIT">                </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">c</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">meta</span><span class="PUNC">[</span><span class="NAME">a</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>219</span> </span><span class="WHIT">                </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">c</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'string'</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NAME">c</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>220</span> </span><span class="WHIT">                    </span><span class="STRN">'\\u'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="STRN">'0000'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">a.charCodeAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toString</span><span class="PUNC">(</span><span class="NUMB">16</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">slice</span><span class="PUNC">(</span><span class="PUNC">-</span><span class="NUMB">4</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>221</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'"'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>222</span> </span><span class="WHIT">            </span><span class="STRN">'"'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">string</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'"'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>223</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>224</span> 
+<span class='line'>225</span> 
+<span class='line'>226</span> </span><span class="WHIT">    </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="NAME">str</span><span class="PUNC">(</span><span class="NAME">key</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">holder</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>227</span> </span><span class="COMM">// Produce a string from holder[key].</span><span class="WHIT">
+<span class='line'>228</span> 
+<span class='line'>229</span> </span><span class="WHIT">        </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">,</span><span class="WHIT">          </span><span class="COMM">// The loop counter.</span><span class="WHIT">
+<span class='line'>230</span> </span><span class="WHIT">            </span><span class="NAME">k</span><span class="PUNC">,</span><span class="WHIT">          </span><span class="COMM">// The member key.</span><span class="WHIT">
+<span class='line'>231</span> </span><span class="WHIT">            </span><span class="NAME">v</span><span class="PUNC">,</span><span class="WHIT">          </span><span class="COMM">// The member value.</span><span class="WHIT">
+<span class='line'>232</span> </span><span class="WHIT">            </span><span class="NAME">length</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>233</span> </span><span class="WHIT">            </span><span class="NAME">mind</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">gap</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>234</span> </span><span class="WHIT">            </span><span class="NAME">partial</span><span class="PUNC">,</span><span class="WHIT">
+<span class='line'>235</span> </span><span class="WHIT">            </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">holder</span><span class="PUNC">[</span><span class="NAME">key</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>236</span> 
+<span class='line'>237</span> </span><span class="COMM">// If the value has a toJSON method, call it to obtain a replacement value.</span><span class="WHIT">
+<span class='line'>238</span> 
+<span class='line'>239</span> </span><span class="WHIT">        </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT">
+<span class='line'>240</span> </span><span class="WHIT">                </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">value.toJSON</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>241</span> </span><span class="WHIT">            </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">value.toJSON</span><span class="PUNC">(</span><span class="NAME">key</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>242</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>243</span> 
+<span class='line'>244</span> </span><span class="COMM">// If we were called with a replacer function, then call the replacer to</span><span class="WHIT">
+<span class='line'>245</span> </span><span class="COMM">// obtain a replacement value.</span><span class="WHIT">
+<span class='line'>246</span> 
+<span class='line'>247</span> </span><span class="WHIT">        </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">rep</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>248</span> </span><span class="WHIT">            </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">rep.call</span><span class="PUNC">(</span><span class="NAME">holder</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">key</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>249</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>250</span> 
+<span class='line'>251</span> </span><span class="COMM">// What happens next depends on the value's type.</span><span class="WHIT">
+<span class='line'>252</span> 
+<span class='line'>253</span> </span><span class="WHIT">        </span><span class="KEYW">switch</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>254</span> </span><span class="WHIT">        </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'string'</span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>255</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">quote</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>256</span> 
+<span class='line'>257</span> </span><span class="WHIT">        </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'number'</span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>258</span> 
+<span class='line'>259</span> </span><span class="COMM">// JSON numbers must be finite. Encode non-finite numbers as null.</span><span class="WHIT">
+<span class='line'>260</span> 
+<span class='line'>261</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">isFinite</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NAME">String</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'null'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>262</span> 
+<span class='line'>263</span> </span><span class="WHIT">        </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'boolean'</span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>264</span> </span><span class="WHIT">        </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'null'</span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>265</span> 
+<span class='line'>266</span> </span><span class="COMM">// If the value is a boolean or null, convert it to a string. Note:</span><span class="WHIT">
+<span class='line'>267</span> </span><span class="COMM">// typeof null does not produce 'null'. The case is included here in</span><span class="WHIT">
+<span class='line'>268</span> </span><span class="COMM">// the remote chance that this gets fixed someday.</span><span class="WHIT">
+<span class='line'>269</span> 
+<span class='line'>270</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">String</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>271</span> 
+<span class='line'>272</span> </span><span class="COMM">// If the type is 'object', we might be dealing with an object or an array or</span><span class="WHIT">
+<span class='line'>273</span> </span><span class="COMM">// null.</span><span class="WHIT">
+<span class='line'>274</span> 
+<span class='line'>275</span> </span><span class="WHIT">        </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>276</span> 
+<span class='line'>277</span> </span><span class="COMM">// Due to a specification blunder in ECMAScript, typeof null is 'object',</span><span class="WHIT">
+<span class='line'>278</span> </span><span class="COMM">// so watch out for that case.</span><span class="WHIT">
+<span class='line'>279</span> 
+<span class='line'>280</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>281</span> </span><span class="WHIT">                </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="STRN">'null'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>282</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>283</span> 
+<span class='line'>284</span> </span><span class="COMM">// Make an array to hold the partial results of stringifying this object value.</span><span class="WHIT">
+<span class='line'>285</span> 
+<span class='line'>286</span> </span><span class="WHIT">            </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">indent</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>287</span> </span><span class="WHIT">            </span><span class="NAME">partial</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">[</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>288</span> 
+<span class='line'>289</span> </span><span class="COMM">// Is the value an array?</span><span class="WHIT">
+<span class='line'>290</span> 
+<span class='line'>291</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">Object.prototype.toString.apply</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'[object Array]'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>292</span> 
+<span class='line'>293</span> </span><span class="COMM">// The value is an array. Stringify every element. Use null as a placeholder</span><span class="WHIT">
+<span class='line'>294</span> </span><span class="COMM">// for non-JSON values.</span><span class="WHIT">
+<span class='line'>295</span> 
+<span class='line'>296</span> </span><span class="WHIT">                </span><span class="NAME">length</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">value.length</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>297</span> </span><span class="WHIT">                </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>298</span> </span><span class="WHIT">                    </span><span class="NAME">partial</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">str</span><span class="PUNC">(</span><span class="NAME">i</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="STRN">'null'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>299</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>300</span> 
+<span class='line'>301</span> </span><span class="COMM">// Join all of the elements together, separated with commas, and wrap them in</span><span class="WHIT">
+<span class='line'>302</span> </span><span class="COMM">// brackets.</span><span class="WHIT">
+<span class='line'>303</span> 
+<span class='line'>304</span> </span><span class="WHIT">                </span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">partial.length</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'[]'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>305</span> </span><span class="WHIT">                    </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'[\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>306</span> </span><span class="WHIT">                            </span><span class="NAME">partial.join</span><span class="PUNC">(</span><span class="STRN">',\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">gap</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>307</span> </span><span class="WHIT">                                </span><span class="NAME">mind</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">']'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>308</span> </span><span class="WHIT">                          </span><span class="STRN">'['</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">partial.join</span><span class="PUNC">(</span><span class="STRN">','</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">']'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>309</span> </span><span class="WHIT">                </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">mind</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>310</span> </span><span class="WHIT">                </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>311</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>312</span> 
+<span class='line'>313</span> </span><span class="COMM">// If the replacer is an array, use it to select the members to be stringified.</span><span class="WHIT">
+<span class='line'>314</span> 
+<span class='line'>315</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">rep</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">rep</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>316</span> </span><span class="WHIT">                </span><span class="NAME">length</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">rep.length</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>317</span> </span><span class="WHIT">                </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">length</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>318</span> </span><span class="WHIT">                    </span><span class="NAME">k</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">rep</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>319</span> </span><span class="WHIT">                    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">k</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'string'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>320</span> </span><span class="WHIT">                        </span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">str</span><span class="PUNC">(</span><span class="NAME">k</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>321</span> </span><span class="WHIT">                        </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">v</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>322</span> </span><span class="WHIT">                            </span><span class="NAME">partial.push</span><span class="PUNC">(</span><span class="NAME">quote</span><span class="PUNC">(</span><span class="NAME">k</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">': '</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">':'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>323</span> </span><span class="WHIT">                        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>324</span> </span><span class="WHIT">                    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>325</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>326</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT"> </span><span class="KEYW">else</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>327</span> 
+<span class='line'>328</span> </span><span class="COMM">// Otherwise, iterate through all of the keys in the object.</span><span class="WHIT">
+<span class='line'>329</span> 
+<span class='line'>330</span> </span><span class="WHIT">                </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">k</span><span class="WHIT"> </span><span class="KEYW">in</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>331</span> </span><span class="WHIT">                    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">Object.hasOwnProperty.call</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">k</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>332</span> </span><span class="WHIT">                        </span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">str</span><span class="PUNC">(</span><span class="NAME">k</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>333</span> </span><span class="WHIT">                        </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">v</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>334</span> </span><span class="WHIT">                            </span><span class="NAME">partial.push</span><span class="PUNC">(</span><span class="NAME">quote</span><span class="PUNC">(</span><span class="NAME">k</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">': '</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">':'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>335</span> </span><span class="WHIT">                        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>336</span> </span><span class="WHIT">                    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>337</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>338</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>339</span> 
+<span class='line'>340</span> </span><span class="COMM">// Join all of the member texts together, separated with commas,</span><span class="WHIT">
+<span class='line'>341</span> </span><span class="COMM">// and wrap them in braces.</span><span class="WHIT">
+<span class='line'>342</span> 
+<span class='line'>343</span> </span><span class="WHIT">            </span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">partial.length</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'{}'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT">
+<span class='line'>344</span> </span><span class="WHIT">                </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'{\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">partial.join</span><span class="PUNC">(</span><span class="STRN">',\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">gap</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'\n'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>345</span> </span><span class="WHIT">                        </span><span class="NAME">mind</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'}'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'{'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">partial.join</span><span class="PUNC">(</span><span class="STRN">','</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">'}'</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>346</span> </span><span class="WHIT">            </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">mind</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>347</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>348</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>349</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>350</span> 
+<span class='line'>351</span> </span><span class="COMM">// If the JSON object does not yet have a stringify method, give it one.</span><span class="WHIT">
+<span class='line'>352</span> 
+<span class='line'>353</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">JSON.stringify</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>354</span> </span><span class="WHIT">        </span><span class="NAME">JSON.stringify</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">replacer</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">space</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>355</span> </span><span class="COMM">// The stringify method takes a value and an optional replacer, and an optional</span><span class="WHIT">
+<span class='line'>356</span> </span><span class="COMM">// space parameter, and returns a JSON text. The replacer can be a function</span><span class="WHIT">
+<span class='line'>357</span> </span><span class="COMM">// that can replace values, or an array of strings that will select the keys.</span><span class="WHIT">
+<span class='line'>358</span> </span><span class="COMM">// A default replacer method can be provided. Use of the space parameter can</span><span class="WHIT">
+<span class='line'>359</span> </span><span class="COMM">// produce text that is more easily readable.</span><span class="WHIT">
+<span class='line'>360</span> 
+<span class='line'>361</span> </span><span class="WHIT">            </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>362</span> </span><span class="WHIT">            </span><span class="NAME">gap</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">''</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>363</span> </span><span class="WHIT">            </span><span class="NAME">indent</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">''</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>364</span> 
+<span class='line'>365</span> </span><span class="COMM">// If the space parameter is a number, make an indent string containing that</span><span class="WHIT">
+<span class='line'>366</span> </span><span class="COMM">// many spaces.</span><span class="WHIT">
+<span class='line'>367</span> 
+<span class='line'>368</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">space</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'number'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>369</span> </span><span class="WHIT">                </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">&lt;</span><span class="WHIT"> </span><span class="NAME">space</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>370</span> </span><span class="WHIT">                    </span><span class="NAME">indent</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">' '</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>371</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>372</span> 
+<span class='line'>373</span> </span><span class="COMM">// If the space parameter is a string, it will be used as the indent string.</span><span class="WHIT">
+<span class='line'>374</span> 
+<span class='line'>375</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT"> </span><span class="KEYW">else</span><span class="WHIT"> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">space</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'string'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>376</span> </span><span class="WHIT">                </span><span class="NAME">indent</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">space</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>377</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>378</span> 
+<span class='line'>379</span> </span><span class="COMM">// If there is a replacer, it must be a function or an array.</span><span class="WHIT">
+<span class='line'>380</span> </span><span class="COMM">// Otherwise, throw an error.</span><span class="WHIT">
+<span class='line'>381</span> 
+<span class='line'>382</span> </span><span class="WHIT">            </span><span class="NAME">rep</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">replacer</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>383</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">replacer</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">replacer</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT">
+<span class='line'>384</span> </span><span class="WHIT">                    </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">replacer</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT">
+<span class='line'>385</span> </span><span class="WHIT">                     </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">replacer.length</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'number'</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>386</span> </span><span class="WHIT">                </span><span class="KEYW">throw</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">Error</span><span class="PUNC">(</span><span class="STRN">'JSON.stringify'</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>387</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>388</span> 
+<span class='line'>389</span> </span><span class="COMM">// Make a fake root object containing our value under the key of ''.</span><span class="WHIT">
+<span class='line'>390</span> </span><span class="COMM">// Return the result of stringifying the value.</span><span class="WHIT">
+<span class='line'>391</span> 
+<span class='line'>392</span> </span><span class="WHIT">            </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">str</span><span class="PUNC">(</span><span class="STRN">''</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="STRN">''</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>393</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>394</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>395</span> 
+<span class='line'>396</span> 
+<span class='line'>397</span> </span><span class="COMM">// If the JSON object does not yet have a parse method, give it one.</span><span class="WHIT">
+<span class='line'>398</span> 
+<span class='line'>399</span> </span><span class="WHIT">    </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">JSON.parse</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>400</span> </span><span class="WHIT">        </span><span class="NAME">JSON.parse</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">text</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">reviver</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>401</span> 
+<span class='line'>402</span> </span><span class="COMM">// The parse method takes a text and an optional reviver function, and returns</span><span class="WHIT">
+<span class='line'>403</span> </span><span class="COMM">// a JavaScript value if the text is a valid JSON text.</span><span class="WHIT">
+<span class='line'>404</span> 
+<span class='line'>405</span> </span><span class="WHIT">            </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">j</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>406</span> 
+<span class='line'>407</span> </span><span class="WHIT">            </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="NAME">walk</span><span class="PUNC">(</span><span class="NAME">holder</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">key</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>408</span> 
+<span class='line'>409</span> </span><span class="COMM">// The walk method is used to recursively walk the resulting structure so</span><span class="WHIT">
+<span class='line'>410</span> </span><span class="COMM">// that modifications can be made.</span><span class="WHIT">
+<span class='line'>411</span> 
+<span class='line'>412</span> </span><span class="WHIT">                </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">k</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">holder</span><span class="PUNC">[</span><span class="NAME">key</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>413</span> </span><span class="WHIT">                </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">value</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>414</span> </span><span class="WHIT">                    </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">k</span><span class="WHIT"> </span><span class="KEYW">in</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>415</span> </span><span class="WHIT">                        </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">Object.hasOwnProperty.call</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">k</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>416</span> </span><span class="WHIT">                            </span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">walk</span><span class="PUNC">(</span><span class="NAME">value</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">k</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>417</span> </span><span class="WHIT">                            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">v</span><span class="WHIT"> </span><span class="PUNC">!==</span><span class="WHIT"> </span><span class="NAME">undefined</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>418</span> </span><span class="WHIT">                                </span><span class="NAME">value</span><span class="PUNC">[</span><span class="NAME">k</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">v</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>419</span> </span><span class="WHIT">                            </span><span class="PUNC">}</span><span class="WHIT"> </span><span class="KEYW">else</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>420</span> </span><span class="WHIT">                                </span><span class="KEYW">delete</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">[</span><span class="NAME">k</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>421</span> </span><span class="WHIT">                            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>422</span> </span><span class="WHIT">                        </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>423</span> </span><span class="WHIT">                    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>424</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>425</span> </span><span class="WHIT">                </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">reviver.call</span><span class="PUNC">(</span><span class="NAME">holder</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">key</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">value</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>426</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>427</span> 
+<span class='line'>428</span> 
+<span class='line'>429</span> </span><span class="COMM">// Parsing happens in four stages. In the first stage, we replace certain</span><span class="WHIT">
+<span class='line'>430</span> </span><span class="COMM">// Unicode characters with escape sequences. JavaScript handles many characters</span><span class="WHIT">
+<span class='line'>431</span> </span><span class="COMM">// incorrectly, either silently deleting them, or treating them as line endings.</span><span class="WHIT">
+<span class='line'>432</span> 
+<span class='line'>433</span> </span><span class="WHIT">            </span><span class="NAME">cx.lastIndex</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>434</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">cx.test</span><span class="PUNC">(</span><span class="NAME">text</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>435</span> </span><span class="WHIT">                </span><span class="NAME">text</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">text.replace</span><span class="PUNC">(</span><span class="NAME">cx</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">a</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>436</span> </span><span class="WHIT">                    </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="STRN">'\\u'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
+<span class='line'>437</span> </span><span class="WHIT">                        </span><span class="PUNC">(</span><span class="STRN">'0000'</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">a.charCodeAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toString</span><span class="PUNC">(</span><span class="NUMB">16</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">slice</span><span class="PUNC">(</span><span class="PUNC">-</span><span class="NUMB">4</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>438</span> </span><span class="WHIT">                </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>439</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>440</span> 
+<span class='line'>441</span> </span><span class="COMM">// In the second stage, we run the text against regular expressions that look</span><span class="WHIT">
+<span class='line'>442</span> </span><span class="COMM">// for non-JSON patterns. We are especially concerned with '()' and 'new'</span><span class="WHIT">
+<span class='line'>443</span> </span><span class="COMM">// because they can cause invocation, and '=' because it can cause mutation.</span><span class="WHIT">
+<span class='line'>444</span> </span><span class="COMM">// But just to be safe, we want to reject all unexpected forms.</span><span class="WHIT">
+<span class='line'>445</span> 
+<span class='line'>446</span> </span><span class="COMM">// We split the second stage into 4 regexp operations in order to work around</span><span class="WHIT">
+<span class='line'>447</span> </span><span class="COMM">// crippling inefficiencies in IE's and Safari's regexp engines. First we</span><span class="WHIT">
+<span class='line'>448</span> </span><span class="COMM">// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we</span><span class="WHIT">
+<span class='line'>449</span> </span><span class="COMM">// replace all simple value tokens with ']' characters. Third, we delete all</span><span class="WHIT">
+<span class='line'>450</span> </span><span class="COMM">// open brackets that follow a colon or comma or that begin the text. Finally,</span><span class="WHIT">
+<span class='line'>451</span> </span><span class="COMM">// we look to see that the remaining characters are only whitespace or ']' or</span><span class="WHIT">
+<span class='line'>452</span> </span><span class="COMM">// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.</span><span class="WHIT">
+<span class='line'>453</span> 
+<span class='line'>454</span> </span><span class="WHIT">            </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="REGX">/^[\],:{}\s]*$/</span><span class="PUNC">.</span><span class="WHIT">
+<span class='line'>455</span> </span><span class="NAME">test</span><span class="PUNC">(</span><span class="NAME">text.replace</span><span class="PUNC">(</span><span class="REGX">/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">'@'</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="WHIT">
+<span class='line'>456</span> </span><span class="NAME">replace</span><span class="PUNC">(</span><span class="REGX">/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">']'</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="WHIT">
+<span class='line'>457</span> </span><span class="NAME">replace</span><span class="PUNC">(</span><span class="REGX">/(?:^|:|,)(?:\s*\[)+/g</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">''</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
+<span class='line'>458</span> 
+<span class='line'>459</span> </span><span class="COMM">// In the third stage we use the eval function to compile the text into a</span><span class="WHIT">
+<span class='line'>460</span> </span><span class="COMM">// JavaScript structure. The '{' operator is subject to a syntactic ambiguity</span><span class="WHIT">
+<span class='line'>461</span> </span><span class="COMM">// in JavaScript: it can begin a block or an object literal. We wrap the text</span><span class="WHIT">
+<span class='line'>462</span> </span><span class="COMM">// in parens to eliminate the ambiguity.</span><span class="WHIT">
+<span class='line'>463</span> 
+<span class='line'>464</span> </span><span class="WHIT">                </span><span class="NAME">j</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">eval</span><span class="PUNC">(</span><span class="STRN">'('</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">text</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">')'</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>465</span> 
+<span class='line'>466</span> </span><span class="COMM">// In the optional fourth stage, we recursively walk the new structure, passing</span><span class="WHIT">
+<span class='line'>467</span> </span><span class="COMM">// each name/value pair to a reviver function for possible transformation.</span><span class="WHIT">
+<span class='line'>468</span> 
+<span class='line'>469</span> </span><span class="WHIT">                </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">reviver</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'function'</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT">
+<span class='line'>470</span> </span><span class="WHIT">                    </span><span class="NAME">walk</span><span class="PUNC">(</span><span class="PUNC">{</span><span class="STRN">''</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">j</span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="STRN">''</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">j</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>471</span> </span><span class="WHIT">            </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>472</span> 
+<span class='line'>473</span> </span><span class="COMM">// If the text is not JSON parseable, then a SyntaxError is thrown.</span><span class="WHIT">
+<span class='line'>474</span> 
+<span class='line'>475</span> </span><span class="WHIT">            </span><span class="KEYW">throw</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">SyntaxError</span><span class="PUNC">(</span><span class="STRN">'JSON.parse'</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>476</span> </span><span class="WHIT">        </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>477</span> </span><span class="WHIT">    </span><span class="PUNC">}</span><span class="WHIT">
+<span class='line'>478</span> </span><span class="PUNC">}</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
+<span class='line'>479</span> </span></pre></body></html>

examples/html/example_suite.html

@@ -0,0 +1,26 @@
+<!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>
+</head>
+<script type="text/javascript" src="../../lib/jasmine-0.9.0.js"></script>
+<script type="text/javascript" src="../../lib/TrivialReporter.js"></script>
+<link rel="stylesheet" type="text/css" href="../../lib/jasmine.css">
+
+<script type="text/javascript">
+  jasmine.include('spec/example_suite.js', true);
+</script>
+
+<body>
+
+<script type="text/javascript">
+  var jasmineEnv = jasmine.getEnv();
+  jasmineEnv.reporter = new jasmine.TrivialReporter();
+  jasmineEnv.execute();
+</script>
+
+</body>
+</html>
+
+

examples/ruby/Rakefile

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec/jasmine_helper.rb"))
+
+namespace :test do
+  desc "Run continuous integration tests"
+  require "spec"
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:ci) do |t|  
+    t.spec_opts = ["--color", "--format", "specdoc"]
+    t.spec_files = ["spec/jasmine_spec.rb"]
+  end
+end
+
+desc "Run specs via server"
+task :jasmine_server do
+  require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
+
+  puts "your tests are here:"
+  puts "  http://localhost:8888/run.html"
+
+  Jasmine::SimpleServer.start(8888,
+                              lambda { JasmineHelper.spec_file_urls },
+                              JasmineHelper.dir_mappings)
+end

examples/ruby/spec/example/example_spec.js

@@ -0,0 +1,11 @@
+describe('ExampleSuite', function () {
+  it('should have a passing test', function() {
+      expect(true).toEqual(true);
+  });
+
+  describe('Nested Describe', function () {
+     it('should also have a passing test', function () {
+        expect(true).toEqual(true);
+     });
+  });
+});

examples/ruby/spec/jasmine_helper.rb

@@ -0,0 +1,39 @@
+class JasmineHelper
+  def self.jasmine_lib_dir
+    File.expand_path(File.join(jasmine_root, 'lib'))
+  end
+
+  def self.jasmine_root  
+    File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+  end
+
+  def self.jasmine
+    ['/lib/' + File.basename(Dir.glob("#{JasmineHelper.jasmine_lib_dir}/jasmine*.js").first)] +
+      ['/lib/json2.js',
+     '/lib/TrivialReporter.js']
+  end
+
+  def self.jasmine_src_dir
+    File.expand_path(File.join(jasmine_root, 'src'))
+  end
+
+  def self.jasmine_spec_dir
+    File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec'))
+  end
+
+  def self.raw_spec_files
+    Dir.glob(File.join(jasmine_spec_dir, "**/*[Ss]pec.js"))
+  end
+
+  def self.spec_file_urls
+    raw_spec_files.collect {|f| f.sub(jasmine_spec_dir, "/spec")}
+  end
+
+  def self.dir_mappings
+    {
+            "/src" => jasmine_src_dir,
+            "/spec" => jasmine_spec_dir,
+            "/lib" => jasmine_lib_dir
+    }
+  end
+end

examples/ruby/spec/jasmine_spec.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require "selenium_rc"
+require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_helper.rb"))
+require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
+
+jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path,
+                                     JasmineHelper.spec_file_urls,
+                                     JasmineHelper.dir_mappings)
+
+spec_builder = Jasmine::SpecBuilder.new(JasmineHelper.raw_spec_files, jasmine_runner)
+
+should_stop = false
+
+Spec::Runner.configure do |config|
+  config.after(:suite) do
+    spec_builder.stop if should_stop
+  end
+end
+
+spec_builder.start
+should_stop = true
+spec_builder.declare_suites

lib/TrivialReporter.js

@@ -1,4 +1,6 @@
-jasmine.TrivialReporter = function() {
+jasmine.TrivialReporter = function(doc) {
+  this.document = doc || document;
+  this.suiteDivs = {};
 };
 
 jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
@@ -10,13 +12,15 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
     if (typeof child === 'string') {
       el.appendChild(document.createTextNode(child));
     } else {
-      el.appendChild(child);
+      if (child) { el.appendChild(child); }
     }
   }
 
   for (var attr in attrs) {
     if (attr == 'className') {
       el.setAttribute('class', attrs[attr]);
+      //twice for ie
+      el.setAttribute('className', attrs[attr]);
     } else {
       el[attr] = attrs[attr];
     }
@@ -25,23 +29,72 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
   return el;
 };
 
+jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
+  var suites = runner.suites();
+
+  this.runnerDiv = this.createDom('div', { className: 'runner running' },
+      this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
+      this.runnerMessageSpan = this.createDom('span', {}, "Running..."));
+  this.document.body.appendChild(this.runnerDiv);
+
+  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.getFullName()] = suiteDiv;
+    var parentDiv = this.document.body;
+    if (suite.parentSuite) {
+      parentDiv = this.suiteDivs[suite.parentSuite.getFullName()];
+    }
+    parentDiv.appendChild(suiteDiv);
+  }
+
+  this.startedAt = new Date();
+};
+
 jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
-  console.log(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);
 };
 
 jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
-  console.log(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.getFullName()].className += " " + status;
 };
 
 jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
-  var specDiv = this.createDom('div', {
-    className: spec.getResults().passed ? 'spec passed' : 'spec failed'
-  }, spec.getFullName());
+  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()) }, spec.getFullName()));
 
-  var resultItems = spec.getResults().getItems();
+
+  var resultItems = results.getItems();
   for (var i = 0; i < resultItems.length; i++) {
     var result = resultItems[i];
-    if (!result.passed) {
+    if (result.passed && !result.passed()) {
       var resultMessageDiv = this.createDom('div', {className: 'resultMessage fail'});
       resultMessageDiv.innerHTML = result.message; // todo: lame; mend
       specDiv.appendChild(resultMessageDiv);
@@ -49,13 +102,29 @@ jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
     }
   }
 
-  document.body.appendChild(specDiv);
+  this.suiteDivs[spec.suite.getFullName()].appendChild(specDiv);
 };
 
 jasmine.TrivialReporter.prototype.log = function() {
   console.log.apply(console, arguments);
 };
 
+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]);
+  }
+
+  if (!paramMap["spec"]) return true;
+  return spec.getFullName().indexOf(paramMap["spec"]) == 0;
+};
+
 //protect against console.log incidents
 if (!("console" in window) || !("firebug" in console)) {
   var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];

lib/example_suite.html

@@ -1,50 +0,0 @@
-<!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>
-</head>
-<script type="text/javascript" src="json2.js"></script>
-<script type="text/javascript" src="jasmine.js"></script>
-<script type="text/javascript" src="TrivialReporter.js"></script>
-
-<script type="text/javascript">
-  jasmine.include('example_suite.js', true);
-</script>
-
-<style type="text/css">
-  .spec {
-    margin: 5px;
-  }
-
-  .passed {
-    background-color: lightgreen;
-  }
-
-  .failed {
-    background-color: pink;
-  }
-
-  .resultMessage {
-    white-space: pre;
-  }
-
-  .stackTrace {
-    white-space: pre;
-    font-size: .8em;
-    margin-left: 10px;
-  }
-</style>
-
-<body>
-
-<script type="text/javascript">
-  var jasmineEnv = jasmine.getEnv();
-  jasmineEnv.reporter = new jasmine.TrivialReporter();
-  jasmineEnv.execute();
-</script>
-
-</body>
-</html>
-
-

lib/jasmine.css

@@ -1,51 +1,76 @@
 body {
-  font: 14px "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-  padding-left: 40px;
+  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
 }
 
-h1 {
-  padding-top: 20px;
-  font-weight: bold;
-  font: 24px; /* "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; */
+
+body .run_spec {
+  float:right; 
 }
 
-p {
-	margin-top: 5px;
-	padding-left: 20px;
+.runner.running {
+  background-color: yellow;
 }
 
-.fail {
-	background: url( ../images/fail-16.png ) no-repeat;
-  padding-left: 20px;
-	color: red;
+
+
+.runner {
+  border: 1px solid gray;
+  margin: 5px;
+  padding-left: 1em;
+  padding-right: 1em;
 }
 
-.fail_in_summary {
-  color: red;
+
+
+.suite {
+  border: 1px outset gray;
+  margin: 5px;
+  padding-left: 1em;
+}
+
+.suite.passed {
+  background-color: #cfc;
+}
+
+.suite.failed {
+  background-color: #fdd;
 }
 
 .spec {
   margin: 5px;
+  clear: both;
 }
 
 .passed {
-  background-color: lightgreen;
+  background-color: #cfc;
 }
 
 .failed {
-  background-color: pink;
+  background-color: #fdd;
 }
 
-.resultMessage {
-  white-space: pre;
+.skipped {
+  color: #777;
+  background-color: #eee;
 }
 
+/*.resultMessage {*/
+  /*white-space: pre;*/
+/*}*/
+
 .stackTrace {
   white-space: pre;
   font-size: .8em;
   margin-left: 10px;
   height: 5em;
   overflow: auto;
-  border-left: 1px solid red;
-  padding-left: 5em;
+  border: 1px inset red;
+  padding: 1em;
+  background: #eef;
 }
+
+
+#jasmine_content {
+  position:fixed;
+  left: 100%;
+}

lib/json2.js

@@ -1,6 +1,6 @@
 /*
     http://www.JSON.org/json2.js
-    2008-11-19
+    2009-08-17
 
     Public Domain.
 
@@ -33,7 +33,7 @@
             value represented by the name/value pair that should be serialized,
             or undefined if nothing should be serialized. The toJSON method
             will be passed the key associated with the value, and this will be
-            bound to the object holding the key.
+            bound to the value
 
             For example, this would serialize Dates as ISO strings.
 
@@ -146,8 +146,6 @@
 
 /*jslint evil: true */
 
-/*global JSON */
-
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
     getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
@@ -155,12 +153,15 @@
     test, toJSON, toString, valueOf
 */
 
+"use strict";
+
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
 if (!this.JSON) {
-    JSON = {};
+    this.JSON = {};
 }
+
 (function () {
 
     function f(n) {
@@ -172,12 +173,13 @@ if (!this.JSON) {
 
         Date.prototype.toJSON = function (key) {
 
-            return this.getUTCFullYear()   + '-' +
+            return isFinite(this.valueOf()) ?
+                   this.getUTCFullYear()   + '-' +
                  f(this.getUTCMonth() + 1) + '-' +
                  f(this.getUTCDate())      + 'T' +
                  f(this.getUTCHours())     + ':' +
                  f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
+                 f(this.getUTCSeconds())   + 'Z' : null;
         };
 
         String.prototype.toJSON =
@@ -222,7 +224,6 @@ if (!this.JSON) {
 
 
     function str(key, holder) {
-
 // Produce a string from holder[key].
 
         var i,          // The loop counter.
@@ -351,7 +352,6 @@ if (!this.JSON) {
 
     if (typeof JSON.stringify !== 'function') {
         JSON.stringify = function (value, replacer, space) {
-
 // The stringify method takes a value and an optional replacer, and an optional
 // space parameter, and returns a JSON text. The replacer can be a function
 // that can replace values, or an array of strings that will select the keys.
@@ -475,4 +475,4 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
             throw new SyntaxError('JSON.parse');
         };
     }
-})();
+}());

spec/jasmine_helper.rb

@@ -0,0 +1,40 @@
+class JasmineHelper
+  def self.jasmine_lib_dir
+    File.expand_path(File.join(jasmine_root, 'lib'))
+  end
+
+  def self.jasmine
+    ['/lib/' + File.basename(Dir.glob("#{JasmineHelper.jasmine_lib_dir}/jasmine*.js").first)] +
+      ['/lib/json2.js',
+     '/lib/TrivialReporter.js']
+  end
+
+def self.jasmine_root
+    File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  end
+
+
+  def self.jasmine_src_dir
+    File.expand_path(File.join(jasmine_root, 'src'))
+  end
+
+  def self.jasmine_spec_dir
+    File.expand_path(File.join(jasmine_root, 'spec'))
+  end
+
+  def self.raw_spec_files
+    Dir.glob(File.join(jasmine_spec_dir, "**/*[Ss]pec.js"))
+  end
+
+  def self.spec_file_urls
+    raw_spec_files.collect {|f| f.sub(jasmine_spec_dir, "/spec")}
+  end
+
+  def self.dir_mappings
+    {
+            "/src" => jasmine_src_dir,
+            "/spec" => jasmine_spec_dir,
+            "/lib" => jasmine_lib_dir
+    }
+  end
+end

spec/jasmine_spec.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require "selenium_rc"
+require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_helper.rb"))
+require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))
+
+jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path,
+                                     JasmineHelper.spec_file_urls,
+                                     JasmineHelper.dir_mappings)
+
+spec_builder = Jasmine::SpecBuilder.new(JasmineHelper.raw_spec_files, jasmine_runner)
+
+should_stop = false
+
+Spec::Runner.configure do |config|
+  config.after(:suite) do
+    spec_builder.stop if should_stop
+  end
+end
+
+spec_builder.start
+should_stop = true
+spec_builder.declare_suites

spec/runner.html

@@ -3,72 +3,74 @@
 <html>
 <head>
   <title>Jasmine Test Runner</title>
+
   <script type="text/javascript" src="../src/base.js"></script>
   <script type="text/javascript" src="../src/util.js"></script>
   <script type="text/javascript" src="../src/Env.js"></script>
-  <script type="text/javascript" src="../src/ActionCollection.js"></script>
   <script type="text/javascript" src="../src/Reporter.js"></script>
+  <script type="text/javascript" src="../src/Block.js"></script>
+  
+  <script type="text/javascript" src="../src/JsApiReporter.js"></script>
   <script type="text/javascript" src="../src/Matchers.js"></script>
+  <script type="text/javascript" src="../src/mock-timeout.js"></script>
   <script type="text/javascript" src="../src/MultiReporter.js"></script>
   <script type="text/javascript" src="../src/NestedResults.js"></script>
   <script type="text/javascript" src="../src/PrettyPrinter.js"></script>
-  <script type="text/javascript" src="../src/QueuedFunction.js"></script>
+  <script type="text/javascript" src="../src/Queue.js"></script>
   <script type="text/javascript" src="../src/Reporters.js"></script>
   <script type="text/javascript" src="../src/Runner.js"></script>
   <script type="text/javascript" src="../src/Spec.js"></script>
   <script type="text/javascript" src="../src/Suite.js"></script>
-  <script type="text/javascript" src="../src/mock-timeout.js"></script>
-
+  <script type="text/javascript" src="../src/version.json"></script>
+  <script type="text/javascript" src="../src/WaitsBlock.js"></script>
+  <script type="text/javascript" src="../src/WaitsForBlock.js"></script>
+  
   <script type="text/javascript" src="../lib/TrivialReporter.js"></script>
 
 
   <script type="text/javascript">
-    jasmine.include('suites/EnvTest.js', true);
-    jasmine.include('suites/ExceptionsTest.js', true);
-    jasmine.include('suites/MatchersTest.js', true);
-    jasmine.include('suites/MultiReporterTest.js', true);
-    jasmine.include('suites/NestedResultsTest.js', true);
-    jasmine.include('suites/PrettyPrintTest.js', true);
-    jasmine.include('suites/ReporterTest.js', true);
-    jasmine.include('suites/RunnerTest.js', true);
-    jasmine.include('suites/SpecRunningTest.js', true);
-    jasmine.include('suites/SpyTest.js', true);
+    (function () {
+      var suites = [
+        'suites/SpySpec.js',
+        'suites/JsApiReporterSpec.js',
+        'suites/RunnerSpec.js',
+        'suites/EnvSpec.js',
+        'suites/NestedResultsSpec.js',
+        'suites/ExceptionsSpec.js',
+        'suites/TrivialReporterSpec.js',
+        'suites/MatchersSpec.js',
+        'suites/QueueSpec.js',
+        'suites/ReporterSpec.js',
+        'suites/MultiReporterSpec.js',
+        'suites/PrettyPrintSpec.js',
+        'suites/SpecSpec.js',
+        'suites/SuiteSpec.js',
+        'suites/SpecRunningSpec.js',
+      ];
+      for (var i = 0; i < suites.length; i++) {
+        jasmine.include(suites[i], true);
+      }
+
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
+
+      var trivialReporter = new jasmine.TrivialReporter();
+
+      jasmineEnv.addReporter(trivialReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return trivialReporter.specFilter(spec);
+      };
+
+      window.onload = function() {
+        jasmineEnv.execute();
+      };
+    })();
   </script>
 
-  <style type="text/css">
-    .spec {
-      margin: 5px;
-    }
-
-    .passed {
-      background-color: lightgreen;
-    }
-
-    .failed {
-      background-color: pink;
-    }
-
-    .resultMessage {
-      white-space: pre;
-    }
-
-    .stackTrace {
-      white-space: pre;
-      font-size: .8em;
-      margin-left: 10px;
-    }
-  </style>
+  <link href="../lib/jasmine.css" rel="stylesheet"/>
 </head>
 
 <body>
-
-<script type="text/javascript">
-
-
-  var jasmineEnv = jasmine.getEnv();
-  jasmineEnv.addReporter(new jasmine.TrivialReporter());
-  jasmineEnv.execute();
-</script>
-
 </body>
 </html>

spec/suites/EnvSpec.js

@@ -0,0 +1,71 @@
+describe("jasmine.Env", function() {
+  var env;
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+  });
+
+  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("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
+        });
+
+      });
+    });
+
+    it("should allow reporters to be registered", function() {
+      env.addReporter(fakeReporter);
+      env.reporter.log("message");
+      expect(fakeReporter.log).wasCalledWith("message");
+    });
+  });
+});

spec/suites/EnvTest.js

@@ -1,17 +0,0 @@
-describe("jasmine.Env", function() {
-  describe("reporting", function() {
-    var env;
-    var fakeReporter;
-
-    beforeEach(function() {
-      env = new jasmine.Env();
-      fakeReporter = jasmine.createSpyObj("fakeReporter", ["log"]);
-    });
-
-    it("should allow reporters to be registered", function() {
-      env.addReporter(fakeReporter);
-      env.reporter.log("message");
-      expect(fakeReporter.log).wasCalledWith("message");
-    });
-  });
-});

spec/suites/ExceptionsSpec.js

@@ -3,6 +3,7 @@ describe('Exceptions:', function() {
 
   beforeEach(function() {
     env = new jasmine.Env();
+      env.updateInterval = 0;
   });
 
   it('jasmine.formatException formats Firefox exception maessages as expected', function() {
@@ -72,27 +73,35 @@ describe('Exceptions:', function() {
       });
     });
 
-    var runner = env.currentRunner;
+    var runner = env.currentRunner();
     suite.execute();
-    fakeTimer.tick(300); //TODO: setting this to a large number causes failures, but shouldn't
+    fakeTimer.tick(2500);
 
-    var resultsForSpec0 = suite.specs[0].getResults();
-    var resultsForSpec1 = suite.specs[1].getResults();
-    var resultsForSpec2 = suite.specs[2].getResults();
-    var resultsForSpec3 = suite.specs[3].getResults();
-    
-    expect(suite.getResults().totalCount).toEqual(6);
-    expect(resultsForSpec0.getItems()[0].passed).toEqual(false);
-    expect(resultsForSpec0.getItems()[0].message).toMatch(/fake error 1/);
+    var suiteResults = suite.results();
+    var specResults = suiteResults.getItems();
 
-    expect(resultsForSpec1.getItems()[0].passed).toEqual(false),
-    expect(resultsForSpec1.getItems()[0].message).toMatch(/fake error 2/),
-    expect(resultsForSpec1.getItems()[1].passed).toEqual(true);
+    expect(suiteResults.passed()).toEqual(false);
 
-    expect(resultsForSpec2.getItems()[0].passed).toEqual(true);
+    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);
+    var 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);
 
-    expect(resultsForSpec3.getItems()[0].passed).toEqual(false);
-    expect(resultsForSpec3.getItems()[0].message).toMatch(/fake error 3/);
   });
 
 });

spec/suites/JsApiReporterSpec.js

@@ -0,0 +1,82 @@
+describe('jasmine.jsApiReporter', function() {
+
+
+  describe('results', function () {
+    var reporter, spec1, spec2, spec3, expectedSpec1Results, expectedSpec2Results;
+
+    beforeEach(function() {
+      var env = new jasmine.Env();
+      env.updateInterval = 0;
+      var suite = new jasmine.Suite(env);
+      spec1 = new jasmine.Spec(env, suite, 'spec 1');
+      spec1.runs(function () {
+        this.expect(true).toEqual(true);
+      });
+      expectedSpec1Results = {
+        messages: spec1.results().getItems(),
+        result: "passed"
+      };
+      spec2 = new jasmine.Spec(env, suite, 'spec 2');
+      spec2.runs(function () {
+        this.expect(true).toEqual(false);
+      });
+      expectedSpec2Results = {
+        messages: spec2.results().getItems(),
+        result: "failed"
+      };
+
+      spec3 = new jasmine.Spec(env, suite, 'spec 3');
+      spec3.runs(function () {
+        this.log('some debug message')
+      });
+
+      spec1.execute();
+      spec2.execute();
+      spec3.execute();
+
+      reporter = new jasmine.JsApiReporter();
+      reporter.reportSpecResults(spec1);
+      reporter.reportSpecResults(spec2);
+      reporter.reportSpecResults(spec3);
+    });
+
+    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);
+    });
+
+    describe("#summarizeResult_", function() {
+      it("should summarize a passing result", function() {
+        var result = reporter.results()[spec1.id];
+        var summarizedResult = reporter.summarizeResult_(result);
+        expect(summarizedResult.result).toEqual('passed');
+        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('ExpectationResult');
+        expect(summarizedResult.messages[0].text).toEqual(undefined);
+        expect(summarizedResult.messages[0].trace.stack).toEqual(undefined);
+      });
+
+      it("should have a stack trace for failing specs", function() {
+        var result = reporter.results()[spec2.id];
+        var summarizedResult = reporter.summarizeResult_(result);
+        expect(summarizedResult.result).toEqual('failed');
+        expect(summarizedResult.messages[0].trace.stack).toEqual(result.messages[0].trace.stack);
+      });
+
+      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].text).toEqual('some debug message');
+      });
+    });
+  });
+});

spec/suites/MatchersSpec.js

@@ -3,6 +3,7 @@ describe("jasmine.Matchers", function() {
   
   beforeEach(function() {
     env = new jasmine.Env();
+    env.updateInterval = 0;
   });
   
   function match(value) {
@@ -12,8 +13,8 @@ describe("jasmine.Matchers", function() {
   function detailsFor(actual, matcherName, matcherArgs) {
     var matcher = match(actual);
     matcher[matcherName].apply(matcher, matcherArgs);
-    expect(matcher.getResults().getItems().length).toEqual(1);
-    return matcher.getResults().getItems()[0].details;
+    expect(matcher.results().getItems().length).toEqual(1);
+    return matcher.results().getItems()[0].details;
   }
 
   it("toEqual with primitives, objects, dates, html nodes, etc.", function() {
@@ -167,6 +168,18 @@ describe("jasmine.Matchers", function() {
     });
   });
 
+  it("toBeLessThan should pass if actual is less than expected", function() {
+    expect(match(37).toBeLessThan(42)).toEqual(true);
+    expect(match(37).toBeLessThan(-42)).toEqual(false);
+    expect(match(37).toBeLessThan(37)).toEqual(false);
+  });
+
+  it("toBeGreaterThan should pass if actual is greater than expected", function() {
+    expect(match(37).toBeGreaterThan(42)).toEqual(false);
+    expect(match(37).toBeGreaterThan(-42)).toEqual(true);
+    expect(match(37).toBeGreaterThan(37)).toEqual(false);
+  });
+
   it("toThrow", function() {
     var expected = new jasmine.Matchers(env, function() {
       throw new Error("Fake Error");
@@ -210,7 +223,7 @@ describe("jasmine.Matchers", function() {
 
     expected = match(TestClass.someFunction);
     expect(expected.wasCalledWith('c', 'b', 'a')).toEqual(false);
-    expect(expected.getResults().getItems()[0].passed).toEqual(false);
+    expect(expected.results().getItems()[0].passed()).toEqual(false);
 
     TestClass.someFunction.reset();
     TestClass.someFunction('a', 'b', 'c');
@@ -233,9 +246,9 @@ describe("jasmine.Matchers", function() {
 
     expect(results.getItems().length).toEqual(2);
 
-    expect(results.getItems()[0].passed).toEqual(true);
+    expect(results.getItems()[0].passed()).toEqual(true);
 
-    expect(results.getItems()[1].passed).toEqual(false);
+    expect(results.getItems()[1].passed()).toEqual(false);
 
     results = new jasmine.NestedResults();
     expected = new jasmine.Matchers(env, false, results);
@@ -285,17 +298,17 @@ describe("jasmine.Matchers", function() {
     expected = new jasmine.Matchers(env, [1, 2, 3], results);
     results.getItems().length = 0;
     expected.toEqual([1, 2, 3]);
-    expect(results.getItems()[0].passed).toEqual(true);
+    expect(results.getItems()[0].passed()).toEqual(true);
 
     expected = new jasmine.Matchers(env, [1, 2, 3], results);
     results.getItems().length = 0;
     expected.toEqual([{}, {}, {}]);
-    expect(results.getItems()[0].passed).toEqual(false);
+    expect(results.getItems()[0].passed()).toEqual(false);
 
     expected = new jasmine.Matchers(env, [{}, {}, {}], results);
     results.getItems().length = 0;
     expected.toEqual([1, 2, 3]);
-    expect(results.getItems()[0].passed).toEqual(false);
+    expect(results.getItems()[0].passed()).toEqual(false);
   });
 
 });

spec/suites/NestedResultsSpec.js

@@ -3,14 +3,14 @@ describe('jasmine.NestedResults', function() {
     // Leaf case
     var results = new jasmine.NestedResults();
 
-    results.addResult({passed: true, message: 'Passed.'});
+    results.addResult(new jasmine.ExpectationResult(true,'Passed.'));
 
     expect(results.getItems().length).toEqual(1);
     expect(results.totalCount).toEqual(1);
     expect(results.passedCount).toEqual(1);
     expect(results.failedCount).toEqual(0);
 
-    results.addResult({passed: false, message: 'FAIL.'});
+    results.addResult(new jasmine.ExpectationResult(false, 'FAIL.'));
 
     expect(results.getItems().length).toEqual(2);
     expect(results.totalCount).toEqual(2);
@@ -21,12 +21,12 @@ describe('jasmine.NestedResults', function() {
   it('should roll up counts for nested results', function() {
     // Branch case
     var leafResultsOne = new jasmine.NestedResults();
-    leafResultsOne.addResult({passed: true, message: ''});
-    leafResultsOne.addResult({passed: false, message: ''});
+    leafResultsOne.addResult(new jasmine.ExpectationResult( true, ''));
+    leafResultsOne.addResult(new jasmine.ExpectationResult( false, ''));
 
     var leafResultsTwo = new jasmine.NestedResults();
-    leafResultsTwo.addResult({passed: true, message: ''});
-    leafResultsTwo.addResult({passed: false, message: ''});
+    leafResultsTwo.addResult(new jasmine.ExpectationResult( true, ''));
+    leafResultsTwo.addResult(new jasmine.ExpectationResult( false, ''));
 
     var branchResults = new jasmine.NestedResults();
     branchResults.addResult(leafResultsOne);

spec/suites/PrettyPrintSpec.js

@@ -28,7 +28,8 @@ describe("jasmine.pp", function () {
   it("should stringify objects properly", function() {
     expect(jasmine.pp({foo: 'bar'})).toEqual("{ foo : 'bar' }");
     expect(jasmine.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: 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 ] }");
+    expect(jasmine.pp({foo: function () {
+    }, bar: [1, 2, 3]})).toEqual("{ foo : Function, bar : [ 1, 2, 3 ] }");
   });
 
   it("should indicate circular object references", function() {
@@ -39,8 +40,18 @@ describe("jasmine.pp", function () {
 
   it("should indicate getters on objects as such", function() {
     var sampleValue = {id: 1};
-    sampleValue.__defineGetter__('calculatedValue', function() { throw new Error("don't call me!"); });
-    expect(jasmine.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
+    if (sampleValue.__defineGetter__) {
+      //not supported in IE!
+      sampleValue.__defineGetter__('calculatedValue', function() {
+        throw new Error("don't call me!");
+      });
+    }
+    if (sampleValue.__defineGetter__) {
+      expect(jasmine.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
+    }
+    else {
+      expect(jasmine.pp(sampleValue)).toEqual("{ id : 1 }");
+    }
   });
 
   it("should stringify HTML nodes properly", function() {

spec/suites/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/suites/ReporterSpec.js

@@ -1,11 +1,13 @@
 describe('jasmine.Reporter', function() {
   var env;
 
+
   beforeEach(function() {
     env = new jasmine.Env();
+    env.updateInterval = 0;
   });
 
-  it('should ', function() {
+  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 () {
@@ -47,7 +49,7 @@ describe('jasmine.Reporter', function() {
       runnerCallback: runnerCallback
     });
 
-    var runner = env.currentRunner;
+    var runner = env.currentRunner();
     runner.execute();
 
     expect(foo).toEqual(3); // 'foo was expected to be 3, was ' + foo);

spec/suites/RunnerSpec.js

@@ -0,0 +1,258 @@
+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).wasNotCalled();
+      fakeTimer.tick(200);
+      //This blows up the JSApiReporter.
+      //expect(fakeReporter.reportRunnerResults).wasCalledWith(env.currentRunner);
+      expect(fakeReporter.reportRunnerResults).wasCalled();
+      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).wasNotCalled();
+    runner.execute();
+    expect(fakeReporter.reportRunnerStarting).wasCalled();
+    var reportedRunner = fakeReporter.reportRunnerStarting.mostRecentCall.args[0];
+    expect(reportedRunner.arbitraryVariable).toEqual('foo');
+    expect(runner.queue.start).wasCalled();
+
+  });
+
+  it("should return a flat array of all suites, including nested suites", function() {
+    var suite1, suite2;
+    suite1 = env.describe("spec 1", function() {
+      suite2 = env.describe("nested spec", function() {
+      });
+    });
+
+    document.runner = env.currentRunner();
+
+    var suites = env.currentRunner().suites();
+    var suiteDescriptions = [];
+    for (var i = 0; i < suites.length; i++) {
+      suiteDescriptions.push(suites[i].getFullName());
+    }
+    expect(suiteDescriptions).toEqual([suite1.getFullName(), suite2.getFullName()]);
+  });
+
+});

spec/suites/RunnerTest.js

@@ -1,126 +0,0 @@
-describe('RunnerTest', function() {
-  var env;
-  beforeEach(function () {
-    env = new jasmine.Env();
-  });
-
-  it('should be able to add a suite', function() {
-    env.describe('one suite description', function () {
-      env.it('should be a test');
-    });
-    expect(env.currentRunner.suites.length).toEqual(1); // "Runner expected one suite, got " + env.currentRunner.suites.length);
-  });
-
-  it('should be able to push multiple suites', function() {
-    env.describe('one suite description', function () {
-      env.it('should be a test');
-    });
-    env.describe('another suite description', function () {
-      env.it('should be a test');
-    });
-    expect(env.currentRunner.suites.length).toEqual(2); //"Runner expected two suites, but got " + env.currentRunner.suites.length);
-  });
-
-  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();
-
-    expect(env.currentRunner.suites.length).toEqual(2); // "Runner expected two suites, got " + env.currentRunner.suites.length);
-    expect(env.currentRunner.suites[0].specs[0].results.getItems()[0].passed).toEqual(true); //"Runner should have run specs in first suite");
-    expect(env.currentRunner.suites[1].specs[0].results.getItems()[0].passed).toEqual(false); //"Runner should have run specs in second suite");
-  });
-
-  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();
-
-    expect(env.currentRunner.suites.length).toEqual(1); // "Runner expected 1 suite, got " + env.currentRunner.suites.length);
-    expect(env.currentRunner.suites[0].specs[0].results.getItems()[0].passed).toEqual(false); // "Runner should have run specs in first suite");
-    expect(env.currentRunner.suites[1]).toEqual(undefined); // "Second suite should be undefined, but was " + reporter.toJSON(env.currentRunner.suites[1]));
-  });
-
-  it('should roll up results from all specs', function() {
-    var env = new jasmine.Env();
-    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.getResults();
-    expect(results.totalCount).toEqual(2);
-    expect(results.passedCount).toEqual(1);
-    expect(results.failedCount).toEqual(1);
-  });
-
-  it('should set the finished flag when #finished is called', function(){
-    env.currentRunner.finish();
-
-    expect(env.currentRunner.finished).toEqual(true);
-  });
-
-  it('should call the finish callback when the runner is finished', function() {
-    var foo = 0;
-
-    env.currentRunner.finishCallback = function() {
-      foo++;
-    };
-
-    env.currentRunner.finish();
-
-    expect(env.currentRunner.finished).toEqual(true);
-    expect(foo).toEqual(1);
-  });
-
-  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.execute();
-    expect(fakeReporter.reportRunnerStarting).wasCalledWith(env.currentRunner);
-  });
-
-});

spec/suites/SpecRunningSpec.js

@@ -4,6 +4,7 @@ describe("jasmine spec running", function () {
 
   beforeEach(function() {
     env = new jasmine.Env();
+    env.updateInterval = 0;
 
     fakeTimer = new jasmine.FakeTimer();
     env.setTimeout = fakeTimer.setTimeout;
@@ -38,6 +39,7 @@ describe("jasmine spec running", function () {
 
 
   it("should build up some objects with results we can inspect", function() {
+
     var specWithNoBody, specWithExpectation, specWithFailingExpectations, specWithMultipleExpectations;
 
     var suite = env.describe('default current suite', function() {
@@ -66,18 +68,18 @@ describe("jasmine spec running", function () {
 
     expect(specWithNoBody.description).toEqual('new spec');
 
-    expect(specWithExpectation.results.getItems().length).toEqual(1); // "Results aren't there after a spec was executed"
-    expect(specWithExpectation.results.getItems()[0].passed).toEqual(true); // "Results has a result, but it's true"
-    expect(specWithExpectation.results.description).toEqual('spec with an expectation'); // "Spec's results did not get the spec's description"
+    expect(specWithExpectation.results().getItems().length).toEqual(1); // "Results aren't there after a spec was executed"
+    expect(specWithExpectation.results().getItems()[0].passed()).toEqual(true); // "Results has a result, but it's true"
+    expect(specWithExpectation.results().description).toEqual('spec with an expectation'); // "Spec's results did not get the spec's description"
 
-    expect(specWithFailingExpectations.results.getItems()[0].passed).toEqual(false); // "Expectation that failed, passed"
+    expect(specWithFailingExpectations.results().getItems()[0].passed()).toEqual(false); // "Expectation that failed, passed"
 
-    expect(specWithMultipleExpectations.results.getItems().length).toEqual(2); // "Spec doesn't support multiple expectations"
+    expect(specWithMultipleExpectations.results().getItems().length).toEqual(2); // "Spec doesn't support multiple expectations"
   });
 
   it("should work without a runs block", function() {
     var another_spec;
-    var currentSuite = env.describe('default current suite', function() {
+    env.describe('default current suite', function() {
       another_spec = env.it('spec with an expectation', function () {
         var foo = 'bar';
         this.expect(foo).toEqual('bar');
@@ -88,38 +90,45 @@ describe("jasmine spec running", function () {
     another_spec.execute();
     another_spec.done = true;
 
-    expect(another_spec.results.getItems().length).toEqual(2);
-    expect(another_spec.results.getItems()[0].passed).toEqual(true); // "In a spec without a run block, expected first expectation result to be true but was false"
-    expect(another_spec.results.getItems()[1].passed).toEqual(false); // "In a spec without a run block, expected second expectation result to be false but was true";
-    expect(another_spec.results.description).toEqual('spec with an expectation'); // "In a spec without a run block, results did not include the spec's description";
+    expect(another_spec.results().getItems().length).toEqual(2);
+    expect(another_spec.results().getItems()[0].passed()).toEqual(true); // "In a spec without a run block, expected first expectation result to be true but was false"
+    expect(another_spec.results().getItems()[1].passed()).toEqual(false); // "In a spec without a run block, expected second expectation result to be false but was true";
+    expect(another_spec.results().description).toEqual('spec with an expectation'); // "In a spec without a run block, results did not include the spec's description";
+  });
+
+  it('should queue waits and runs that it encounters while executing specs', function() {
+    var specWithRunsAndWaits;
+    var foo = 0;
+    env.describe('test async spec', function() {
+      specWithRunsAndWaits = env.it('spec w/ queued statments', function () {
+        this.runs(function () {
+          foo++;
+        });
+        this.waits(500);
+        this.runs(function () {
+          foo++;
+        });
+        this.waits(500);
+        this.runs(function () {
+          foo++;
+        });
+      });
+    });
+
+    expect(foo).toEqual(0);
+    specWithRunsAndWaits.execute();
+
+    expect(foo).toEqual(1);
+    fakeTimer.tick(500);
+    expect(foo).toEqual(2);
+    fakeTimer.tick(500);
+    expect(foo).toEqual(3);
   });
 
   it("should run asynchronous tests", function () {
     var foo = 0;
 
-    //set a bogus suite for the spec to attach to
-    //    jasmine.getEnv().currentSuite = {specs: []};
-
     var a_spec;
-    env.describe('test async spec', function() {
-      a_spec = env.it('simple queue test', function () {
-        this.runs(function () {
-          foo++;
-        });
-        this.runs(function () {
-          this.expect(foo).toEqual(1);
-        });
-      });
-    });
-
-    expect(a_spec.queue.length).toEqual(1,
-      'Expected spec queue length to be 1, was ' + a_spec.queue.length);
-
-    a_spec.execute();
-    expect(a_spec.queue.length).toEqual(3,
-      'Expected spec queue length to be 3, was ' + a_spec.queue.length);
-
-    foo = 0;
     env.describe('test async spec', function() {
       a_spec = env.it('spec w/ queued statments', function () {
         this.runs(function () {
@@ -133,8 +142,8 @@ describe("jasmine spec running", function () {
 
     a_spec.execute();
 
-    expect(a_spec.results.getItems().length).toEqual(1); // 'No call to waits(): Spec queue did not run all functions';
-    expect(a_spec.results.getItems()[0].passed).toEqual(true); // 'No call to waits(): Queued expectation failed';
+    expect(a_spec.results().getItems().length).toEqual(1); // 'No call to waits(): Spec queue did not run all functions';
+    expect(a_spec.results().getItems()[0].passed()).toEqual(true); // 'No call to waits(): Queued expectation failed';
 
     foo = 0;
     env.describe('test async spec', function() {
@@ -152,15 +161,16 @@ describe("jasmine spec running", function () {
     });
 
     a_spec.execute();
-    expect(a_spec.results.getItems().length).toEqual(0);
+
+    expect(a_spec.results().getItems().length).toEqual(0);
 
     fakeTimer.tick(500);
-    expect(a_spec.results.getItems().length).toEqual(0);
+    expect(a_spec.results().getItems().length).toEqual(0);
 
     fakeTimer.tick(500);
-    expect(a_spec.results.getItems().length).toEqual(1); // 'Calling waits(): Spec queue did not run all functions';
+    expect(a_spec.results().getItems().length).toEqual(1); // 'Calling waits(): Spec queue did not run all functions';
 
-    expect(a_spec.results.getItems()[0].passed).toEqual(true); // 'Calling waits(): Queued expectation failed';
+    expect(a_spec.results().getItems()[0].passed()).toEqual(true); // 'Calling waits(): Queued expectation failed';
 
     var bar = 0;
     var another_spec;
@@ -185,16 +195,13 @@ describe("jasmine spec running", function () {
       });
     });
 
-    expect(another_spec.queue.length).toEqual(1); // 'Calling 2 waits(): Expected queue length to be 1, got ' + another_spec.queue.length;
 
     another_spec.execute();
 
     fakeTimer.tick(1000);
-    expect(another_spec.queue.length).toEqual(4); // 'Calling 2 waits(): Expected queue length to be 4, got ' + another_spec.queue.length;
 
-    expect(another_spec.results.getItems().length).toEqual(1); // 'Calling 2 waits(): Spec queue did not run all functions';
-
-    expect(another_spec.results.getItems()[0].passed).toEqual(true); // 'Calling 2 waits(): Queued expectation failed';
+    expect(another_spec.results().getItems().length).toEqual(1);
+    expect(another_spec.results().getItems()[0].passed()).toEqual(true);
 
     var baz = 0;
     var yet_another_spec;
@@ -214,11 +221,13 @@ describe("jasmine spec running", function () {
 
 
     yet_another_spec.execute();
-    fakeTimer.tick(250);
+    //tick twice so that second runs gets eval'd first: mockClock bug?
+    fakeTimer.tick(100);
+    fakeTimer.tick(150);
 
-    expect(yet_another_spec.queue.length).toEqual(3); // 'Calling 2 waits(): Expected queue length to be 3, got ' + another_spec.queue.length);
-    expect(yet_another_spec.results.getItems().length).toEqual(1); // 'Calling 2 waits(): Spec queue did not run all functions');
-    expect(yet_another_spec.results.getItems()[0].passed).toEqual(false); // 'Calling 2 waits(): Queued expectation failed');
+
+    expect(yet_another_spec.results().getItems().length).toEqual(1);
+    expect(yet_another_spec.results().getItems()[0].passed()).toEqual(false);
   });
 
   it("testAsyncSpecsWithMockSuite", function () {
@@ -246,9 +255,8 @@ describe("jasmine spec running", function () {
 
     another_spec.execute();
     fakeTimer.tick(2000);
-    expect(another_spec.queue.length).toEqual(4); // 'Calling 2 waits(): Expected queue length to be 4, got ' + another_spec.queue.length);
-    expect(another_spec.results.getItems().length).toEqual(1); // 'Calling 2 waits(): Spec queue did not run all functions');
-    expect(another_spec.results.getItems()[0].passed).toEqual(true); // 'Calling 2 waits(): Queued expectation failed');
+    expect(another_spec.results().getItems().length).toEqual(1);
+    expect(another_spec.results().getItems()[0].passed()).toEqual(true);
   });
 
   it("testWaitsFor", function() {
@@ -297,12 +305,12 @@ describe("jasmine spec running", function () {
 
     spec.execute();
     fakeTimer.tick(1000);
-    var actual = spec.results.getItems()[0].message;
+    var actual = spec.results().getItems()[0].message;
     var expected = 'timeout: timed out after 500 msec waiting for my awesome condition';
     expect(actual).toEqual(expected);
   });
 
-  it("testWaitsForFailsIfTimeout", function() {
+  it("waitsFor fails and skips the rest of the spec if timeout is reached and the latch function is still false", function() {
     var runsBlockExecuted = false;
 
     var spec;
@@ -312,7 +320,7 @@ describe("jasmine spec running", function () {
         });
 
         this.waitsFor(500, function() {
-          return false; // force a timeout
+          return false;
         });
 
         this.runs(function() {
@@ -322,15 +330,15 @@ describe("jasmine spec running", function () {
     });
 
     spec.execute();
-    expect(runsBlockExecuted).toEqual(false, 'should not have executed runs block yet');
+    expect(runsBlockExecuted).toEqual(false);
     fakeTimer.tick(100);
-    expect(runsBlockExecuted).toEqual(false, 'should not have executed runs block yet');
+    expect(runsBlockExecuted).toEqual(false);
     fakeTimer.tick(400);
-    expect(runsBlockExecuted).toEqual(false, 'should have timed out, so the second runs block should not have been called');
-    var actual = spec.results.getItems()[0].message;
+    expect(runsBlockExecuted).toEqual(false);
+    var actual = spec.results().getItems()[0].message;
     var expected = 'timeout: timed out after 500 msec waiting for something to happen';
     expect(actual).toEqual(expected,
-        'expected "' + expected + '" but found "' + actual + '"');
+      'expected "' + expected + '" but found "' + actual + '"');
   });
 
   it("testSpecAfter", function() {
@@ -351,38 +359,18 @@ describe("jasmine spec running", function () {
     });
 
     suite.execute();
-    expect(log).toEqual("specafter2after1"); // "after function should be executed in reverse order after spec runs");
+
+    expect(log).toEqual("specafter2after1");
   });
 
   describe('test suite declaration', function() {
     var suite;
-    var dummyFunction = function() {};
+    var dummyFunction = function() {
+    };
 
     it('should give the suite a description', function() {
       suite = env.describe('one suite description', dummyFunction);
-      expect(suite.description).toEqual('one suite description'); // 'Suite did not get a description');
-    });
-
-    it('should add tests to suites declared by the passed function', function() {
-      suite = env.describe('one suite description', function () {
-        env.it('should be a test');
-      });
-
-      expect(suite.specs.length).toEqual(1); // 'Suite did not get a spec pushed');
-      expect(suite.specs[0].queue.length).toEqual(0); // "Suite's Spec should not have queuedFunctions");
-    });
-
-    it('should enqueue functions for multipart tests', function() {
-      suite = env.describe('one suite description', function () {
-        env.it('should be a test with queuedFunctions', function() {
-          this.runs(function() {
-            var foo = 0;
-            foo++;
-          });
-        });
-      });
-
-      expect(suite.specs[0].queue.length).toEqual(1); // "Suite's spec did not get a function pushed");
+      expect(suite.description).toEqual('one suite description');
     });
 
     it('should enqueue functions for multipart tests and support waits, and run any ready runs() blocks', function() {
@@ -401,9 +389,8 @@ describe("jasmine spec running", function () {
         });
       });
 
-      expect(suite.specs[0].queue.length).toEqual(1); // "Suite's spec length should have been 1, was " + suite.specs[0].queue.length);
       suite.execute();
-      expect(suite.specs[0].queue.length).toEqual(3); // "Suite's spec length should have been 3, was " + suite.specs[0].queue.length);
+
       expect(foo).toEqual(1);
       expect(bar).toEqual(0);
 
@@ -414,7 +401,6 @@ describe("jasmine spec running", function () {
   });
 
   it("testBeforeAndAfterCallbacks", function () {
-
     var suiteWithBefore = env.describe('one suite with a before', function () {
 
       this.beforeEach(function () {
@@ -437,42 +423,364 @@ describe("jasmine spec running", function () {
     });
 
     suiteWithBefore.execute();
-    var suite = suiteWithBefore;
-    expect(suite.beforeEachFunction); // "testBeforeAndAfterCallbacks: Suite's beforeEach was not defined");
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(true); // "testBeforeAndAfterCallbacks: the first spec's foo should have been 2");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true); // "testBeforeAndAfterCallbacks: the second spec's this.foo should have been 2");
 
+    var suite = suiteWithBefore;
+
+    expect(suite.results().getItems()[0].passed()).toEqual(true); // "testBeforeAndAfterCallbacks: the first spec's foo should have been 2");
+    expect(suite.results().getItems()[1].passed()).toEqual(true); // "testBeforeAndAfterCallbacks: the second spec's this.foo should have been 2");
+
+
+    var foo = 1;
     var suiteWithAfter = env.describe('one suite with an after_each', function () {
 
       env.it('should be a spec with an after_each', function () {
-        this.runs(function() {
-          this.foo = 0;
-          this.foo++;
-          this.expect(this.foo).toEqual(1);
-        });
+        this.expect(foo).toEqual(1);
+        foo++;
+        this.expect(foo).toEqual(2);
       });
 
       env.it('should be another spec with an after_each', function () {
-        this.runs(function() {
-          this.foo = 0;
-          this.foo++;
-          this.expect(this.foo).toEqual(1);
-        });
+        this.expect(foo).toEqual(0);
+        foo++;
+        this.expect(foo).toEqual(1);
       });
 
       this.afterEach(function () {
-        this.foo = 0;
+        foo = 0;
       });
     });
 
     suiteWithAfter.execute();
-    var suite = suiteWithAfter;
-    expect(suite.afterEachFunction); // "testBeforeAndAfterCallbacks: Suite's afterEach was not defined");
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(true); // "testBeforeAndAfterCallbacks: afterEach failure: " + suite.results.getItems()[0].results[0].message);
-    expect(suite.specs[0].foo).toEqual(0); // "testBeforeAndAfterCallbacks: afterEach failure: foo was not reset to 0");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true); // "testBeforeAndAfterCallbacks: afterEach failure: " + suite.results.getItems()[0].results[0].message);
-    expect(suite.specs[1].foo).toEqual(0); // "testBeforeAndAfterCallbacks: afterEach failure: foo was not reset to 0");
 
+    suite = suiteWithAfter;
+    expect(suite.afterEach.length).toEqual(1);
+    expect(suite.results().getItems()[0].passed()).toEqual(true);
+    expect(suite.results().getItems()[1].passed()).toEqual(true);
+    expect(foo).toEqual(0);
+
+  });
+
+  it('#waits should allow consecutive waits calls', function () {
+    var foo = 0;
+    var waitsSuite = env.describe('suite that waits', function () {
+      env.it('should wait', function() {
+        this.waits(500);
+        this.waits(500);
+        this.runs(function () {
+          foo++;
+        });
+      });
+    });
+
+    waitsSuite.execute();
+    expect(foo).toEqual(0);
+    fakeTimer.tick(500);
+    expect(foo).toEqual(0);
+    fakeTimer.tick(500);
+
+    expect(foo).toEqual(1);
+  });
+
+  it('nested suites', function () {
+
+    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();
+
+    expect(foo).toEqual(1);
+    expect(bar).toEqual(1);
+    expect(baz).toEqual(1);
+    expect(quux).toEqual(1);
+  });
+
+  describe('#waitsFor should allow consecutive calls', function () {
+
+    var foo;
+    beforeEach(function () {
+
+      foo = 0;
+    });
+
+    it('exits immediately (does not stack) if the latchFunction times out', function () {
+      var reachedFirstWaitsFor = false;
+      var reachedSecondWaitsFor = false;
+      var waitsSuite = env.describe('suite that waits', function () {
+        env.it('should stack timeouts', function() {
+          this.waitsFor(500, function () {
+            reachedFirstWaitsFor = true;
+            return false;
+          });
+          this.waitsFor(500, function () {
+            reachedSecondWaitsFor = true;
+          });
+          this.runs(function () {
+            foo++;
+          });
+        });
+      });
+
+      expect(reachedFirstWaitsFor).toEqual(false);
+      waitsSuite.execute();
+
+      expect(reachedFirstWaitsFor).toEqual(true);
+      expect(foo).toEqual(0);
+      expect(reachedSecondWaitsFor).toEqual(false);
+      fakeTimer.tick(500);
+      expect(reachedSecondWaitsFor).toEqual(false);
+      expect(foo).toEqual(0);
+      fakeTimer.tick(500);
+      expect(reachedSecondWaitsFor).toEqual(false);
+      expect(foo).toEqual(0);
+    });
+
+    it('stacks latchFunctions', function () {
+      var firstWaitsResult = false;
+      var secondWaitsResult = false;
+      var waitsSuite = env.describe('suite that waits', function () {
+        env.it('spec with waitsFors', function() {
+          this.waitsFor(600, function () {
+            fakeTimer.setTimeout(function () {
+              firstWaitsResult = true;
+            }, 300);
+            return firstWaitsResult;
+          });
+          this.waitsFor(600, function () {
+            fakeTimer.setTimeout(function () {
+              secondWaitsResult = true;
+            }, 300);
+            return secondWaitsResult;
+          });
+          this.runs(function () {
+            foo++;
+          });
+        });
+      });
+
+      expect(firstWaitsResult).toEqual(false);
+      expect(secondWaitsResult).toEqual(false);
+      waitsSuite.execute();
+
+      expect(firstWaitsResult).toEqual(false);
+      expect(secondWaitsResult).toEqual(false);
+      expect(foo).toEqual(0);
+
+      fakeTimer.tick(300);
+
+      expect(firstWaitsResult).toEqual(true);
+      expect(secondWaitsResult).toEqual(false);
+      expect(foo).toEqual(0);
+
+      fakeTimer.tick(300);
+
+      expect(firstWaitsResult).toEqual(true);
+      expect(secondWaitsResult).toEqual(true);
+      expect(foo).toEqual(1);
+
+    });
+  });
+
+  it("#beforeEach should be able to eval runs and waits blocks", function () {
+    var foo = 0;
+    var bar = 0;
+    var suiteWithBefore = env.describe('one suite with a before', function () {
+      this.beforeEach(function () {
+        this.runs(function () {
+          foo++;
+        });
+        this.waits(500);
+        this.runs(function () {
+          foo++;
+        });
+        this.waits(500);
+      });
+
+      env.it('should be a spec', function () {
+        bar = 1;
+        foo++;
+      });
+
+    });
+
+    expect(foo).toEqual(0);
+    expect(bar).toEqual(0);
+    suiteWithBefore.execute();
+
+    expect(bar).toEqual(0);
+    expect(foo).toEqual(1);
+    fakeTimer.tick(500);
+
+    expect(bar).toEqual(0);
+    expect(foo).toEqual(2);
+    fakeTimer.tick(500);
+    expect(bar).toEqual(1);
+    expect(foo).toEqual(3);
+  });
+
+  it("#afterEach should be able to eval runs and waits blocks", function () {
+    var foo = 0;
+    var firstSpecHasRun = false;
+    var secondSpecHasRun = false;
+    var suiteWithAfter = env.describe('one suite with a before', function () {
+      this.afterEach(function () {
+        this.waits(500);
+        this.runs(function () {
+          foo++;
+        });
+        this.waits(500);
+      });
+
+      env.it('should be the first spec', function () {
+        firstSpecHasRun = true;
+      });
+
+      env.it('should be a spec', function () {
+        secondSpecHasRun = true;
+        foo++;
+      });
+
+    });
+
+    expect(firstSpecHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+    expect(foo).toEqual(0);
+
+    suiteWithAfter.execute();
+
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(secondSpecHasRun).toEqual(false);
+    expect(foo).toEqual(0);
+
+    fakeTimer.tick(500);
+
+    expect(foo).toEqual(1);
+    expect(secondSpecHasRun).toEqual(false);
+    fakeTimer.tick(500);
+
+    expect(foo).toEqual(2);
+    expect(secondSpecHasRun).toEqual(true);
+
+  });
+
+  it("Spec#after should be able to eval runs and waits blocks", function () {
+    var runsBeforeAfter = false;
+    var firstSpecHasRun = false;
+    var secondSpecHasRun = false;
+    var afterHasRun = false;
+    var suiteWithAfter = env.describe('one suite with a before', function () {
+
+      env.it('should be the first spec', function () {
+        firstSpecHasRun = true;
+        this.after(function () {
+          this.waits(500);
+          this.runs(function () {
+            afterHasRun = true;
+          });
+          this.waits(500);
+        }, true);
+        this.waits(500);
+        this.runs(function () {
+          runsBeforeAfter = true;
+        });
+      });
+
+      env.it('should be a spec', function () {
+        secondSpecHasRun = true;
+      });
+
+    });
+
+    expect(firstSpecHasRun).toEqual(false);
+    expect(runsBeforeAfter).toEqual(false);
+    expect(afterHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+
+    suiteWithAfter.execute();
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(runsBeforeAfter).toEqual(false);
+    expect(afterHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+
+    fakeTimer.tick(500);
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(runsBeforeAfter).toEqual(true);
+    expect(afterHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+
+    fakeTimer.tick(500);
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(runsBeforeAfter).toEqual(true);
+    expect(afterHasRun).toEqual(true);
+    expect(secondSpecHasRun).toEqual(false);
+
+    fakeTimer.tick(500);
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(runsBeforeAfter).toEqual(true);
+    expect(afterHasRun).toEqual(true);
+    expect(secondSpecHasRun).toEqual(true);
+  });
+
+  it("handles waits", function () {
+    var firstSpecHasRun = false;
+    var secondSpecHasRun = false;
+    var suiteWithAfter = env.describe('one suite with a before', function () {
+
+      env.it('should be the first spec', function () {
+        this.waits(500);
+        this.runs(function () {
+          firstSpecHasRun = true;
+        });
+      });
+
+      env.it('should be a spec', function () {
+        secondSpecHasRun = true;
+      });
+
+    });
+
+    expect(firstSpecHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+
+    suiteWithAfter.execute();
+
+    expect(firstSpecHasRun).toEqual(false);
+    expect(secondSpecHasRun).toEqual(false);
+
+    fakeTimer.tick(500);
+
+    expect(firstSpecHasRun).toEqual(true);
+    expect(secondSpecHasRun).toEqual(true);
   });
 
   it("testBeforeExecutesSafely", function() {
@@ -501,12 +809,10 @@ describe("jasmine spec running", function () {
 
     suite.execute();
 
-    expect(report).toEqual("firstsecond"); // "both tests should run");
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(false); // "1st spec should fail");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true); // "2nd spec should pass");
-
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(false); // "1st spec should fail");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true); // "2nd spec should pass");
+    expect(report).toEqual("firstsecond");
+    var suiteResults = suite.results();
+    expect(suiteResults.getItems()[0].getItems()[0].passed()).toEqual(false);
+    expect(suiteResults.getItems()[1].getItems()[0].passed()).toEqual(true);
   });
 
   it("testAfterExecutesSafely", function() {
@@ -543,20 +849,30 @@ describe("jasmine spec running", function () {
 
     expect(report).toEqual("firstsecondthird"); // "all tests should run");
     //After each errors should not go in spec results because it confuses the count.
-    expect(suite.specs.length).toEqual(3, 'testAfterExecutesSafely should have results for three specs');
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 1st spec should pass");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 2nd spec should pass");
-    expect(suite.specs[2].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 3rd spec should pass");
+    var suiteResults = suite.results();
+    expect(suiteResults.getItems().length).toEqual(3, 'testAfterExecutesSafely should have results for three specs');
 
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 1st result for 1st suite spec should pass");
-    expect(suite.specs[0].results.getItems()[1].passed).toEqual(false, "testAfterExecutesSafely 2nd result for 1st suite spec should fail because afterEach failed");
-    expect(suite.specs[1].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 2nd suite spec should pass");
-    expect(suite.specs[2].results.getItems()[0].passed).toEqual(true, "testAfterExecutesSafely 3rd suite spec should pass");
+    expect(suiteResults.getItems()[0].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 1st spec should pass");
+    expect(suiteResults.getItems()[1].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 2nd spec should pass");
+    expect(suiteResults.getItems()[2].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 3rd spec should pass");
+
+    expect(suiteResults.getItems()[0].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 1st result for 1st suite spec should pass");
+    expect(suiteResults.getItems()[0].getItems()[1].passed()).toEqual(false, "testAfterExecutesSafely 2nd result for 1st suite spec should fail because afterEach failed");
+    expect(suiteResults.getItems()[1].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 2nd suite spec should pass");
+    expect(suiteResults.getItems()[2].getItems()[0].passed()).toEqual(true, "testAfterExecutesSafely 3rd suite spec should pass");
   });
 
   it("testNestedDescribes", function() {
     var actions = [];
 
+    env.beforeEach(function () {
+      actions.push('runner beforeEach');
+    });
+
+    env.afterEach(function () {
+      actions.push('runner afterEach');
+    });
+
     env.describe('Something', function() {
       env.beforeEach(function() {
         actions.push('outer beforeEach');
@@ -605,28 +921,37 @@ describe("jasmine spec running", function () {
 
     env.execute();
 
+
     var expected = [
+      "runner beforeEach",
       "outer beforeEach",
       "outer it 1",
       "outer afterEach",
+      "runner afterEach",
 
+      "runner beforeEach",
       "outer beforeEach",
       "inner 1 beforeEach",
       "inner 1 it",
       "inner 1 afterEach",
       "outer afterEach",
+      "runner afterEach",
 
+      "runner beforeEach",
       "outer beforeEach",
       "outer it 2",
       "outer afterEach",
+      "runner afterEach",
 
+      "runner beforeEach",
       "outer beforeEach",
       "inner 2 beforeEach",
       "inner 2 it",
       "inner 2 afterEach",
-      "outer afterEach"
+      "outer afterEach",
+      "runner afterEach"
     ];
-    expect(env.equals_(actions, expected)).toEqual(true); // "nested describes order failed: <blockquote>" + jasmine.pp(actions) + "</blockquote> wanted <blockquote>" + jasmine.pp(expected) + "</blockquote");
+    expect(actions).toEqual(expected);
   });
 
   it("builds up nested names", function() {
@@ -634,7 +959,8 @@ describe("jasmine spec running", function () {
     env.describe('Test Subject', function() {
       env.describe('when under circumstance A', function() {
         env.describe('and circumstance B', function() {
-          nestedSpec = env.it('behaves thusly', function() {});
+          nestedSpec = env.it('behaves thusly', function() {
+          });
         });
       });
     });
@@ -642,10 +968,40 @@ describe("jasmine spec running", function () {
     expect(nestedSpec.getFullName()).toEqual('Test Subject when under circumstance A and circumstance B behaves thusly.'); //, "Spec.fullName was incorrect: " + nestedSpec.getFullName());
   });
 
+  it("should skip empty suites", function () {
+    env.describe('NonEmptySuite1', function() {
+      env.it('should pass', function() {
+        this.expect(true).toEqual(true);
+      });
+      env.describe('NestedEmptySuite', function() {
+      });
+      env.it('should pass', function() {
+        this.expect(true).toEqual(true);
+      });
+    });
+
+    env.describe('EmptySuite', function() {
+    });
+
+    env.describe('NonEmptySuite2', function() {
+      env.it('should pass', function() {
+        this.expect(true).toEqual(true);
+      });
+    });
+
+    env.execute();
+
+    var runnerResults = env.currentRunner_.results();
+    expect(runnerResults.totalCount).toEqual(3);
+    expect(runnerResults.passedCount).toEqual(3);
+    expect(runnerResults.failedCount).toEqual(0);
+  });
+
   it("should bind 'this' to the running spec within the spec body", function() {
+    var spec;
     var suite = env.describe('one suite description', function () {
       env.it('should be a test with queuedFunctions', function() {
-        this.runs(function() {
+        spec = this.runs(function() {
           this.foo = 0;
           this.foo++;
         });
@@ -672,11 +1028,11 @@ describe("jasmine spec running", function () {
 
     suite.execute();
     fakeTimer.tick(600);
-
-    expect(suite.specs[0].foo).toEqual(2); // "Spec does not maintain scope in between functions");
-    expect(suite.specs[0].results.getItems().length).toEqual(2); // "Spec did not get results for all expectations");
-    expect(suite.specs[0].results.getItems()[0].passed).toEqual(false); // "Spec did not return false for a failed expectation");
-    expect(suite.specs[0].results.getItems()[1].passed).toEqual(true); // "Spec did not return true for a passing expectation");
+    expect(spec.foo).toEqual(2);
+    var suiteResults = suite.results();
+    expect(suiteResults.getItems()[0].getItems().length).toEqual(2);
+    expect(suiteResults.getItems()[0].getItems()[0].passed()).toEqual(false);
+    expect(suiteResults.getItems()[0].getItems()[1].passed()).toEqual(true);
   });
 
   it("shouldn't run disabled tests", function() {
@@ -693,7 +1049,6 @@ describe("jasmine spec running", function () {
     });
 
     suite.execute();
-    expect(suite.specs.length).toEqual(1);
     expect(xitSpecWasRun).toEqual(false);
   });
 
@@ -740,7 +1095,7 @@ describe("jasmine spec running", function () {
       });
 
       spec1 = env.it('spec with an expectation').runs(function () {
-        this.addMatchers( { matcherForSpec: function(expected) {
+        this.addMatchers({ matcherForSpec: function(expected) {
           return "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
         } });
         spec1Matcher = this.expect("xxx");

spec/suites/SpecSpec.js

@@ -0,0 +1,110 @@
+describe('Spec', function () {
+  var env, suite;
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+    suite = new jasmine.Suite(env, 'suite 1');
+  });
+
+  describe('initialization', function () {
+
+    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('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');
+      }
+    });
+
+    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('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);
+      });
+    });
+
+
+    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);
+    });
+
+    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);
+      });
+    });
+  });
+});

spec/suites/SuiteSpec.js

@@ -0,0 +1,101 @@
+describe('Suite', 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('Specs', function () {
+    it('#specs should return all immediate children that are specs.', function () {
+      var 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);
+          });
+        });
+      });
+
+      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');
+    });
+
+    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.specCount()).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.specCount()).toEqual(3);
+      });
+    });
+  });
+});

spec/suites/TrivialReporterSpec.js

@@ -0,0 +1,35 @@
+describe("TrivialReporter", function() {
+  var trivialReporter;
+  var body;
+
+  beforeEach(function() {
+    body = document.createElement("body");
+  });
+
+  function fakeSpec(name) {
+    return {
+      getFullName: function() { return name; }
+    };
+  }
+
+  it("should run only specs beginning with spec parameter", function() {
+    trivialReporter = new jasmine.TrivialReporter({ location: {search: "?spec=run%20this"} });
+    expect(trivialReporter.specFilter(fakeSpec("run this"))).toBeTruthy();
+    expect(trivialReporter.specFilter(fakeSpec("not the right spec"))).toBeFalsy();
+    expect(trivialReporter.specFilter(fakeSpec("not run this"))).toBeFalsy();
+  });
+
+  it("should display empty divs for every suite when the runner is starting", function() {
+    trivialReporter = new jasmine.TrivialReporter({ body: body });
+    trivialReporter.reportRunnerStarting({
+      suites: function() {
+        return [ new jasmine.Suite({}, "suite 1", null, null) ];
+      }
+    });
+
+    var divs = body.getElementsByTagName("div");
+    expect(divs.length).toEqual(2);
+    expect(divs[1].innerHTML).toContain("suite 1");
+  });
+  
+});

src/ActionCollection.js

@@ -1,92 +0,0 @@
-/**
- * base for Runner & Suite: allows for a queue of functions to get executed, allowing for
- *   any one action to complete, including asynchronous calls, before going to the next
- *   action.
- *
- * @constructor
- * @param {jasmine.Env} env
- */
-jasmine.ActionCollection = function(env) {
-  this.env = env;
-  this.actions = [];
-  this.index = 0;
-  this.finished = false;
-};
-
-/**
- * Marks the collection as done & calls the finish callback, if there is one
- */
-jasmine.ActionCollection.prototype.finish = function() {
-  if (this.finishCallback) {
-    this.finishCallback();
-  }
-  this.finished = true;
-};
-
-/**
- * Starts executing the queue of functions/actions.
- */
-jasmine.ActionCollection.prototype.execute = function() {
-  if (this.actions.length > 0) {
-    this.next();
-  }
-};
-
-/**
- * Gets the current action.
- */
-jasmine.ActionCollection.prototype.getCurrentAction = function() {
-  return this.actions[this.index];
-};
-
-/**
- * Executes the next queued function/action. If there are no more in the queue, calls #finish.
- */
-jasmine.ActionCollection.prototype.next = function() {
-  if (this.index >= this.actions.length) {
-    this.finish();
-    return;
-  }
-
-  var currentAction = this.getCurrentAction();
-
-  currentAction.execute(this);
-
-  if (currentAction.afterCallbacks) {
-    for (var i = 0; i < currentAction.afterCallbacks.length; i++) {
-      try {
-        currentAction.afterCallbacks[i]();
-      } catch (e) {
-        alert(e);
-      }
-    }
-  }
-
-  this.waitForDone(currentAction);
-};
-
-jasmine.ActionCollection.prototype.waitForDone = function(action) {
-  var self = this;
-  var afterExecute = function afterExecute() {
-    self.index++;
-    self.next();
-  };
-
-  if (action.finished) {
-    var now = new Date().getTime();
-    if (this.env.updateInterval && now - this.env.lastUpdate > this.env.updateInterval) {
-      this.env.lastUpdate = now;
-      this.env.setTimeout(afterExecute, 0);
-    } else {
-      afterExecute();
-    }
-    return;
-  }
-
-  var id = this.env.setInterval(function() {
-    if (action.finished) {
-      self.env.clearInterval(id);
-      afterExecute();
-    }
-  }, 150);
-};

src/Block.js

@@ -0,0 +1,22 @@
+/**
+ * Blocks are functions with executable code that make up a spec.
+ *
+ * @constructor
+ * @param {jasmine.Env} env
+ * @param {Function} func
+ * @param {jasmine.Spec} spec
+ */
+jasmine.Block = function(env, func, spec) {
+  this.env = env;
+  this.func = func;
+  this.spec = spec;
+};
+
+jasmine.Block.prototype.execute = function(onComplete) {  
+  try {
+    this.func.apply(this.spec);
+  } catch (e) {
+    this.spec.fail(e);
+  }
+  onComplete();
+};

src/Env.js

@@ -6,12 +6,12 @@
 jasmine.Env = function() {
   this.currentSpec = null;
   this.currentSuite = null;
-  this.currentRunner = new jasmine.Runner(this);
+  this.currentRunner_ = new jasmine.Runner(this);
   this.currentlyRunningTests = false;
 
   this.reporter = new jasmine.MultiReporter();
 
-  this.updateInterval = 0;
+  this.updateInterval = jasmine.UPDATE_INTERVAL
   this.lastUpdate = 0;
   this.specFilter = function() {
     return true;
@@ -28,6 +28,31 @@ jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout;
 jasmine.Env.prototype.setInterval = jasmine.setInterval;
 jasmine.Env.prototype.clearInterval = jasmine.clearInterval;
 
+/**
+ * @returns an object containing jasmine version build info, if set.
+ */
+jasmine.Env.prototype.version = function () {
+  if (jasmine.version_) {
+    return jasmine.version_;
+  } else {
+    throw new Error('Version not set');
+  }
+};
+
+/**
+ * @returns a sequential integer starting at 0
+ */
+jasmine.Env.prototype.nextSpecId = function () {
+  return this.nextSpecId_++;
+};
+
+/**
+ * @returns a sequential integer starting at 0
+ */
+jasmine.Env.prototype.nextSuiteId = function () {
+  return this.nextSuiteId_++;
+};
+
 /**
  * Register a reporter to receive status updates from Jasmine.
  * @param {jasmine.Reporter} reporter An object which will receive status updates.
@@ -37,7 +62,7 @@ jasmine.Env.prototype.addReporter = function(reporter) {
 };
 
 jasmine.Env.prototype.execute = function() {
-  this.currentRunner.execute();
+  this.currentRunner_.execute();
 };
 
 jasmine.Env.prototype.describe = function(description, specDefinitions) {
@@ -45,9 +70,9 @@ jasmine.Env.prototype.describe = function(description, specDefinitions) {
 
   var parentSuite = this.currentSuite;
   if (parentSuite) {
-    parentSuite.specs.push(suite);
+    parentSuite.add(suite);
   } else {
-    this.currentRunner.suites.push(suite);
+    this.currentRunner_.add(suite);
   }
 
   this.currentSuite = suite;
@@ -60,11 +85,24 @@ jasmine.Env.prototype.describe = function(description, specDefinitions) {
 };
 
 jasmine.Env.prototype.beforeEach = function(beforeEachFunction) {
-  this.currentSuite.beforeEach(beforeEachFunction);
+  if (this.currentSuite) {
+    this.currentSuite.beforeEach(beforeEachFunction);
+  } else {
+    this.currentRunner_.beforeEach(beforeEachFunction);
+  }
+};
+
+jasmine.Env.prototype.currentRunner = function () {
+  return this.currentRunner_;
 };
 
 jasmine.Env.prototype.afterEach = function(afterEachFunction) {
-  this.currentSuite.afterEach(afterEachFunction);
+  if (this.currentSuite) {
+    this.currentSuite.afterEach(afterEachFunction);
+  } else {
+    this.currentRunner_.afterEach(afterEachFunction);
+  }
+
 };
 
 jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
@@ -76,11 +114,11 @@ jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
 
 jasmine.Env.prototype.it = function(description, func) {
   var spec = new jasmine.Spec(this, this.currentSuite, description);
-  this.currentSuite.specs.push(spec);
+  this.currentSuite.add(spec);
   this.currentSpec = spec;
 
   if (func) {
-    spec.addToQueue(func);
+    spec.runs(func);
   }
 
   return spec;
@@ -88,7 +126,7 @@ jasmine.Env.prototype.it = function(description, func) {
 
 jasmine.Env.prototype.xit = function(desc, func) {
   return {
-    id: this.nextSpecId_++,
+    id: this.nextSpecId(),
     runs: function() {
     }
   };

src/JsApiReporter.js

@@ -5,36 +5,48 @@
 jasmine.JsApiReporter = function() {
   this.started = false;
   this.finished = false;
-  this.suites = [];
-  this.results = {};
+  this.suites_ = [];
+  this.results_ = {};
 };
 
 jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
   this.started = true;
-
-  for (var i = 0; i < runner.suites.length; i++) {
-    var suite = runner.suites[i];
-    this.suites.push(this.summarize_(suite));
+  var suites = runner.suites();
+  for (var i = 0; i < suites.length; i++) {
+    var suite = suites[i];
+    this.suites_.push(this.summarize_(suite));
   }
 };
 
+jasmine.JsApiReporter.prototype.suites = function() {
+  return this.suites_;
+};
+
 jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
+  var isSuite = suiteOrSpec instanceof jasmine.Suite
   var summary = {
     id: suiteOrSpec.id,
     name: suiteOrSpec.description,
-    type: suiteOrSpec instanceof jasmine.Suite ? 'suite' : 'spec',
+    type: isSuite ? 'suite' : 'spec',
     children: []
   };
-
-  if (suiteOrSpec.specs) {
-    for (var i = 0; i < suiteOrSpec.specs.length; i++) {
-      summary.children.push(this.summarize_(suiteOrSpec.specs[i]));
+  if (isSuite) {
+    var specs = suiteOrSpec.specs();
+    for (var i = 0; i < specs.length; i++) {
+      summary.children.push(this.summarize_(specs[i]));
     }
   }
-
   return summary;
 };
 
+jasmine.JsApiReporter.prototype.results = function() {
+  return this.results_;
+};
+
+jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) {
+  return this.results_[specId];
+};
+
 //noinspection JSUnusedLocalSymbols
 jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) {
   this.finished = true;
@@ -46,9 +58,9 @@ jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) {
 
 //noinspection JSUnusedLocalSymbols
 jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
-  this.results[spec.id] = {
-    messages: spec.results.getItems(),
-    result: spec.results.failedCount > 0 ? "failed" : "passed"
+  this.results_[spec.id] = {
+    messages: spec.results().getItems(),
+    result: spec.results().failedCount > 0 ? "failed" : "passed"
   };
 };
 
@@ -56,3 +68,35 @@ jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
 jasmine.JsApiReporter.prototype.log = function(str) {
 };
 
+jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
+  var results = {};
+  for (var i = 0; i < specIds.length; i++) {
+    var specId = specIds[i];
+    results[specId] = this.summarizeResult_(this.results_[specId]);
+  }
+  return results;
+};
+
+jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
+  var summaryMessages = [];
+  for (var messageIndex in result.messages) {
+    var resultMessage = result.messages[messageIndex];
+    summaryMessages.push({
+      text: resultMessage.text,
+      passed: resultMessage.passed ? resultMessage.passed() : true,
+      type: resultMessage.type,
+      message: resultMessage.message,
+      trace: {
+        stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : undefined
+      }
+    });
+  };
+
+  var summaryResult = {
+    result : result.result,
+    messages : summaryMessages
+  };
+
+  return summaryResult;
+};
+

src/Matchers.js

@@ -2,19 +2,24 @@ jasmine.Matchers = function(env, actual, results) {
   this.env = env;
   this.actual = actual;
   this.passing_message = 'Passed.';
-  this.results = results || new jasmine.NestedResults();
+  this.results_ = results || new jasmine.NestedResults();
 };
 
 jasmine.Matchers.pp = function(str) {
   return jasmine.util.htmlEscape(jasmine.pp(str));
 };
 
+/** @deprecated */
 jasmine.Matchers.prototype.getResults = function() {
-  return this.results;
+  return this.results_;
+};
+
+jasmine.Matchers.prototype.results = function() {
+  return this.results_;
 };
 
 jasmine.Matchers.prototype.report = function(result, failing_message, details) {
-  this.results.addResult(new jasmine.ExpectationResult(result, result ? this.passing_message : failing_message, details));
+  this.results_.addResult(new jasmine.ExpectationResult(result, result ? this.passing_message : failing_message, details));
   return result;
 };
 
@@ -216,6 +221,16 @@ jasmine.Matchers.prototype.toNotContain = function(item) {
     'Expected ' + jasmine.Matchers.pp(this.actual) + ' not to contain ' + jasmine.Matchers.pp(item) + ', but it does.');
 };
 
+jasmine.Matchers.prototype.toBeLessThan = function(expected) {
+  return this.report(this.actual < expected,
+    'Expected ' + jasmine.Matchers.pp(this.actual) + ' to be less than ' + jasmine.Matchers.pp(expected) + ', but it was not.');
+};
+
+jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
+  return this.report(this.actual > expected,
+    'Expected ' + jasmine.Matchers.pp(this.actual) + ' to be greater than ' + jasmine.Matchers.pp(expected) + ', but it was not.');
+};
+
 /**
  * Matcher that checks that the expected exception was thrown by the actual.
  *

src/NestedResults.js

@@ -62,7 +62,7 @@ jasmine.NestedResults.prototype.addResult = function(result) {
       this.rollupCounts(result);
     } else {
       this.totalCount++;
-      if (result.passed) {
+      if (result.passed()) {
         this.passedCount++;
       } else {
         this.failedCount++;
@@ -75,6 +75,6 @@ jasmine.NestedResults.prototype.addResult = function(result) {
 /**
  * @returns {Boolean} True if <b>everything</b> below passed
  */
-jasmine.NestedResults.prototype.__defineGetter__('passed', function() {
+jasmine.NestedResults.prototype.passed = function() {
   return this.passedCount === this.totalCount;
-});
+};

src/PrettyPrinter.js

@@ -56,7 +56,7 @@ jasmine.PrettyPrinter.prototype.format = function(value) {
 jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
   for (var property in obj) {
     if (property == '__Jasmine_been_here_before__') continue;
-    fn(property, obj.__lookupGetter__(property) != null);
+    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) != null) : false);
   }
 };
 

src/Queue.js

@@ -0,0 +1,94 @@
+jasmine.Queue = function(env) {
+  this.env = env;
+  this.blocks = [];
+  this.running = false;
+  this.index = 0;
+  this.offset = 0;
+};
+
+jasmine.Queue.prototype.addBefore = function(block) {
+  this.blocks.unshift(block);
+};
+
+jasmine.Queue.prototype.add = function(block) {
+  this.blocks.push(block);
+};
+
+jasmine.Queue.prototype.insertNext = function(block) {
+  this.blocks.splice((this.index + this.offset + 1), 0, block);
+  this.offset++;
+};
+
+jasmine.Queue.prototype.start = function(onComplete) {
+  this.running = true;
+  this.onComplete = onComplete;
+  this.next_();
+};
+
+jasmine.Queue.prototype.isRunning = function() {
+  return this.running;
+};
+
+jasmine.Queue.LOOP_DONT_RECURSE = true;
+
+jasmine.Queue.prototype.next_ = function() {
+  var self = this;
+  var goAgain = true;
+
+  while (goAgain) {
+    goAgain = false;
+    
+    if (self.index < self.blocks.length) {
+      var calledSynchronously = true;
+      var completedSynchronously = false;
+
+      var onComplete = function () {
+        if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
+          completedSynchronously = true;
+          return;
+        }
+
+        self.offset = 0;
+        self.index++;
+
+        var now = new Date().getTime();
+        if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
+          self.env.lastUpdate = now;
+          self.env.setTimeout(function() {
+            self.next_();
+          }, 0);
+        } else {
+          if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
+            goAgain = true;
+          } else {
+            self.next_();
+          }
+        }
+      };
+      self.blocks[self.index].execute(onComplete);
+
+      calledSynchronously = false;
+      if (completedSynchronously) {
+        onComplete();
+      }
+      
+    } else {
+      self.running = false;
+      if (self.onComplete) {
+        self.onComplete();
+      }
+    }
+  }
+};
+
+jasmine.Queue.prototype.results = function() {
+  var results = new jasmine.NestedResults();
+  for (var i = 0; i < this.blocks.length; i++) {
+    if (this.blocks[i].results) {
+      results.addResult(this.blocks[i].results());
+    }
+  }
+  return results;
+};
+
+

src/QueuedFunction.js

@@ -1,84 +0,0 @@
-/**
- * QueuedFunction is how ActionCollections' actions are implemented
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {Function} func
- * @param {Number} timeout
- * @param {Function} latchFunction
- * @param {jasmine.Spec} spec
- */
-jasmine.QueuedFunction = function(env, func, timeout, latchFunction, spec) {
-  this.env = env;
-  this.func = func;
-  this.timeout = timeout;
-  this.latchFunction = latchFunction;
-  this.spec = spec;
-
-  this.totalTimeSpentWaitingForLatch = 0;
-  this.latchTimeoutIncrement = 100;
-};
-
-jasmine.QueuedFunction.prototype.next = function() {
-  this.spec.finish(); // default value is to be done after one function
-};
-
-jasmine.QueuedFunction.prototype.safeExecute = function() {
-  this.env.reporter.log('>> Jasmine Running ' + this.spec.suite.description + ' ' + this.spec.description + '...');
-
-  try {
-    this.func.apply(this.spec);
-  } catch (e) {
-    this.fail(e);
-  }
-};
-
-jasmine.QueuedFunction.prototype.execute = function() {
-  var self = this;
-  var executeNow = function() {
-    self.safeExecute();
-    self.next();
-  };
-
-  var executeLater = function() {
-    self.env.setTimeout(executeNow, self.timeout);
-  };
-
-  var executeNowOrLater = function() {
-    var latchFunctionResult;
-
-    try {
-      latchFunctionResult = self.latchFunction.apply(self.spec);
-    } catch (e) {
-      self.fail(e);
-      self.next();
-      return;
-    }
-
-    if (latchFunctionResult) {
-      executeNow();
-    } else if (self.totalTimeSpentWaitingForLatch >= self.timeout) {
-      var message = 'timed out after ' + self.timeout + ' msec waiting for ' + (self.latchFunction.description || 'something to happen');
-      self.fail({
-        name: 'timeout',
-        message: message
-      });
-      self.next();
-    } else {
-      self.totalTimeSpentWaitingForLatch += self.latchTimeoutIncrement;
-      self.env.setTimeout(executeNowOrLater, self.latchTimeoutIncrement);
-    }
-  };
-
-  if (this.latchFunction !== undefined) {
-    executeNowOrLater();
-  } else if (this.timeout > 0) {
-    executeLater();
-  } else {
-    executeNow();
-  }
-};
-
-jasmine.QueuedFunction.prototype.fail = function(e) {
-  this.spec.results.addResult(new jasmine.ExpectationResult(false, jasmine.util.formatException(e), null));
-};

src/Runner.js

@@ -5,27 +5,74 @@
  * @param {jasmine.Env} env
  */
 jasmine.Runner = function(env) {
-  jasmine.ActionCollection.call(this, env);
-
-  this.suites = this.actions;
+  var self = this;
+  self.env = env;
+  self.queue = new jasmine.Queue(env);
+  self.before_ = [];
+  self.after_ = [];
+  self.suites_ = [];
 };
-jasmine.util.inherit(jasmine.Runner, jasmine.ActionCollection);
 
 jasmine.Runner.prototype.execute = function() {
-  if (this.env.reporter.reportRunnerStarting) {
-    this.env.reporter.reportRunnerStarting(this);
+  var self = this;
+  if (self.env.reporter.reportRunnerStarting) {
+    self.env.reporter.reportRunnerStarting(this);
   }
-  jasmine.ActionCollection.prototype.execute.call(this);
+  self.queue.start(function () {
+    self.finishCallback();
+  });
 };
 
+jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
+  beforeEachFunction.typeName = 'beforeEach';
+  this.before_.push(beforeEachFunction);
+};
+
+jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
+  afterEachFunction.typeName = 'afterEach';
+  this.after_.push(afterEachFunction);
+};
+
+
 jasmine.Runner.prototype.finishCallback = function() {
   this.env.reporter.reportRunnerResults(this);
 };
 
-jasmine.Runner.prototype.getResults = function() {
-  var results = new jasmine.NestedResults();
-  for (var i = 0; i < this.suites.length; i++) {
-    results.rollupCounts(this.suites[i].getResults());
-  }
-  return results;
+jasmine.Runner.prototype.addSuite = function(suite) {
+  this.suites_.push(suite);
 };
+
+jasmine.Runner.prototype.add = function(block) {
+  if (block instanceof jasmine.Suite) {
+    this.addSuite(block);
+  }
+  this.queue.add(block);
+};
+
+/** @deprecated */
+jasmine.Runner.prototype.getAllSuites = function() {
+  return this.suites_;
+};
+
+jasmine.Runner.prototype.specs = function () {
+  var suites = this.suites();
+  var specs = [];
+  for (var i = 0; i < suites.length; i++) {
+    specs = specs.concat(suites[i].specs());
+  }
+  return specs;
+};
+
+
+jasmine.Runner.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.Runner.prototype.results = function() {
+  return this.queue.results();
+};
+
+/** @deprecated */
+jasmine.Runner.prototype.getResults = function() {
+  return this.queue.results();
+};

src/Spec.js

@@ -7,46 +7,61 @@
  * @param {String} description
  */
 jasmine.Spec = function(env, suite, description) {
-  this.id = env.nextSpecId_++;
-  this.env = env;
-  this.suite = suite;
-  this.description = description;
-  this.queue = [];
-  this.currentTimeout = 0;
-  this.currentLatchFunction = undefined;
-  this.finished = false;
-  this.afterCallbacks = [];
-  this.spies_ = [];
+  if (!env) {
+    throw new Error('jasmine.Env() required');
+  }
+  ;
+  if (!suite) {
+    throw new Error('jasmine.Suite() required');
+  }
+  ;
+  var spec = this;
+  spec.id = env.nextSpecId ? env.nextSpecId() : null;
+  spec.env = env;
+  spec.suite = suite;
+  spec.description = description;
+  spec.queue = new jasmine.Queue(env);
 
-  this.results = new jasmine.NestedResults();
-  this.results.description = description;
-  this.runs = this.addToQueue;
-  this.matchersClass = null;
+  spec.afterCallbacks = [];
+  spec.spies_ = [];
+
+  spec.results_ = new jasmine.NestedResults();
+  spec.results_.description = description;
+  spec.matchersClass = null;
 };
 
 jasmine.Spec.prototype.getFullName = function() {
   return this.suite.getFullName() + ' ' + this.description + '.';
 };
 
-jasmine.Spec.prototype.getResults = function() {
-  return this.results;
+
+jasmine.Spec.prototype.results = function() {
+  return this.results_;
 };
 
-jasmine.Spec.prototype.addToQueue = function(func) {
-  var queuedFunction = new jasmine.QueuedFunction(this.env, func, this.currentTimeout, this.currentLatchFunction, this);
-  this.queue.push(queuedFunction);
+jasmine.Spec.prototype.log = function(message) {
+  return this.results_.log(message);
+};
 
-  if (this.queue.length > 1) {
-    var previousQueuedFunction = this.queue[this.queue.length - 2];
-    previousQueuedFunction.next = function() {
-      queuedFunction.execute();
-    };
-  }
+/** @deprecated */
+jasmine.Spec.prototype.getResults = function() {
+  return this.results_;
+};
 
-  this.resetTimeout();
+jasmine.Spec.prototype.runs = function (func) {
+  var block = new jasmine.Block(this.env, func, this);
+  this.addToQueue(block);
   return this;
 };
 
+jasmine.Spec.prototype.addToQueue = function (block) {
+  if (this.queue.isRunning()) {
+    this.queue.insertNext(block);
+  } else {
+    this.queue.add(block);
+  }
+};
+
 /**
  * @private
  * @deprecated
@@ -55,32 +70,26 @@ jasmine.Spec.prototype.expects_that = function(actual) {
   return this.expect(actual);
 };
 
-/**
- * @private
- */
 jasmine.Spec.prototype.expect = function(actual) {
-  return new (this.getMatchersClass_())(this.env, actual, this.results);
+  return new (this.getMatchersClass_())(this.env, actual, this.results_);
 };
 
-/**
- * @private
- */
 jasmine.Spec.prototype.waits = function(timeout) {
-  this.currentTimeout = timeout;
-  this.currentLatchFunction = undefined;
+  var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
+  this.addToQueue(waitsFunc);
   return this;
 };
 
-/**
- * @private
- */
-jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, message) {
-  this.currentTimeout = timeout;
-  this.currentLatchFunction = latchFunction;
-  this.currentLatchFunction.description = message;
+jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, timeoutMessage) {
+  var waitsForFunc = new jasmine.WaitsForBlock(this.env, timeout, latchFunction, timeoutMessage, this);
+  this.addToQueue(waitsForFunc);
   return this;
 };
 
+jasmine.Spec.prototype.fail = function (e) {
+  this.results_.addResult(new jasmine.ExpectationResult(false, e ? jasmine.util.formatException(e) : null, null));
+};
+
 jasmine.Spec.prototype.getMatchersClass_ = function() {
   return this.matchersClass || jasmine.Matchers;
 };
@@ -97,70 +106,67 @@ jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
   this.matchersClass = newMatchersClass;
 };
 
-jasmine.Spec.prototype.resetTimeout = function() {
-  this.currentTimeout = 0;
-  this.currentLatchFunction = undefined;
-};
-
 jasmine.Spec.prototype.finishCallback = function() {
   this.env.reporter.reportSpecResults(this);
 };
 
-jasmine.Spec.prototype.finish = function() {
-  this.safeExecuteAfters();
-
+jasmine.Spec.prototype.finish = function(onComplete) {
   this.removeAllSpies();
   this.finishCallback();
-  this.finished = true;
+  if (onComplete) {
+    onComplete();
+  }
 };
 
-jasmine.Spec.prototype.after = function(doAfter) {
-  this.afterCallbacks.unshift(doAfter);
+jasmine.Spec.prototype.after = function(doAfter, test) {
+
+  if (this.queue.isRunning()) {
+    this.queue.add(new jasmine.Block(this.env, doAfter, this));
+  } else {
+    this.afterCallbacks.unshift(doAfter);
+  }
 };
 
-jasmine.Spec.prototype.execute = function() {
-  if (!this.env.specFilter(this)) {
-    this.results.skipped = true;
-    this.finishCallback();
-    this.finished = true;
+jasmine.Spec.prototype.execute = function(onComplete) {
+  var spec = this;
+  if (!spec.env.specFilter(spec)) {
+    spec.results_.skipped = true;
+    spec.finish(onComplete);
     return;
   }
+  this.env.reporter.log('>> Jasmine Running ' + this.suite.description + ' ' + this.description + '...');
 
-  this.env.currentSpec = this;
-  this.env.currentlyRunningTests = true;
+  spec.env.currentSpec = spec;
+  spec.env.currentlyRunningTests = true;
 
-  this.safeExecuteBefores();
+  spec.addBeforesAndAftersToQueue();
 
-  if (this.queue[0]) {
-    this.queue[0].execute();
-  } else {
-    this.finish();
-  }
-  this.env.currentlyRunningTests = false;
+  spec.queue.start(function () {
+    spec.finish(onComplete);
+  });
+  spec.env.currentlyRunningTests = false;
 };
 
-jasmine.Spec.prototype.safeExecuteBefores = function() {
-  var befores = [];
+jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
+  var runner = this.env.currentRunner();
   for (var suite = this.suite; suite; suite = suite.parentSuite) {
-    if (suite.beforeEachFunction) befores.push(suite.beforeEachFunction);
+    for (var i = 0; i < suite.before_.length; i++) {
+      this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
+    }
   }
-
-  while (befores.length) {
-    this.safeExecuteBeforeOrAfter(befores.pop());
+  for (var i = 0; i < runner.before_.length; i++) {
+    this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
   }
-};
-
-jasmine.Spec.prototype.safeExecuteAfters = function() {
-  for (var suite = this.suite; suite; suite = suite.parentSuite) {
-    if (suite.afterEachFunction) this.safeExecuteBeforeOrAfter(suite.afterEachFunction);
+  for (i = 0; i < this.afterCallbacks.length; i++) {
+    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
   }
-};
-
-jasmine.Spec.prototype.safeExecuteBeforeOrAfter = function(func) {
-  try {
-    func.apply(this);
-  } catch (e) {
-    this.results.addResult(new jasmine.ExpectationResult(false, func.typeName + '() fail: ' + jasmine.util.formatException(e), null));
+  for (suite = this.suite; suite; suite = suite.parentSuite) {
+    for (var i = 0; i < suite.after_.length; i++) {
+      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
+    }
+  }
+  for (var i = 0; i < runner.after_.length; i++) {
+    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
   }
 };
 

src/Suite.js

@@ -8,17 +8,16 @@
  * @param {jasmine.Suite} parentSuite
  */
 jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
-  jasmine.ActionCollection.call(this, env);
-  
-  this.id = env.nextSuiteId_++;
-  this.description = description;
-  this.specs = this.actions;
-  this.parentSuite = parentSuite;
-
-  this.beforeEachFunction = null;
-  this.afterEachFunction = null;
+  var self = this;
+  self.id = env.nextSuiteId ? env.nextSuiteId() : null;
+  self.description = description;
+  self.queue = new jasmine.Queue(env);
+  self.parentSuite = parentSuite;
+  self.env = env;
+  self.before_ = [];
+  self.after_ = [];
+  self.specs_ = [];
 };
-jasmine.util.inherit(jasmine.Suite, jasmine.ActionCollection);
 
 jasmine.Suite.prototype.getFullName = function() {
   var fullName = this.description;
@@ -28,28 +27,54 @@ jasmine.Suite.prototype.getFullName = function() {
   return fullName;
 };
 
-jasmine.Suite.prototype.finishCallback = function() {
+jasmine.Suite.prototype.finish = function(onComplete) {
   this.env.reporter.reportSuiteResults(this);
+  this.finished = true;
+  if (typeof(onComplete) == 'function') {
+    onComplete();
+  }
 };
 
 jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
   beforeEachFunction.typeName = 'beforeEach';
-  this.beforeEachFunction = beforeEachFunction;
+  this.before_.push(beforeEachFunction);
 };
 
 jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
   afterEachFunction.typeName = 'afterEach';
-  this.afterEachFunction = afterEachFunction;
+  this.after_.push(afterEachFunction);
 };
 
+/** @deprecated */
 jasmine.Suite.prototype.getResults = function() {
-  var results = new jasmine.NestedResults();
-  results.description = this.description;
-  results.id = this.id;
-  
-  for (var i = 0; i < this.specs.length; i++) {
-    results.rollupCounts(this.specs[i].getResults());
-  }
-  return results;
+  return this.queue.results();
 };
 
+jasmine.Suite.prototype.results = function() {
+  return this.queue.results();
+};
+
+jasmine.Suite.prototype.add = function(block) {
+  if (block instanceof jasmine.Suite) {
+    this.env.currentRunner().addSuite(block);
+  } else {
+    this.specs_.push(block);
+  }
+  this.queue.add(block);
+};
+
+/** @deprecated */
+jasmine.Suite.prototype.specCount = function() {
+  return this.specs_.length;
+};
+
+jasmine.Suite.prototype.specs = function() {
+  return this.specs_;
+};
+
+jasmine.Suite.prototype.execute = function(onComplete) {
+  var self = this;
+  this.queue.start(function () {
+    self.finish(onComplete);
+  });
+};

src/WaitsBlock.js

@@ -0,0 +1,13 @@
+jasmine.WaitsBlock = function(env, timeout, spec) {
+  this.timeout = timeout;
+  jasmine.Block.call(this, env, null, spec);
+};
+
+jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
+
+jasmine.WaitsBlock.prototype.execute = function (onComplete) {
+  this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
+  this.env.setTimeout(function () {
+    onComplete();
+  }, this.timeout);
+};

src/WaitsForBlock.js

@@ -0,0 +1,38 @@
+jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
+  this.timeout = timeout;
+  this.latchFunction = latchFunction;
+  this.message = message;
+  this.totalTimeSpentWaitingForLatch = 0;
+  jasmine.Block.call(this, env, null, spec);
+};
+
+jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
+
+jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 100;
+
+jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
+  var self = this;
+  self.env.reporter.log('>> Jasmine waiting for ' + (self.message || 'something to happen'));
+  var latchFunctionResult;
+  try {
+    latchFunctionResult = self.latchFunction.apply(self.spec);
+  } catch (e) {
+    self.spec.fail(e);
+    onComplete();
+    return;
+  }
+
+  if (latchFunctionResult) {
+    onComplete();
+  } else if (self.totalTimeSpentWaitingForLatch >= self.timeout) {
+    var message = 'timed out after ' + self.timeout + ' msec waiting for ' + (self.message || 'something to happen');
+    self.spec.fail({
+      name: 'timeout',
+      message: message
+    });
+    self.spec._next();
+  } else {
+    self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
+    self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
+  }
+};

src/base.js

@@ -1,6 +1,6 @@
 /**
  * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
- * 
+ *
  * @namespace
  */
 var jasmine = {};
@@ -12,6 +12,12 @@ jasmine.unimplementedMethod_ = function() {
   throw new Error("unimplemented method");
 };
 
+/**
+ * Large or small values here may result in slow test running & "Too much recursion" errors
+ *
+ */
+jasmine.UPDATE_INTERVAL = 250;
+
 /**
  * Allows for bound functions to be comapred.  Internal use only.
  *
@@ -23,7 +29,14 @@ jasmine.unimplementedMethod_ = function() {
 jasmine.bindOriginal_ = function(base, name) {
   var original = base[name];
   return function() {
-    return original.apply(base, arguments);
+    if (original.apply) {
+      return original.apply(base, arguments);
+    } else {
+      //IE support
+      if (base == window) {
+        return window[name].apply(window, arguments);
+      }
+    }
   };
 };
 
@@ -40,12 +53,16 @@ jasmine.MessageResult = function(text) {
 
 jasmine.ExpectationResult = function(passed, message, details) {
   this.type = 'ExpectationResult';
-  this.passed = passed;
+  this.passed_ = passed;
   this.message = message;
   this.details = details;
   this.trace = new Error(message); // todo: test better
 };
 
+jasmine.ExpectationResult.prototype.passed = function () {
+  return this.passed_;
+};
+
 /**
  * Getter for the Jasmine environment. Ensures one gets created
  */
@@ -61,10 +78,10 @@ jasmine.getEnv = function() {
  */
 jasmine.isArray_ = function(value) {
   return value &&
-  typeof value === 'object' &&
-  typeof value.length === 'number' &&
-  typeof value.splice === 'function' &&
-  !(value.propertyIsEnumerable('length'));
+         typeof value === 'object' &&
+         typeof value.length === 'number' &&
+         typeof value.splice === 'function' &&
+         !(value.propertyIsEnumerable('length'));
 };
 
 /**
@@ -113,7 +130,7 @@ jasmine.any = function(clazz) {
  * Spies are torn down at the end of every spec.
  *
  * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
- * 
+ *
  * @example
  * // a stub
  * var myStub = jasmine.createSpy('myStub');  // can be used anywhere
@@ -158,7 +175,8 @@ jasmine.Spy = function(name) {
   /**
    * The acutal function this spy stubs.
    */
-  this.plan = function() {};
+  this.plan = function() {
+  };
   /**
    * Tracking of the most recent call to the spy.
    * @example
@@ -179,6 +197,7 @@ jasmine.Spy = function(name) {
    * mySpy.argsForCall[1] = [7, 8];
    */
   this.argsForCall = [];
+  this.calls = [];
 };
 
 /**
@@ -188,7 +207,7 @@ jasmine.Spy = function(name) {
  * var foo = {
  *   bar: function() { // do some stuff }
  * }
- * 
+ *
  * // defining a spy on an existing property: foo.bar
  * spyOn(foo, 'bar').andCallThrough();
  */
@@ -273,6 +292,7 @@ jasmine.Spy.prototype.reset = function() {
   this.wasCalled = false;
   this.callCount = 0;
   this.argsForCall = [];
+  this.calls = [];
   this.mostRecentCall = {};
 };
 
@@ -282,22 +302,19 @@ jasmine.createSpy = function(name) {
     spyObj.wasCalled = true;
     spyObj.callCount++;
     var args = jasmine.util.argsToArray(arguments);
-    //spyObj.mostRecentCall = {
-    //  object: this,
-    //  args: args
-    //};
     spyObj.mostRecentCall.object = this;
     spyObj.mostRecentCall.args = args;
     spyObj.argsForCall.push(args);
+    spyObj.calls.push({object: this, args: args});
     return spyObj.plan.apply(this, arguments);
   };
 
   var spy = new jasmine.Spy(name);
-  
-  for(var prop in spy) {
+
+  for (var prop in spy) {
     spyObj[prop] = spy[prop];
   }
-  
+
   spyObj.reset();
 
   return spyObj;
@@ -319,7 +336,7 @@ jasmine.createSpyObj = function(baseName, methodNames) {
 };
 
 jasmine.log = function(message) {
-  jasmine.getEnv().currentSpec.getResults().log(message);
+  jasmine.getEnv().currentSpec.log(message);
 };
 
 /**
@@ -401,7 +418,7 @@ var waits = function(timeout) {
 
 /**
  * Waits for the latchFunction to return true before proceeding to the next runs()-defined block.
- *  
+ *
  * @param {Number} timeout
  * @param {Function} latchFunction
  * @param {String} message

src/mock-timeout.js

@@ -134,25 +134,42 @@ jasmine.Clock = {
     if (jasmine.Clock.installed != jasmine.Clock.defaultFakeTimer) {
       throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
     }
-  },  
+  },
 
   installed: null
 };
 jasmine.Clock.installed = jasmine.Clock.real;
 
+//else for IE support
 window.setTimeout = function(funcToCall, millis) {
-  return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+  if (jasmine.Clock.installed.setTimeout.apply) {
+    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
+  }
 };
 
 window.setInterval = function(funcToCall, millis) {
-  return jasmine.Clock.installed.setInterval.apply(this, arguments);
+  if (jasmine.Clock.installed.setInterval.apply) {
+    return jasmine.Clock.installed.setInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setInterval(funcToCall, millis);
+  }
 };
 
 window.clearTimeout = function(timeoutKey) {
-  return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearTimeout(timeoutKey);
+  }
 };
 
 window.clearInterval = function(timeoutKey) {
-  return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+  } else {
+  return jasmine.Clock.installed.clearInterval(timeoutKey);
+  }
 };
 

src/version.json

@@ -0,0 +1,5 @@
+{
+  "major": 0,
+  "minor": 9,
+  "build": 0
+}