konacha 1.5.1 → 2.0.0.beta1

data/config/routes.rb

@@ -1,4 +1,6 @@
 Konacha::Engine.routes.draw do
-  match "/"     => "specs#specs"
-  match "*path" => "specs#specs"
+  match '/iframe'       => 'specs#iframe', :as => 'iframe'
+  match '/iframe/*path' => 'specs#iframe'
+  match '/'             => 'specs#parent', :as => 'parent'
+  match '*path'         => 'specs#parent'
 end

data/konacha.gemspec

@@ -17,7 +17,7 @@ the asset pipeline and engines.}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "1.5.1"
+  gem.version       = "2.0.0.beta1"
 
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "actionpack", "~> 3.1"

data/lib/konacha/engine.rb

@@ -31,6 +31,7 @@ module Konacha
       options.port        ||= 3500
       options.application ||= self.class.application(app)
       options.driver      ||= :selenium
+      options.stylesheets ||= %w(application)
 
       app.config.assets.paths << app.root.join(options.spec_dir).to_s
     end

data/lib/konacha/runner.rb

@@ -7,7 +7,7 @@ module Konacha
       new.run
     end
 
-    attr_reader :io
+    attr_reader :io, :examples
 
     def initialize(options = {})
       @io = options[:output] || STDOUT
@@ -16,7 +16,27 @@ module Konacha
     def run
       before = Time.now
 
-      spec_runners.each { |spec_runner| spec_runner.run } # prints dots
+      begin
+        session.visit("/")
+
+        dots_printed = 0
+        begin
+          sleep 0.1
+          done, dots = session.evaluate_script('[Konacha.done, Konacha.dots]')
+          if dots
+            io.write colorize_dots(dots[dots_printed..-1])
+            io.flush
+            dots_printed = dots.length
+          end
+        end until done
+
+        @examples = JSON.parse(session.evaluate_script('Konacha.getResults()')).map do |row|
+          Example.new(row)
+        end
+      rescue => e
+        raise e, "Error communicating with browser process: #{e}", e.backtrace
+      end
+
       io.puts ""
       io.puts ""
       failure_messages.each { |msg| io.write("#{msg}\n\n") }
@@ -27,10 +47,6 @@ module Konacha
       passed?
     end
 
-    def examples
-      spec_runners.map { |spec_runner| spec_runner.examples }.flatten
-    end
-
     def pending_examples
       examples.select { |example| example.pending? }
     end
@@ -51,27 +67,6 @@ module Konacha
       @session ||= Capybara::Session.new(Konacha.driver, Konacha.application)
     end
 
-    def spec_runners
-      @spec_runners ||= Konacha::Spec.all.map { |spec| SpecRunner.new(self, spec) }
-    end
-  end
-
-  class SpecRunner
-    attr_reader :runner, :spec, :examples
-
-    def initialize(runner, spec)
-      @runner = runner
-      @spec = spec
-    end
-
-    def session
-      runner.session
-    end
-
-    def io
-      runner.io
-    end
-
     def colorize_dots(dots)
       dots = dots.chars.map do |d|
         case d
@@ -83,27 +78,6 @@ module Konacha
       end
       dots.join ''
     end
-
-    def run
-      session.visit(spec.url)
-
-      dots_printed = 0
-      begin
-        sleep 0.1
-        done, dots = session.evaluate_script('[Konacha.done, Konacha.dots]')
-        if dots
-          io.write colorize_dots(dots[dots_printed..-1])
-          io.flush
-          dots_printed = dots.length
-        end
-      end until done
-
-      @examples = JSON.parse(session.evaluate_script('Konacha.getResults()')).map do |row|
-        Example.new(row)
-      end
-    rescue => e
-      raise e, "Error communicating with browser process: #{e}", e.backtrace
-    end
   end
 
   class Example
@@ -135,13 +109,4 @@ module Konacha
       end
     end
   end
-
-  class Error < StandardError
-    attr_accessor :original
-
-    def initialize(msg, original=nil);
-      super(msg);
-      @original = original;
-    end
-  end
 end

data/spec/controllers/specs_controller_spec.rb

@@ -5,18 +5,18 @@ describe Konacha::SpecsController do
     @routes = Konacha::Engine.routes
   end
 
-  describe "#specs" do
+  describe "#iframe" do
     it "assigns the result of Spec.find to @specs" do
       Konacha::Spec.should_receive(:find).with("spec_path") { :spec }
-      get :specs, :path => "spec_path"
+      get :iframe, :path => "spec_path"
       assigns[:specs].should == :spec
     end
 
     it "404s if there is no match for the given path" do
       Konacha::Spec.should_receive(:find).with("array_spec") { raise Konacha::Spec::NotFound }
-      get :specs, :path => "array_spec"
+      get :iframe, :path => "array_spec"
       response.status.should == 404
-      response.should_not render_template("konacha/specs/show")
+      response.should_not render_template("konacha/specs/iframe")
     end
   end
 end

data/spec/dummy/config/application.rb

@@ -13,5 +13,6 @@ module Dummy
     config.encoding = "utf-8"
     config.assets.enabled = true
     config.assets.version = '1.0'
+    config.assets.paths << Rails.root.join("spec/isolated/errors").to_s
   end
 end

data/spec/dummy/spec/isolated/errors/failing_iframe_spec.js.coffee

@@ -0,0 +1 @@
+syntax error!

data/spec/dummy/spec/javascripts/{test_element_spec.js.coffee → body_spec.js.coffee}

@@ -1,6 +1,9 @@
 #= require jquery
 
-describe "the #konacha element", ->
+describe "the body#konacha element", ->
+  it "is empty", ->
+    $('#konacha').html().should.equal ''
+
   it "can have content added in one test...", ->
     $('#konacha').append('<h1 id="added">New Stuff</h1>')
     $('#konacha h1#added').length.should.equal(1)
@@ -14,11 +17,5 @@ describe "the #konacha element", ->
   it "... that is removed before the next one starts", ->
     $('#konacha').hasClass('test').should.be.false
 
-  it "can be removed in one test...", ->
-    $('#konacha').remove()
-
-  it "... and is re-added before the next one starts", ->
-    $('#konacha').length.should.equal(1)
-
   it "is visible", ->
     $('#konacha').is(':visible').should.be.true

data/spec/dummy/spec/javascripts/isolation/a_spec.js

@@ -0,0 +1,6 @@
+describe("spec file isolation (A)", function () {
+  it("isolates globals in one spec file from those of other spec files", function () {
+    window.a_spec = true;
+    expect(window.b_spec).to.be.undefined;
+  });
+});

data/spec/dummy/spec/javascripts/isolation/b_spec.js

@@ -0,0 +1,6 @@
+describe("spec file isolation (B)", function () {
+  it("isolates globals in one spec file from those of other spec files", function () {
+    window.b_spec = true;
+    expect(window.a_spec).to.be.undefined;
+  });
+});

data/spec/dummy/spec/javascripts/templating_spec.js

@@ -1,9 +1,9 @@
 //= require spec_helper
 //= require jquery
 
-describe("templating", function(){
-  it("is built in to Sprockets", function(){
-    $('#konacha').html(JST['templates/hello']());
-    $('#konacha h1').text().should.equal('Hello Konacha!');
+describe("templating", function() {
+  it("is built in to Sprockets", function() {
+    $('body').html(JST['templates/hello']());
+    $('body h1').text().should.equal('Hello Konacha!');
   });
 });

data/spec/dummy/spec/javascripts/ui_spec.js

@@ -0,0 +1,7 @@
+mocha.ui('tdd');
+
+suite('UI', function () {
+  test('supports alternate mocha UIs', function () {
+    (2 + 2).should.equal(4);
+  });
+});

data/spec/error_handling_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Konacha, :type => :request do
+  before do
+    Konacha.mode = :server
+  end
+
+  around do |example|
+    begin
+      spec_dir = Konacha.config.spec_dir
+      Konacha.config.spec_dir = "spec/isolated/errors"
+      example.run
+    ensure
+      Konacha.config.spec_dir = spec_dir
+    end
+  end
+
+  it "inserts a failing test when an iframe fails to load" do
+    silencing_stderr do
+      visit "/failing_iframe_spec"
+      page.should have_content("failing_iframe_spec.js.coffee")
+      page.should have_css(".test.fail")
+    end
+  end
+
+  def silencing_stderr
+    stderr = $stderr
+    $stderr = StringIO.new
+    yield
+  ensure
+    $stderr = stderr
+  end
+end

data/spec/models/spec_spec.rb

@@ -18,7 +18,7 @@ describe Konacha::Spec do
 
   describe "#url" do
     it "returns a URL path" do
-      described_class.new("array_spec.js").url.should == "/array_spec"
+      described_class.new("array_spec.js").url.should include "array_spec"
     end
   end
 

data/spec/spec_helper.rb

@@ -32,3 +32,8 @@ end
 RSpec.configure do |config|
   config.include Konacha::RequestSpec, :type => :request
 end
+
+Konacha.configure do |config|
+  # We don't have an application.css in our dummy app.
+  config.stylesheets = []
+end

data/spec/views/specs/{specs.html.erb_spec.rb → iframe.html.erb_spec.rb}

@@ -1,13 +1,8 @@
 require 'spec_helper'
 
-describe "konacha/specs/specs" do
-  it "includes konacha JS for given mode" do
-    assign(:specs, [])
-    Konacha.should_receive(:mode).any_number_of_times { :runner }
-
-    render
-
-    rendered.should have_css("script[src='/assets/konacha/runner.js']")
+describe "konacha/specs/iframe" do
+  before do
+    assign(:stylesheets, [])
   end
 
   def asset_double(asset_name, dependencies = [])
@@ -64,4 +59,13 @@ describe "konacha/specs/specs" do
     rendered.should have_selector("script[src='/assets/dependency_a.js?body=1']", :count => 1)
     rendered.should have_selector("script[src='/assets/dependency_b.js?body=1']", :count => 1)
   end
+
+  it "render the stylesheets" do
+    assign(:stylesheets, %w(foo bar))
+
+    render
+
+    rendered.should have_selector("link[href='/assets/foo.css']")
+    rendered.should have_selector("link[href='/assets/bar.css']")
+  end
 end

data/vendor/assets/javascripts/mocha.js

@@ -433,6 +433,19 @@ Context.prototype.timeout = function(ms){
   return this;
 };
 
+/**
+ * Set test slowness threshold `ms`.
+ *
+ * @param {Number} ms
+ * @return {Context} self
+ * @api private
+ */
+
+Context.prototype.slow = function(ms){
+  this.runnable().slow(ms);
+  return this;
+};
+
 /**
  * Inspect the context void of `._runnable`.
  *
@@ -984,6 +997,7 @@ function image(name) {
  *   - `reporter` reporter instance, defaults to `mocha.reporters.Dot`
  *   - `globals` array of accepted globals
  *   - `timeout` timeout in milliseconds
+ *   - `slow` milliseconds to wait before considering a test slow
  *   - `ignoreLeaks` ignore global leaks
  *   - `grep` string or regexp to filter tests with
  *
@@ -999,7 +1013,8 @@ function Mocha(options) {
   this.suite = new exports.Suite('', new exports.Context);
   this.ui(options.ui);
   this.reporter(options.reporter);
-  if (options.timeout) this.suite.timeout(options.timeout);
+  if (options.timeout) this.timeout(options.timeout);
+  if (options.slow) this.slow(options.slow);
 }
 
 /**
@@ -1015,16 +1030,24 @@ Mocha.prototype.addFile = function(file){
 };
 
 /**
- * Set reporter to `name`, defaults to "dot".
+ * Set reporter to `reporter`, defaults to "dot".
  *
- * @param {String} name
+ * @param {String|Function} reporter name of a reporter or a reporter constructor
  * @api public
  */
 
-Mocha.prototype.reporter = function(name){
-  name = name || 'dot';
-  this._reporter = require('./reporters/' + name);
-  if (!this._reporter) throw new Error('invalid reporter "' + name + '"');
+Mocha.prototype.reporter = function(reporter){
+  if ('function' == typeof reporter) {
+    this._reporter = reporter;
+  } else {
+    reporter = reporter || 'dot';
+    try {
+      this._reporter = require('./reporters/' + reporter);
+    } catch (err) {
+      this._reporter = require(reporter);
+    }
+    if (!this._reporter) throw new Error('invalid reporter "' + reporter + '"');
+  }
   return this;
 };
 
@@ -1125,6 +1148,18 @@ Mocha.prototype.ignoreLeaks = function(){
   return this;
 };
 
+/**
+ * Enable global leak checking.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.checkLeaks = function(){
+  this.options.ignoreLeaks = false;
+  return this;
+};
+
 /**
  * Enable growl support.
  *
@@ -1138,15 +1173,41 @@ Mocha.prototype.growl = function(){
 };
 
 /**
- * Ignore `globals`.
+ * Ignore `globals` array or string.
  *
- * @param {Array} globals
+ * @param {Array|String} globals
  * @return {Mocha}
  * @api public
  */
 
 Mocha.prototype.globals = function(globals){
-  this.options.globals = globals;
+  this.options.globals = (this.options.globals || []).concat(globals);
+  return this;
+};
+
+/**
+ * Set the timeout in milliseconds.
+ *
+ * @param {Number} timeout
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.timeout = function(timeout){
+  this.suite.timeout(timeout);
+  return this;
+};
+
+/**
+ * Set slowness threshold in milliseconds.
+ *
+ * @param {Number} slow
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.slow = function(slow){
+  this.suite.slow(slow);
   return this;
 };
 
@@ -1159,7 +1220,7 @@ Mocha.prototype.globals = function(globals){
  */
 
 Mocha.prototype.run = function(fn){
-  this.loadFiles();
+  if (this.files.length) this.loadFiles();
   var suite = this.suite;
   var options = this.options;
   var runner = new exports.Runner(suite);
@@ -1173,6 +1234,90 @@ Mocha.prototype.run = function(fn){
 
 }); // module: mocha.js
 
+require.register("ms.js", function(module, exports, require){
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * @param {String|Number} val
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val){
+  if ('string' == typeof val) return parse(val);
+  return format(val);
+}
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  var m = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);
+  if (!m) return;
+  var n = parseFloat(m[1]);
+  var type = (m[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'y':
+      return n * 31557600000;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * 86400000;
+    case 'hours':
+    case 'hour':
+    case 'h':
+      return n * 3600000;
+    case 'minutes':
+    case 'minute':
+    case 'm':
+      return n * 60000;
+    case 'seconds':
+    case 'second':
+    case 's':
+      return n * 1000;
+    case 'ms':
+      return n;
+  }
+}
+
+/**
+ * Format the given `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api public
+ */
+
+function format(ms) {
+  if (ms == d) return (ms / d) + ' day';
+  if (ms > d) return (ms / d) + ' days';
+  if (ms == h) return (ms / h) + ' hour';
+  if (ms > h) return (ms / h) + ' hours';
+  if (ms == m) return (ms / m) + ' minute';
+  if (ms > m) return (ms / m) + ' minutes';
+  if (ms == s) return (ms / s) + ' second';
+  if (ms > s) return (ms / s) + ' seconds';
+  return ms + ' ms';
+}
+}); // module: ms.js
+
 require.register("reporters/base.js", function(module, exports, require){
 
 /**
@@ -1180,7 +1325,8 @@ require.register("reporters/base.js", function(module, exports, require){
  */
 
 var tty = require('browser/tty')
-  , diff = require('browser/diff');
+  , diff = require('browser/diff')
+  , ms = require('../ms');
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -1294,13 +1440,6 @@ exports.cursor = {
   }
 };
 
-/**
- * A test is considered slow if it
- * exceeds the following value in milliseconds.
- */
-
-exports.slow = 75;
-
 /**
  * Outut the given `failures` as a list.
  *
@@ -1402,8 +1541,8 @@ function Base(runner) {
   runner.on('pass', function(test){
     stats.passes = stats.passes || 0;
 
-    var medium = exports.slow / 2;
-    test.speed = test.duration > exports.slow
+    var medium = test.slow() / 2;
+    test.speed = test.duration > test.slow()
       ? 'slow'
       : test.duration > medium
         ? 'medium'
@@ -1466,12 +1605,12 @@ Base.prototype.epilogue = function(){
   // pass
   fmt = color('bright pass', '  ✔')
     + color('green', ' %d %s complete')
-    + color('light', ' (%dms)');
+    + color('light', ' (%s)');
 
   console.log(fmt,
     stats.tests || 0,
     pluralize(stats.tests),
-    stats.duration);
+    ms(stats.duration));
 
   // pending
   if (stats.pending) {
@@ -1508,7 +1647,10 @@ function pad(str, len) {
 
 function errorDiff(err, type) {
   return diff['diff' + type](err.actual, err.expected).map(function(str){
-    if (/^(\n+)$/.test(str.value)) str.value = Array(++RegExp.$1.length).join('<newline>');
+    str.value = str.value
+      .replace(/\t/g, '<tab>')
+      .replace(/\r/g, '<CR>')
+      .replace(/\n/g, '<LF>\n');
     if (str.added) return colorLines('diff added', str.value);
     if (str.removed) return colorLines('diff removed', str.value);
     return str.value;
@@ -1759,13 +1901,12 @@ var statsTemplate = '<ul id="stats">'
  * @api public
  */
 
-function HTML(runner) {
+function HTML(runner, root) {
   Base.call(this, runner);
 
   var self = this
     , stats = this.stats
     , total = runner.total
-    , root = document.getElementById('mocha')
     , stat = fragment(statsTemplate)
     , items = stat.getElementsByTagName('li')
     , passes = items[1].getElementsByTagName('em')[0]
@@ -1779,6 +1920,8 @@ function HTML(runner) {
     , progress
     , ctx
 
+  root = root || document.getElementById('mocha');
+
   if (canvas.getContext) {
     var ratio = window.devicePixelRatio || 1;
     canvas.style.width = canvas.width;
@@ -1813,8 +1956,7 @@ function HTML(runner) {
     if (suite.root) return;
 
     // suite
-    var grep = '^' + encodeURIComponent(utils.escapeRegexp(suite.fullTitle()));
-    var url = location.protocol + '//' + location.host + location.pathname + '?grep=' + grep;
+    var url = '?grep=' + encodeURIComponent(suite.fullTitle());
     var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
 
     // container
@@ -3045,10 +3187,10 @@ function TAP(runner) {
 
   var self = this
     , stats = this.stats
-    , total = runner.total
     , n = 1;
 
   runner.on('start', function(){
+    var total = runner.grepTotal(runner.suite);
     console.log('%d..%d', 1, total);
   });
 
@@ -3313,6 +3455,7 @@ function Runnable(title, fn) {
   this.async = fn && fn.length;
   this.sync = ! this.async;
   this._timeout = 2000;
+  this._slow = 75;
   this.timedOut = false;
 }
 
@@ -3340,6 +3483,21 @@ Runnable.prototype.timeout = function(ms){
   return this;
 };
 
+/**
+ * Set & get slow `ms`.
+ *
+ * @param {Number} ms
+ * @return {Runnable|Number} ms or self
+ * @api private
+ */
+
+Runnable.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  debug('timeout %d', ms);
+  this._slow = ms;
+  return this;
+};
+
 /**
  * Return the full title generated by recursively
  * concatenating the parent's full title.
@@ -3651,7 +3809,6 @@ Runner.prototype.failHook = function(hook, err){
 Runner.prototype.hook = function(name, fn){
   var suite = this.suite
     , hooks = suite['_' + name]
-    , ms = suite._timeout
     , self = this
     , timer;
 
@@ -3961,6 +4118,7 @@ function filterLeaks(ok) {
     return matched.length == 0 && (!global.navigator || 'onerror' !== key);
   });
 }
+
 }); // module: runner.js
 
 require.register("suite.js", function(module, exports, require){
@@ -3971,6 +4129,7 @@ require.register("suite.js", function(module, exports, require){
 
 var EventEmitter = require('browser/events').EventEmitter
   , debug = require('browser/debug')('mocha:suite')
+  , milliseconds = require('./ms')
   , utils = require('./utils')
   , Hook = require('./hook');
 
@@ -4023,6 +4182,7 @@ function Suite(title, ctx) {
   this._afterAll = [];
   this.root = !title;
   this._timeout = 2000;
+  this._slow = 75;
   this._bail = false;
 }
 
@@ -4046,6 +4206,7 @@ Suite.prototype.clone = function(){
   debug('clone');
   suite.ctx = this.ctx;
   suite.timeout(this.timeout());
+  suite.slow(this.slow());
   suite.bail(this.bail());
   return suite;
 };
@@ -4060,12 +4221,28 @@ Suite.prototype.clone = function(){
 
 Suite.prototype.timeout = function(ms){
   if (0 == arguments.length) return this._timeout;
-  if (String(ms).match(/s$/)) ms = parseFloat(ms) * 1000;
+  if ('string' == typeof ms) ms = milliseconds(ms);
   debug('timeout %d', ms);
   this._timeout = parseInt(ms, 10);
   return this;
 };
 
+/**
+ * Set slow `ms` or short-hand such as "2s".
+ *
+ * @param {Number|String} ms
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('slow %d', ms);
+  this._slow = ms;
+  return this;
+};
+
 /**
  * Sets whether to bail after first error.
  *
@@ -4094,6 +4271,7 @@ Suite.prototype.beforeAll = function(fn){
   var hook = new Hook('"before all" hook', fn);
   hook.parent = this;
   hook.timeout(this.timeout());
+  hook.slow(this.slow());
   hook.ctx = this.ctx;
   this._beforeAll.push(hook);
   this.emit('beforeAll', hook);
@@ -4113,6 +4291,7 @@ Suite.prototype.afterAll = function(fn){
   var hook = new Hook('"after all" hook', fn);
   hook.parent = this;
   hook.timeout(this.timeout());
+  hook.slow(this.slow());
   hook.ctx = this.ctx;
   this._afterAll.push(hook);
   this.emit('afterAll', hook);
@@ -4132,6 +4311,7 @@ Suite.prototype.beforeEach = function(fn){
   var hook = new Hook('"before each" hook', fn);
   hook.parent = this;
   hook.timeout(this.timeout());
+  hook.slow(this.slow());
   hook.ctx = this.ctx;
   this._beforeEach.push(hook);
   this.emit('beforeEach', hook);
@@ -4151,6 +4331,7 @@ Suite.prototype.afterEach = function(fn){
   var hook = new Hook('"after each" hook', fn);
   hook.parent = this;
   hook.timeout(this.timeout());
+  hook.slow(this.slow());
   hook.ctx = this.ctx;
   this._afterEach.push(hook);
   this.emit('afterEach', hook);
@@ -4168,6 +4349,7 @@ Suite.prototype.afterEach = function(fn){
 Suite.prototype.addSuite = function(suite){
   suite.parent = this;
   suite.timeout(this.timeout());
+  suite.slow(this.slow());
   suite.bail(this.bail());
   this.suites.push(suite);
   this.emit('suite', suite);
@@ -4185,6 +4367,7 @@ Suite.prototype.addSuite = function(suite){
 Suite.prototype.addTest = function(test){
   test.parent = this;
   test.timeout(this.timeout());
+  test.slow(this.slow());
   test.ctx = this.ctx;
   this.tests.push(test);
   this.emit('test', test);
@@ -4303,7 +4486,7 @@ var ignore = ['node_modules', '.git'];
  * @api private
  */
 
-exports.escape = function(html) {
+exports.escape = function(html){
   return String(html)
     .replace(/&/g, '&amp;')
     .replace(/"/g, '&quot;')
@@ -4320,7 +4503,7 @@ exports.escape = function(html) {
  * @api private
  */
 
-exports.forEach = function(arr, fn, scope) {
+exports.forEach = function(arr, fn, scope){
   for (var i = 0, l = arr.length; i < l; i++)
     fn.call(scope, arr[i], i);
 };
@@ -4334,7 +4517,7 @@ exports.forEach = function(arr, fn, scope) {
  * @api private
  */
 
-exports.indexOf = function (arr, obj, start) {
+exports.indexOf = function(arr, obj, start){
   for (var i = start || 0, l = arr.length; i < l; i++) {
     if (arr[i] === obj)
       return i;
@@ -4348,15 +4531,14 @@ exports.indexOf = function (arr, obj, start) {
  * @param {Array} array
  * @param {Function} fn
  * @param {Object} initial value
- * @param {Object} scope
  * @api private
  */
 
-exports.reduce = function(arr, fn, val, scope) {
+exports.reduce = function(arr, fn, val){
   var rval = val;
 
   for (var i = 0, l = arr.length; i < l; i++) {
-    rval = fn.call(scope, rval, arr[i], i, arr);
+    rval = fn(rval, arr[i], i, arr);
   }
 
   return rval;
@@ -4367,17 +4549,15 @@ exports.reduce = function(arr, fn, val, scope) {
  *
  * @param {Array} array
  * @param {Function} fn
- * @param {Object} scope
  * @api private
  */
 
-exports.filter = function(arr, fn, scope) {
+exports.filter = function(arr, fn){
   var ret = [];
 
   for (var i = 0, l = arr.length; i < l; i++) {
     var val = arr[i];
-    if (fn.call(scope, val, i, arr))
-      ret.push(val);
+    if (fn(val, i, arr)) ret.push(val);
   }
 
   return ret;
@@ -4511,6 +4691,60 @@ exports.escapeRegexp = function(str){
 exports.trim = function(str){
   return str.replace(/^\s+|\s+$/g, '');
 };
+
+/**
+ * Parse the given `qs`.
+ *
+ * @param {String} qs
+ * @return {Object}
+ * @api private
+ */
+
+exports.parseQuery = function(qs){
+  return exports.reduce(qs.replace('?', '').split('&'), function(obj, pair){
+    var i = pair.indexOf('=')
+      , key = pair.slice(0, i)
+      , val = pair.slice(++i);
+
+    obj[key] = decodeURIComponent(val);
+    return obj;
+  }, {});
+};
+
+/**
+ * Highlight the given string of `js`.
+ *
+ * @param {String} js
+ * @return {String}
+ * @api private
+ */
+
+function highlight(js) {
+  return js
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
+    .replace(/('.*?')/gm, '<span class="string">$1</span>')
+    .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
+    .replace(/(\d+)/gm, '<span class="number">$1</span>')
+    .replace(/\bnew *(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
+    .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>')
+}
+
+/**
+ * Highlight the contents of tag `name`.
+ *
+ * @param {String} name
+ * @api private
+ */
+
+exports.highlightTags = function(name) {
+  var code = document.getElementsByTagName(name);
+  for (var i = 0, len = code.length; i < len; ++i) {
+    code[i].innerHTML = highlight(code[i].innerHTML);
+  }
+};
+
 }); // module: utils.js
 /**
  * Node shims.
@@ -4574,69 +4808,25 @@ process.on = function(e, fn){
   }
 };
 
-/**
- * Expose mocha.
- */
-
-window.mocha = require('mocha');
-
 // boot
 ;(function(){
-  var utils = mocha.utils
-    , options = {}
-
-  // TODO: use new Mocha here... not mocha.grep etc
-
-  mocha.suite = new mocha.Suite('', new mocha.Context());
-
-  /**
-   * Highlight the given string of `js`.
-   */
-
-  function highlight(js) {
-    return js
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
-      .replace(/('.*?')/gm, '<span class="string">$1</span>')
-      .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
-      .replace(/(\d+)/gm, '<span class="number">$1</span>')
-      .replace(/\bnew *(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
-      .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>')
-  }
 
   /**
-   * Highlight code contents.
+   * Expose mocha.
    */
 
-  function highlightCode() {
-    var code = document.getElementsByTagName('code');
-    for (var i = 0, len = code.length; i < len; ++i) {
-      code[i].innerHTML = highlight(code[i].innerHTML);
-    }
-  }
+  var Mocha = window.Mocha = require('mocha'),
+      mocha = window.mocha = new Mocha({ reporter: 'html' });
 
   /**
-   * Parse the given `qs`.
+   * Override ui to ensure that the ui functions are initialized.
+   * Normally this would happen in Mocha.prototype.loadFiles.
    */
 
-  function parse(qs) {
-    return utils.reduce(qs.replace('?', '').split('&'), function(obj, pair){
-      var i = pair.indexOf('=')
-        , key = pair.slice(0, i)
-        , val = pair.slice(++i);
-
-      obj[key] = decodeURIComponent(val);
-      return obj;
-    }, {});
-  }
-
-  /**
-   * Grep.
-   */
-
-  mocha.grep = function(str){
-    options.grep = new RegExp(utils.escapeRegexp(str));
+  mocha.ui = function(ui){
+    Mocha.prototype.ui.call(this, ui);
+    this.suite.emit('pre-require', window, null, this);
+    return this;
   };
 
   /**
@@ -4644,14 +4834,9 @@ window.mocha = require('mocha');
    */
 
   mocha.setup = function(opts){
-    if ('string' === typeof opts) options.ui = opts;
-    else options = opts;
-
-    ui = mocha.interfaces[options.ui];
-    if (!ui) throw new Error('invalid mocha interface "' + ui + '"');
-    if (options.timeout) mocha.suite.timeout(options.timeout);
-    ui(mocha.suite);
-    mocha.suite.emit('pre-require', window, null, mocha);
+    if ('string' == typeof opts) opts = { ui: opts };
+    for (var opt in opts) this[opt](opts[opt]);
+    return this;
   };
 
   /**
@@ -4659,18 +4844,16 @@ window.mocha = require('mocha');
    */
 
   mocha.run = function(fn){
-    mocha.suite.emit('run');
-    var runner = new mocha.Runner(mocha.suite);
-    var Reporter = options.reporter || mocha.reporters.HTML;
-    var reporter = new Reporter(runner);
-    var query = parse(window.location.search || "");
-    if (query.grep) runner.grep(new RegExp(query.grep));
-    if (options.grep) runner.grep(options.grep);
-    if (options.ignoreLeaks) runner.ignoreLeaks = true;
-    if (options.globals) runner.globals(options.globals);
-    runner.globals(['location']);
-    runner.on('end', highlightCode);
-    return runner.run(fn);
+    var options = mocha.options;
+    mocha.globals('location');
+
+    var query = Mocha.utils.parseQuery(window.location.search || '');
+    if (query.grep) mocha.grep(query.grep);
+
+    return Mocha.prototype.run.call(mocha, function(){
+      Mocha.utils.highlightTags('code');
+      if (fn) fn();
+    });
   };
 })();
 })();