evergreen 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzIxZWE5Njc1ZmZkMzI2OTVmN2MwMmY5MDEwMGQ3OTQ5NDVhNzFjOA==
+  data.tar.gz: !binary |-
+    ZWQwY2RjNmI3MjAxYzMwODVhZTMxNDZjYjczNDk2ZDc0NWQ5OTY0OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZmNjNGQ2OWU0NjdjNGFjYjVkMTlhMDkzMzkyNjdjNGU1OTQ2NDJlN2Q5NTdh
+    NWU2N2Q2NzQwZTFiYjI3MmViZGE0MDhhNmU2MjRkODdmY2U1MTk4MDVhNzE4
+    YTZjNjgwMjk2MmU5YjM4ZTg3MWI3ZjUxZjAzZGE0MjZkYTk4ZGI=
+  data.tar.gz: !binary |-
+    ZDI0OWYzYzA0MGI1YzNmNGJiYTA5ODIzMmFmNDI3NzI5MjQ3MmRiM2MxMDc1
+    OThhOWE0YWI0MGEwM2FmZDNhYzFlMWY5OWI1OTE3NmY1ODQyZWI0MzdiNDdi
+    YzRhYjVkNTE2NjBlZWQ2ZTYzZjI2OGIyMjhlNTU0NDg4MjhkNDA=

data/README.rdoc

@@ -1,5 +1,7 @@
 = Evergreen
 
+{<img src="http://travis-ci.org/jnicklas/evergreen.png" />}[http://travis-ci.org/jnicklas/evergreen]
+
 "Because green is the new Blue(Ridge)"
 
 Evergreen is a tool to run javascript unit tests for client side JavaScript. It
@@ -16,13 +18,10 @@ isolation from your application. If you need a tool that tests how your
 JavaScript integrates with your application you should use an integration
 testing framework, such as {Capybara}[http://github.com/jnicklas/capybara].
 
-== Community
+== Maintenance note
 
-Please ask questions on the {mailing
-list}[http://groups.google.com/group/ruby-evergreen].  If you have found a
-reproducible error, please {file it on
-GitHub}[https://github.com/jnicklas/evergreen/issues]. Do not contact the
-maintainers directly.
+Jonas has kindly given me push access so I can help maintain the project and manage pull requests.
+If you have any questions or suggestions please feel free to {contact me}[http://github.com/abepetrillo]
 
 == Installation
 
@@ -154,6 +153,9 @@ Evergreen supports specs written in
 {CoffeeScript}[http://github.com/jashkenas/coffee-script]. Just name your spec
 file _spec.coffee and it will automatically be translated for you.
 
+Note that since CoffeeScript files are not compiled by Sprockets (as in Rails),
+the double-extension .js.coffee is not supported.
+
 You can also add a CoffeeScript spec helper, but remember that CoffeeScript
 encloses individual files in a closure, if you need something you define in the
 spec helper to be available in your spec files, attach it to the window object:

data/lib/evergreen.rb

@@ -13,9 +13,10 @@ module Evergreen
   autoload :Suite, 'evergreen/suite'
   autoload :Spec, 'evergreen/spec'
   autoload :Template, 'evergreen/template'
+  autoload :Helper, 'evergreen/helper'
 
   class << self
-    attr_accessor :driver, :public_dir, :template_dir, :spec_dir, :root, :mounted_at, :application
+    attr_accessor :driver, :root, :application, :public_dir, :spec_dir, :template_dir, :helper_dir, :mounted_at
 
     def configure
       yield self
@@ -23,12 +24,13 @@ module Evergreen
 
     def use_defaults!
       configure do |config|
-        config.application = Evergreen::Application
-        config.driver = :selenium
-        config.public_dir = 'public'
-        config.spec_dir = 'spec/javascripts'
+        config.application  = Evergreen::Application
+        config.driver       = :selenium
+        config.public_dir   = 'public'
+        config.spec_dir     = 'spec/javascripts'
         config.template_dir = 'spec/javascripts/templates'
-        config.mounted_at = ""
+        config.helper_dir   = 'spec/javascripts/helpers'
+        config.mounted_at   = ""
       end
     end
   end

data/lib/evergreen/application.rb

@@ -22,16 +22,12 @@ module Evergreen
 
     get '/run/all' do
       @suite = Evergreen::Suite.new
-      @js_spec_helper = @suite.get_spec('spec_helper.js')
-      @coffee_spec_helper = @suite.get_spec('spec_helper.coffee')
       erb :run
     end
 
     get '/run/*' do |name|
       @suite = Evergreen::Suite.new
-      @spec = @suite.get_spec(name)
-      @js_spec_helper = @suite.get_spec('spec_helper.js')
-      @coffee_spec_helper = @suite.get_spec('spec_helper.coffee')
+      @spec  = @suite.get_spec(name)
       erb :run
     end
 
@@ -46,5 +42,6 @@ module Evergreen
     get '/*' do |path|
       send_file File.join(Evergreen.root, Evergreen.public_dir, path)
     end
+
   end
 end

data/lib/evergreen/helper.rb

@@ -0,0 +1,33 @@
+module Evergreen
+  class Helper
+
+    attr_reader :name, :suite
+
+    def initialize(suite, name)
+      @suite = suite
+      @name  = name
+    end
+
+    def root
+      suite.root
+    end
+
+    def full_path
+      File.join(root, Evergreen.helper_dir, name)
+    end
+
+    def read
+      if full_path =~ /\.coffee$/
+        require 'coffee-script'
+        CoffeeScript.compile(File.read(full_path))
+      else
+        File.read(full_path)
+      end
+    end
+    alias_method :contents, :read
+
+    def exist?
+      File.exist?(full_path)
+    end
+  end
+end

data/lib/evergreen/runner.rb

@@ -49,7 +49,7 @@ module Evergreen
 
           previous_results = ""
 
-          session.wait_until(180) do
+          session.wait_until(300) do
             dots = session.evaluate_script('Evergreen.dots')
             io.print dots.sub(/^#{Regexp.escape(previous_results)}/, '')
             io.flush

data/lib/evergreen/server.rb

@@ -5,6 +5,7 @@ module Evergreen
     def serve
       server.boot
       Launchy.open(server.url(Evergreen.mounted_at.to_s + '/'))
+      trap('SIGINT') { puts 'Shutting down...' ; exit 0 }
       sleep
     end
 

data/lib/evergreen/suite.rb

@@ -34,5 +34,11 @@ module Evergreen
         Template.new(self, File.basename(path))
       end
     end
+
+    def helpers
+      Dir.glob(File.join(root, Evergreen.helper_dir, '*')).map do |path|
+        Helper.new(self, File.basename(path))
+      end
+    end
   end
 end

data/lib/evergreen/version.rb

@@ -1,3 +1,3 @@
 module Evergreen
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/evergreen/views/run.erb

@@ -4,8 +4,10 @@
 <script type="text/javascript" src="<%= url("/resources/run.js") %>"></script>
 <script type="text/javascript">
   // <![CDATA[
-      <%= render_spec(@coffee_spec_helper) if @coffee_spec_helper.exist? %>;
-      <%= render_spec(@js_spec_helper) if @js_spec_helper.exist? %>;
+      <% @suite.helpers.each do |helper| %>
+        <%= render_spec(helper) %>;
+      <% end %>
+
       <% if @spec %>
         <%= render_spec(@spec) %>
       <% else %>
@@ -32,10 +34,18 @@
       <% @suite.templates.each do |template| %>
         Evergreen.templates[<%= template.name.to_json %>] = <%= template.escaped_contents %>;
       <% end %>
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.addReporter(new jasmine.TrivialReporter());
-      jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
-      jasmineEnv.execute();
+      var jasmineExecute = function() {
+        var jasmineEnv = jasmine.getEnv();
+        jasmineEnv.addReporter(new jasmine.TrivialReporter());
+        jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
+        jasmineEnv.execute();
+      };
+      if (window.addEventListener) {
+        window.addEventListener("load", jasmineExecute, false);
+      }
+      else {
+        window.attachEvent("onload", jasmineExecute);
+      }
     })();
   // ]]>
 </script>

data/lib/jasmine/Contribute.markdown

@@ -12,7 +12,7 @@ Or, How to make a successful pull request
 * _Be environment agnostic_ - server-side developers are just as important as browser developers
 * _Be browser agnostic_ - if you must rely on browser-specific functionality, please write it in a way that degrades gracefully
 * _Write specs_ - Jasmine's a testing framework; don't add functionality without test-driving it
-* _Ensure the *entire* test suite is green_ in all the big browsers, Node, and JSHint - your contribution shouldn't break Jasmine for other users                                     
+* _Ensure the *entire* test suite is green_ in all the big browsers, Node, and JSHint - your contribution shouldn't break Jasmine for other users
 
 Follow these tips and your pull request, patch, or suggestion is much more likely to be integrated.
 
@@ -34,11 +34,12 @@ As in all good projects, the `spec/` directory mirrors `src/` and follows the sa
 
 You will notice that all specs are run against the built `jasmine.js` instead of the component source files. This is intentional as a way to ensure that the concatenation code is working correctly.
 
-Please ensure all specs are green before committing.
+Please ensure all specs are green before committing or issuing a pull request.
 
-There are rake tasks to help with getting green:
-* `rake spec` outputs the expected number of specs that should be run and attempts to run in browser and Node
-* `rake spec:browser` opens `spec/runner.html` in the default browser on MacOS. Please run this in at least Firefox and Chrome before committing
-* `rake spec:node` runs all the Jasmine specs in Node.js - it will complain if Node is not installed
-* `rake hint` runs all the files through JSHint and will complain about potential viable issues with your code. Fix them.
+There are Thor tasks to help with getting green - run `thor list` to see them all. Here are the key tasks:
+
+* `thor jasmine_dev:execute_specs` outputs the expected number of specs that should be run and attempts to run in browser and Node
+* `thor jasmine_dev:execute_specs_in_browser` opens `spec/runner.html` in the default browser on MacOS. Please run this in at least Firefox and Chrome before committing
+* `thor jasmine_dev:execute_specs_in_node` runs all the Jasmine specs in Node.js - it will complain if Node is not installed
+* `thor jasmine_dev:js_hint` runs all the files through JSHint and will complain about potential viable issues with your code. Fix them.
 

data/lib/jasmine/Gemfile

@@ -1,4 +1,3 @@
 source :rubygems
-gem "term-ansicolor", :require => "term/ansicolor"
 gem "rake"
 gemspec

data/lib/jasmine/README.markdown

@@ -6,18 +6,11 @@ Jasmine is a Behavior Driven Development testing framework for JavaScript. It do
 
 Documentation & guides live here: [http://pivotal.github.com/jasmine/](http://pivotal.github.com/jasmine/)
 
-## What's Here?
-
-* 
-
-
-
 
 ## Support
 
 * Search past discussions: [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js)
 * Send an email to the list: [jasmine-js@googlegroups.com](jasmine-js@googlegroups.com)
-* Check the current build status: [ci.pivotallabs.com](http://ci.pivotallabs.com)
 * View the project backlog at Pivotal Tracker: [http://www.pivotaltracker.com/projects/10606](http://www.pivotaltracker.com/projects/10606)
 * Follow us on Twitter: [@JasmineBDD](http://twitter.com/JasmineBDD)
 
@@ -28,4 +21,4 @@ Documentation & guides live here: [http://pivotal.github.com/jasmine/](http://pi
 * [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
 * [Christian Williams](mailto:antixian666@gmail.com), Square
 
-Copyright (c) 2008-2011 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2012 Pivotal Labs. This software is licensed under the MIT License.

data/lib/jasmine/Rakefile

@@ -1,6 +1,5 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
-require "term/ansicolor"
 require "json"
 require "tilt"
 
@@ -8,26 +7,38 @@ Dir["#{File.dirname(__FILE__)}/tasks/**/*.rb"].each do |file|
   require file
 end
 
-task :default => :spec
+desc "Run all Jasmine JS specs"
+task :jasmine_specs do
+  jasmine_dev = JasmineDev.new
 
-task :require_pages_submodule do
-  raise "Submodule for Github Pages isn't present. Run git submodule update --init" unless pages_submodule_present
-end
+  return unless jasmine_dev.node_installed?
 
-task :require_node do
-  raise "\nNode.js is required to develop code for Jasmine. Please visit http://nodejs.org to install.\n\n" unless node_installed?
-end
+  system "thor jasmine_dev:execute_specs"
 
-def pages_submodule_present
-  File.exist?('pages/download.html')
+  puts "\n\033[33m>>> DEPRECATED <<< Run Jasmine's JavaScript specs with 'thor jasmine_dev:execute_specs'\n\033[0m"
 end
 
-def node_installed?
- `which node` =~ /node/
+desc "Run all Jasmine core tests (JavaScript and dev tasks)"
+task :spec => :require_pages_submodule do
+  jasmine_dev = JasmineDev.new
+
+  return unless jasmine_dev.node_installed?
+
+  system "rspec"
 end
 
-class String
-  include Term::ANSIColor
+task :require_pages_submodule do
+  jasmine_dev = JasmineDev.new
+
+  unless jasmine_dev.pages_submodule_installed?
+    puts 'Installing the Github pages submodule:'
+    system 'git submodule update --init'
+    puts 'Now continuing...'
+  end
 end
 
-Term::ANSIColor.coloring = STDOUT.isatty
+desc "View full development tasks"
+task :list_dev_tasks do
+  puts "Jasmine uses Thor for command line tasks for development. Here is the command set:"
+  system "thor list"
+end

data/lib/jasmine/Release.markdown

@@ -5,8 +5,11 @@ ___Jasmine Core Maintainers Only___
 
 Follow the instructions in `Contribute.markdown` during development.
 
-### Git Commits
+### Git Rules
 
+Please work on feature branches.
+
+Please attempt to keep commits to `master` small, but cohesive. If a feature is contained in a bunch of small commits (e.g., it has several wip commits), please squash them when merging back to `master`.
 
 ### Version
 
@@ -16,10 +19,11 @@ The current version lives in the file `src/version.json`. This file should be se
 
 This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem.
 
+Note that Jasmine should *not* use the "patch" version number. Let downstream projects rev their patch versions as needed, keeping their major and minor version numbers in sync with Jasmine core.
                  
 ### Update the Github Pages (as needed)
 
-Github pages have to exist in a branch called gh-pages in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks.
+Github pages have to exist in a branch called `gh-pages` in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks.
 
 If you want to submit changes to this repo and aren't a Pivotal Labs employee, you can fork and work in the `gh-pages` branch. You won't be able to edit the pages in the submodule off of master.
 
@@ -29,12 +33,10 @@ The pages are built with [Frank](https://github.com/blahed/frank). All the sourc
 
 When ready to release - specs are all green and the stories are done:
 
-1. Update the version in `version.json` to a release candidate - add an `rc` property with a value of 1
+1. Update the version in `version.json` to a release candidate - add a `release_candidate` property with a value of 1
 1. Update any comments on the public interfaces 
-1. `rake doc` - builds the `jsdoc` pages
 1. Update any links or top-level landing page for the Github Pages
-1. `rake standalone` - builds the standalone distribution ZIP file
-1. `rake build_pages` - builds the Github Pages
+1. `thor jasmine_dev:release_prep` - updates the version, builds the `.js` files, builds the standalone release, and builds the Github pages
 1. `rake release` - tags the repo with the version, builds the `jasmine-core` gem, pushes the gem to Rubygems.org
 
 There should be a post to Pivotal Labs blog and a tweet to that link.

data/lib/jasmine/config.rb

@@ -0,0 +1,29 @@
+#
+# Compass configuration file - for building Jasmine's 'final CSS files
+#
+
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "src/html"
+sass_dir = "src/html"
+images_dir = "images"
+javascripts_dir = "javascripts"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+output_style = :compact
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

data/lib/jasmine/jasmine-core.gemspec

@@ -6,17 +6,24 @@ Gem::Specification.new do |s|
   s.name = "jasmine-core"
   s.version = Jasmine::Core::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Rajan Agaskar", "Davis Frank", "Christian Williams"]
+  s.authors = ["Rajan Agaskar", "Davis W. Frank", "Christian Williams"]
   s.summary = %q{JavaScript BDD framework}
   s.description = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.}
   s.email = %q{jasmine-js@googlegroups.com}
   s.homepage = "http://pivotal.github.com/jasmine"
   s.rubyforge_project = "jasmine-core"
+  s.license = "MIT"
 
   s.files         = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js")
   s.require_paths = ["lib"]
-  s.add_development_dependency "term-ansicolor"
   s.add_development_dependency "json_pure", ">= 1.4.3"
   s.add_development_dependency "frank"
+  s.add_development_dependency "sass"
+  s.add_development_dependency "compass"
   s.add_development_dependency "ragaskar-jsdoc_helper"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "fuubar"
+  s.add_development_dependency "awesome_print"
+  s.add_development_dependency "thor"
+  s.add_development_dependency "nokogiri"
 end

data/lib/jasmine/jasmine_dev.thor

@@ -0,0 +1 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/tasks/jasmine_dev"

data/lib/jasmine/jshint/run.js

@@ -1,5 +1,5 @@
 var fs = require("fs");
-var sys = require("sys");
+var util = require("util");
 var path = require("path");
 var JSHINT = require("./jshint").JSHINT;
 

data/lib/jasmine/lib/jasmine-core/jasmine-html.js

@@ -1,3 +1,429 @@
+jasmine.HtmlReporterHelpers = {};
+
+jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
+
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) {
+        el.appendChild(child);
+      }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
+  var results = child.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+
+  return status;
+};
+
+jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
+  var parentDiv = this.dom.summary;
+  var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
+  var parent = child[parentSuite];
+
+  if (parent) {
+    if (typeof this.views.suites[parent.id] == 'undefined') {
+      this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
+    }
+    parentDiv = this.views.suites[parent.id].element;
+  }
+
+  parentDiv.appendChild(childElement);
+};
+
+
+jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
+  for(var fn in jasmine.HtmlReporterHelpers) {
+    ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
+  }
+};
+
+jasmine.HtmlReporter = function(_doc) {
+  var self = this;
+  var doc = _doc || window.document;
+
+  var reporterView;
+
+  var dom = {};
+
+  // Jasmine Reporter Public Interface
+  self.logRunningSpecs = false;
+
+  self.reportRunnerStarting = function(runner) {
+    var specs = runner.specs() || [];
+
+    if (specs.length == 0) {
+      return;
+    }
+
+    createReporterDom(runner.env.versionString());
+    doc.body.appendChild(dom.reporter);
+
+    reporterView = new jasmine.HtmlReporter.ReporterView(dom);
+    reporterView.addSpecs(specs, self.specFilter);
+  };
+
+  self.reportRunnerResults = function(runner) {
+    reporterView && reporterView.complete();
+  };
+
+  self.reportSuiteResults = function(suite) {
+    reporterView.suiteComplete(suite);
+  };
+
+  self.reportSpecStarting = function(spec) {
+    if (self.logRunningSpecs) {
+      self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+    }
+  };
+
+  self.reportSpecResults = function(spec) {
+    reporterView.specComplete(spec);
+  };
+
+  self.log = function() {
+    var console = jasmine.getGlobal().console;
+    if (console && console.log) {
+      if (console.log.apply) {
+        console.log.apply(console, arguments);
+      } else {
+        console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+      }
+    }
+  };
+
+  self.specFilter = function(spec) {
+    if (!focusedSpecName()) {
+      return true;
+    }
+
+    return spec.getFullName().indexOf(focusedSpecName()) === 0;
+  };
+
+  return self;
+
+  function focusedSpecName() {
+    var specName;
+
+    (function memoizeFocusedSpec() {
+      if (specName) {
+        return;
+      }
+
+      var paramMap = [];
+      var params = doc.location.search.substring(1).split('&');
+
+      for (var i = 0; i < params.length; i++) {
+        var p = params[i].split('=');
+        paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+      }
+
+      specName = paramMap.spec;
+    })();
+
+    return specName;
+  }
+
+  function createReporterDom(version) {
+    dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
+      dom.banner = self.createDom('div', { className: 'banner' },
+        self.createDom('span', { className: 'title' }, "Jasmine "),
+        self.createDom('span', { className: 'version' }, version)),
+
+      dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
+      dom.alert = self.createDom('div', {className: 'alert'}),
+      dom.results = self.createDom('div', {className: 'results'},
+        dom.summary = self.createDom('div', { className: 'summary' }),
+        dom.details = self.createDom('div', { id: 'details' }))
+    );
+  }
+};
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporter.ReporterView = function(dom) {
+  this.startedAt = new Date();
+  this.runningSpecCount = 0;
+  this.completeSpecCount = 0;
+  this.passedCount = 0;
+  this.failedCount = 0;
+  this.skippedCount = 0;
+
+  this.createResultsMenu = function() {
+    this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
+      this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'),
+      ' | ',
+      this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing'));
+
+    this.summaryMenuItem.onclick = function() {
+      dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, '');
+    };
+
+    this.detailsMenuItem.onclick = function() {
+      showDetails();
+    };
+  };
+
+  this.addSpecs = function(specs, specFilter) {
+    this.totalSpecCount = specs.length;
+
+    this.views = {
+      specs: {},
+      suites: {}
+    };
+
+    for (var i = 0; i < specs.length; i++) {
+      var spec = specs[i];
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views);
+      if (specFilter(spec)) {
+        this.runningSpecCount++;
+      }
+    }
+  };
+
+  this.specComplete = function(spec) {
+    this.completeSpecCount++;
+
+    if (isUndefined(this.views.specs[spec.id])) {
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom);
+    }
+
+    var specView = this.views.specs[spec.id];
+
+    switch (specView.status()) {
+      case 'passed':
+        this.passedCount++;
+        break;
+
+      case 'failed':
+        this.failedCount++;
+        break;
+
+      case 'skipped':
+        this.skippedCount++;
+        break;
+    }
+
+    specView.refresh();
+    this.refresh();
+  };
+
+  this.suiteComplete = function(suite) {
+    var suiteView = this.views.suites[suite.id];
+    if (isUndefined(suiteView)) {
+      return;
+    }
+    suiteView.refresh();
+  };
+
+  this.refresh = function() {
+
+    if (isUndefined(this.resultsMenu)) {
+      this.createResultsMenu();
+    }
+
+    // currently running UI
+    if (isUndefined(this.runningAlert)) {
+      this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"});
+      dom.alert.appendChild(this.runningAlert);
+    }
+    this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
+
+    // skipped specs UI
+    if (isUndefined(this.skippedAlert)) {
+      this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"});
+    }
+
+    this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.skippedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.skippedAlert);
+    }
+
+    // passing specs UI
+    if (isUndefined(this.passedAlert)) {
+      this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"});
+    }
+    this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
+
+    // failing specs UI
+    if (isUndefined(this.failedAlert)) {
+      this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"});
+    }
+    this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount);
+
+    if (this.failedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.failedAlert);
+      dom.alert.appendChild(this.resultsMenu);
+    }
+
+    // summary info
+    this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
+    this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
+  };
+
+  this.complete = function() {
+    dom.alert.removeChild(this.runningAlert);
+
+    this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.failedCount === 0) {
+      dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount)));
+    } else {
+      showDetails();
+    }
+
+    dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
+  };
+
+  return this;
+
+  function showDetails() {
+    if (dom.reporter.className.search(/showDetails/) === -1) {
+      dom.reporter.className += " showDetails";
+    }
+  }
+
+  function isUndefined(obj) {
+    return typeof obj === 'undefined';
+  }
+
+  function isDefined(obj) {
+    return !isUndefined(obj);
+  }
+
+  function specPluralizedFor(count) {
+    var str = count + " spec";
+    if (count > 1) {
+      str += "s"
+    }
+    return str;
+  }
+
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView);
+
+
+jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
+  this.spec = spec;
+  this.dom = dom;
+  this.views = views;
+
+  this.symbol = this.createDom('li', { className: 'pending' });
+  this.dom.symbolSummary.appendChild(this.symbol);
+
+  this.summary = this.createDom('div', { className: 'specSummary' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.description)
+  );
+
+  this.detail = this.createDom('div', { className: 'specDetail' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.getFullName())
+  );
+};
+
+jasmine.HtmlReporter.SpecView.prototype.status = function() {
+  return this.getSpecStatus(this.spec);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.refresh = function() {
+  this.symbol.className = this.status();
+
+  switch (this.status()) {
+    case 'skipped':
+      break;
+
+    case 'passed':
+      this.appendSummaryToSuiteDiv();
+      break;
+
+    case 'failed':
+      this.appendSummaryToSuiteDiv();
+      this.appendFailureDetail();
+      break;
+  }
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
+  this.summary.className += ' ' + this.status();
+  this.appendToSummary(this.spec, this.summary);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
+  this.detail.className += ' ' + this.status();
+
+  var resultItems = this.spec.results().getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+      }
+    }
+  }
+
+  if (messagesDiv.childNodes.length > 0) {
+    this.detail.appendChild(messagesDiv);
+    this.dom.details.appendChild(this.detail);
+  }
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
+  this.suite = suite;
+  this.dom = dom;
+  this.views = views;
+
+  this.element = this.createDom('div', { className: 'suite' },
+      this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description)
+  );
+
+  this.appendToSummary(this.suite, this.element);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.status = function() {
+  return this.getSpecStatus(this.suite);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.refresh = function() {
+  this.element.className += " " + this.status();
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView);
+
+/* @deprecated Use jasmine.HtmlReporter instead
+ */
 jasmine.TrivialReporter = function(doc) {
   this.document = doc || document;
   this.suiteDivs = {};
@@ -31,7 +457,7 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
 jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
   var showPassed, showSkipped;
 
-  this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
+  this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' },
       this.createDom('div', { className: 'banner' },
         this.createDom('div', { className: 'logo' },
             this.createDom('span', { className: 'title' }, "Jasmine"),