RubyGems - konacha - Versions diffs - 2.0.0 → 2.1.0 - Mend

konacha 2.0.0 → 2.1.0

Files changed (16) hide show

data/History.md +10 -0
data/README.md +2 -2
data/app/assets/javascripts/konacha/runner.js +19 -4
data/app/views/konacha/specs/iframe.html.erb +1 -2
data/config/routes.rb +3 -3
data/konacha.gemspec +1 -1
data/lib/konacha/reporter/metadata.rb +2 -3
data/lib/konacha/runner.rb +1 -1
data/spec/dummy/spec/javascripts/failing_spec.js +6 -0
data/spec/reporter/metadata_spec.rb +15 -10
data/spec/runner_spec.rb +23 -4
data/spec/views/specs/iframe.html.erb_spec.rb +3 -36
data/vendor/assets/javascripts/mocha.js +134 -40
data/vendor/assets/stylesheets/mocha.css +43 -19
metadata +4 -5
data/app/helpers/konacha/specs_helper.rb +0 -11

data/History.md CHANGED Viewed

@@ -1,5 +1,15 @@
 # master
+# 2.1.0
+* Improve capybara-webkit compatibility (#79)
+* Update mocha (1.7.0+)
+* Fix mocha error detection in `done()` (#74)
+* Make spec file path is available to reporters
+* Improve error reporting for `konacha:run` output
+# 2.0.0
 * Run tests in an iframe, with `<body id="konacha">`. Each test file is run in
   isolation.
 * Removed support for konacha_config.js and Konacha.mochaOptions in favor of

data/README.md CHANGED Viewed

@@ -192,8 +192,8 @@ The `defined?` check is necessary to avoid a dependency on Konacha in the produc
 environment.
 The `spec_dir` option tells Konacha where to find JavaScript specs. `driver`
-names a Capybara driver used for the `run` task (try `:webkit`, after
-installing [capybara-webkit](https://github.com/thoughtbot/capybara-webkit)).
+names a Capybara driver used for the `run` task (try `:poltergeist`, after
+installing [PhantomJS](https://github.com/jonleighton/poltergeist#installing-phantomjs)).
 The `stylesheets` option sets the stylesheets to be linked from the `<head>`
 of the test runner iframe. The values above are the defaults.

data/app/assets/javascripts/konacha/runner.js CHANGED Viewed

@@ -11,19 +11,34 @@ mocha.reporter(function(runner) {
       fullTitle:test.fullTitle(),
       duration:test.duration,
       parentFullTitle:test.parent.fullTitle(),
-      status:status
+      status:status,
+      path:test.parent.path
     };
-    if (status == "failed")
-      obj.error = test.err; // Contains message, expected, actual, operator, stack
+    if (status == "failed") {
+      // Error objects don't serialize properly, so we copy attributes. Note
+      // that iterating over test.err skips name and message.
+      obj.error = {
+        name: test.err.name,
+        message: test.err.message,
+        // We could copy stack, fileName, and lineNumber here, but they're not
+        // available for AssertionErrors. If we had them reliably, we could
+        // easily display them as well.
+      };
+    }
     return obj;
   };
   var createSuiteObject = function(suite) {
+    // We need to propagate the path down the suite tree
+    if (suite.parent)
+      suite.path = suite.parent.path;
     var obj = {
       title:suite.title,
-      fullTitle:suite.fullTitle()
+      fullTitle:suite.fullTitle(),
+      path:suite.path
     };
     if (suite.parent)

data/app/views/konacha/specs/iframe.html.erb CHANGED Viewed

@@ -10,8 +10,7 @@
     <% end %>
     <%= javascript_include_tag "chai", "konacha/iframe", :debug => false %>
-    <%= spec_include_tag @spec %>
+    <%= javascript_include_tag @spec.asset_name %>
   </head>
   <body>
   </body>

data/config/routes.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 Konacha::Engine.routes.draw do
-  match '/iframe/*name' => 'specs#iframe'
-  match '/'             => 'specs#parent'
-  match '*path'         => 'specs#parent'
+  get '/iframe/*name' => 'specs#iframe'
+  get '/'             => 'specs#parent'
+  get '*path'         => 'specs#parent'
 end

data/konacha.gemspec CHANGED Viewed

@@ -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       = "2.0.0"
+  gem.version       = "2.1.0"
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "actionpack", "~> 3.1"

data/lib/konacha/reporter/metadata.rb CHANGED Viewed

@@ -24,8 +24,7 @@ module Konacha
       end
       def file_path
-        STDERR.puts "file_path not implemented" if Konacha.config.verbose
-        "" # RSpec's BaseFormatter expects the return value to be a string
+        data['path']
       end
       alias_method :location, :file_path
@@ -49,7 +48,7 @@ module Konacha
         return unless data['status'] == "failed"
         @exception ||= begin
-          e = Reporter::SpecException.new(data['error']['message'])
+          e = Reporter::SpecException.new("#{data['error']['name']}: #{data['error']['message']}")
           e.set_backtrace([])
           e
         end

data/lib/konacha/runner.rb CHANGED Viewed

@@ -19,7 +19,7 @@ module Konacha
       done = false
       begin
         sleep 0.1
-        events = JSON.parse(session.evaluate_script('Konacha.getEvents()'))
+        events = JSON.parse(session.evaluate_script('window.top.Konacha.getEvents()'))
         if events
           events[events_consumed..-1].each do |event|
             done = true if event['event'] == 'end'

data/spec/dummy/spec/javascripts/failing_spec.js CHANGED Viewed

@@ -2,4 +2,10 @@ describe("failure", function(){
   it("fails", function(){
     (2 + 2).should.equal(5);
   });
+  it("errors", function() {
+    // Mocha catches and re-throws string exceptions, so we only need to test
+    // throwing real Error objects.
+    throw new Error("this one errors out");
+  });
 });

data/spec/reporter/metadata_spec.rb CHANGED Viewed

@@ -28,9 +28,9 @@ describe Konacha::Reporter::Metadata do
     end
     it "builds a SpecException object" do
-      subject.update('status' => 'failed', 'error' => {'message' => 'expected this to work'})
+      subject.update('status' => 'failed', 'error' => {'name' => 'Error', 'message' => 'expected this to work'})
       subject.exception.should be_a(Konacha::Reporter::SpecException)
-      subject.exception.message.should == 'expected this to work'
+      subject.exception.message.should == 'Error: expected this to work'
       subject.exception.backtrace.should == []
     end
   end
@@ -52,17 +52,22 @@ describe Konacha::Reporter::Metadata do
     end
   end
-  describe "#description" do
-    it "looks for data['title']" do
-      subject.update('title' => 'super test')
-      subject.description.should == 'super test'
+  shared_examples_for "data delegation method" do |key, method|
+    it "returns data['#{key}']" do
+      subject.update(key => 'super test')
+      subject.send(method).should == 'super test'
     end
   end
+  describe "#file_path" do
+    it_behaves_like "data delegation method", "path", "file_path"
+  end
+  describe "#description" do
+    it_behaves_like "data delegation method", "title", "description"
+  end
   describe "#full_description" do
-    it "looks for data['fullTitle']" do
-      subject.update('fullTitle' => 'super test')
-      subject.full_description.should == 'super test'
-    end
+    it_behaves_like "data delegation method", "fullTitle", "full_description"
   end
 end

data/spec/runner_spec.rb CHANGED Viewed

@@ -32,7 +32,8 @@ describe Konacha::Runner do
        'type' => 'suite',
        'data' => {
          'title' => 'failure',
-         'fullTitle' => 'failure'
+         'fullTitle' => 'failure',
+         'path' => 'failing_spec.js'
        }}
     end
@@ -41,7 +42,8 @@ describe Konacha::Runner do
        'type' => 'suite',
        'data' => {
          'title' => 'failure',
-         'fullTitle' => 'failure'
+         'fullTitle' => 'failure',
+         'path' => 'failing_spec.js'
        }}
     end
@@ -51,7 +53,8 @@ describe Konacha::Runner do
        'data'  => {
          'title'           => 'fails',
          'fullTitle'       => 'failure fails',
-         'parentFullTitle' => 'failure'}}
+         'parentFullTitle' => 'failure',
+         'path'            => 'failing_spec.js'}}
     end
     let(:failure) do
@@ -62,7 +65,20 @@ describe Konacha::Runner do
          'fullTitle'       => 'failure fails',
          'parentFullTitle' => 'failure',
          'status'          => 'failed',
-         'error'           => {'message' => 'expected 4 to equal 5', 'expected' => 5}}}
+         'path'            => 'failing_spec.js',
+         'error'           => {'message' => 'expected 4 to equal 5', 'name' => 'AssertionError'}}}
+    end
+    let(:error) do
+      {'event' => 'fail',
+       'type'  => 'test',
+       'data'  => {
+         'title'           => 'errors',
+         'fullTitle'       => 'failure errors',
+         'parentFullTitle' => 'failure',
+         'status'          => 'failed',
+         'path'            => 'failing_spec.js',
+         'error'           => {'message' => 'this one errors out', 'name' => 'Error'}}}
     end
     let(:pass) do
@@ -73,6 +89,7 @@ describe Konacha::Runner do
          'fullTitle'       => 'the body#konacha element is empty',
          'parentFullTitle' => 'the body#konacha element',
          'status'          => 'passed',
+         'path'            => 'body_spec.js.coffee',
          'duration'        => anything}}
     end
@@ -83,6 +100,7 @@ describe Konacha::Runner do
          'title'           => 'is pending',
          'fullTitle'       => 'pending test is pending',
          'parentFullTitle' => 'pending test',
+         'path'            => 'pending_spec.js',
          'status'          => 'pending'}}
     end
@@ -95,6 +113,7 @@ describe Konacha::Runner do
       subject.reporter.should_receive(:process_mocha_event).with(suite_end)
       subject.reporter.should_receive(:process_mocha_event).with(test)
       subject.reporter.should_receive(:process_mocha_event).with(failure)
+      subject.reporter.should_receive(:process_mocha_event).with(error)
       subject.reporter.should_receive(:process_mocha_event).with(pass)
       subject.reporter.should_receive(:process_mocha_event).with(pending)
       subject.reporter.should_receive(:process_mocha_event).with(end_event)

data/spec/views/specs/iframe.html.erb_spec.rb CHANGED Viewed

@@ -5,54 +5,21 @@ describe "konacha/specs/iframe" do
     assign(:stylesheets, [])
   end
-  def asset_double(asset_name, dependencies = [])
-    asset = double("asset called '#{asset_name}'")
-    asset.stub(:to_a).and_return([dependencies, asset].flatten)
-    asset.stub(:logical_path).and_return(asset_name)
-    view.asset_paths.stub(:asset_for).with(asset_name, "js").and_return(asset)
-    asset
-  end
-  def spec_double(asset_name, dependencies = [])
-    asset_double(asset_name, dependencies)
+  def spec_double(asset_name)
     double("spec called '#{asset_name}'", :asset_name => asset_name, :path => "#{asset_name}.js")
   end
-  let(:dependency) { asset_double("dependency") }
   it "renders a script tag for @spec" do
     assign(:spec, spec_double("a_spec"))
     render
-    rendered.should have_selector("script[src='/assets/a_spec.js?body=1']")
-  end
-  it "renders a script tag for a spec's dependencies" do
-    assign(:spec, spec_double("spec", [dependency]))
-    render
-    rendered.should have_selector("script[src='/assets/dependency.js?body=1']")
-    rendered.should have_selector("script[src='/assets/spec.js?body=1']")
-  end
-  it "renders only one script tag for dependencies of dependencies" do
-    dependency_a = asset_double("dependency_a")
-    dependency_b = asset_double("dependency_b", [dependency_a])
-    assign(:spec, spec_double("a_spec", [dependency_a, dependency_b]))
-    render
-    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)
+    rendered.should have_selector("script[src='/assets/a_spec.js']")
   end
-  it "render the stylesheets" do
+  it "renders the stylesheets" do
     assign(:spec, spec_double("a_spec"))
     assign(:stylesheets, %w(foo bar))
-    assign(:specs, [])
     render

data/vendor/assets/javascripts/mocha.js CHANGED Viewed

@@ -591,7 +591,7 @@ module.exports = function(suite){
     context.describe = context.context = function(title, fn){
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
-      fn();
+      fn.call(suite);
       suites.shift();
       return suite;
     };
@@ -606,7 +606,7 @@ module.exports = function(suite){
       var suite = Suite.create(suites[0], title);
       suite.pending = true;
       suites.unshift(suite);
-      fn();
+      fn.call(suite);
       suites.shift();
     };
@@ -903,7 +903,7 @@ module.exports = function(suite){
     context.suite = function(title, fn){
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
-      fn();
+      fn.call(suite);
       suites.shift();
       return suite;
     };
@@ -937,6 +937,14 @@ module.exports = function(suite){
       var test = context.test(title, fn);
       mocha.grep(test.fullTitle());
     };
+    /**
+     * Pending test case.
+     */
+    context.test.skip = function(title){
+      context.test(title);
+    };
   });
 };
@@ -1211,6 +1219,18 @@ Mocha.prototype.slow = function(slow){
   return this;
 };
+/**
+ * Makes all tests async (accepting a callback)
+ *
+ * @return {Mocha}
+ * @api public
+ */
+Mocha.prototype.asyncOnly = function(){
+  this.options.asyncOnly = true;
+  return this;
+};
 /**
  * Run tests and invoke `fn()` when complete.
  *
@@ -1226,6 +1246,7 @@ Mocha.prototype.run = function(fn){
   var runner = new exports.Runner(suite);
   var reporter = new this._reporter(runner);
   runner.ignoreLeaks = options.ignoreLeaks;
+  runner.asyncOnly = options.asyncOnly;
   if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);
   if (options.growl) this._growl(runner, reporter);
@@ -1306,14 +1327,14 @@ function parse(str) {
  */
 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';
+  if (ms == d) return Math.round(ms / d) + ' day';
+  if (ms > d) return Math.round(ms / d) + ' days';
+  if (ms == h) return Math.round(ms / h) + ' hour';
+  if (ms > h) return Math.round(ms / h) + ' hours';
+  if (ms == m) return Math.round(ms / m) + ' minute';
+  if (ms > m) return Math.round(ms / m) + ' minutes';
+  if (ms == s) return Math.round(ms / s) + ' second';
+  if (ms > s) return Math.round(ms / s) + ' seconds';
   return ms + ' ms';
 }
 }); // module: ms.js
@@ -1382,6 +1403,23 @@ exports.colors = {
   , 'diff removed': 41
 };
+/**
+ * Default symbol map.
+ */
+exports.symbols = {
+  ok: '✔',
+  err: '✖',
+  dot: '․'
+};
+// With node.js on Windows: use symbols available in terminal default fonts
+if ('win32' == process.platform) {
+  exports.symbols.ok = '\u221A';
+  exports.symbols.err = '\u00D7';
+  exports.symbols.dot = '.';
+}
 /**
  * Color `str` with the given `type`,
  * allowing colors to be disabled,
@@ -1532,6 +1570,8 @@ function Base(runner) {
   if (!runner) return;
   this.runner = runner;
+  runner.stats = stats;
   runner.on('start', function(){
     stats.start = new Date;
   });
@@ -1596,7 +1636,7 @@ Base.prototype.epilogue = function(){
   // failure
   if (stats.failures) {
-    fmt = color('bright fail', '  ✖')
+    fmt = color('bright fail', '  ' + exports.symbols.err)
       + color('fail', ' %d of %d %s failed')
       + color('light', ':')
@@ -1611,7 +1651,7 @@ Base.prototype.epilogue = function(){
   }
   // pass
-  fmt = color('bright pass', '  ✔')
+  fmt = color('bright pass', '  ' + exports.symbols.ok)
     + color('green', ' %d %s complete')
     + color('light', ' (%s)');
@@ -1723,7 +1763,7 @@ function Doc(runner) {
     ++indents;
     console.log('%s<section class="suite">', indent());
     ++indents;
-    console.log('%s<h1>%s</h1>', indent(), suite.title);
+    console.log('%s<h1>%s</h1>', indent(), utils.escape(suite.title));
     console.log('%s<dl>', indent());
   });
@@ -1736,7 +1776,7 @@ function Doc(runner) {
   });
   runner.on('pass', function(test){
-    console.log('%s  <dt>%s</dt>', indent(), test.title);
+    console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
     var code = utils.escape(utils.clean(test.fn.toString()));
     console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
   });
@@ -1772,7 +1812,6 @@ function Dot(runner) {
   var self = this
     , stats = this.stats
     , width = Base.window.width * .75 | 0
-    , c = '․'
     , n = 0;
   runner.on('start', function(){
@@ -1780,21 +1819,21 @@ function Dot(runner) {
   });
   runner.on('pending', function(test){
-    process.stdout.write(color('pending', c));
+    process.stdout.write(color('pending', Base.symbols.dot));
   });
   runner.on('pass', function(test){
     if (++n % width == 0) process.stdout.write('\n  ');
     if ('slow' == test.speed) {
-      process.stdout.write(color('bright yellow', c));
+      process.stdout.write(color('bright yellow', Base.symbols.dot));
     } else {
-      process.stdout.write(color(test.speed, c));
+      process.stdout.write(color(test.speed, Base.symbols.dot));
     }
   });
   runner.on('fail', function(test, err){
     if (++n % width == 0) process.stdout.write('\n  ');
-    process.stdout.write(color('fail', c));
+    process.stdout.write(color('fail', Base.symbols.dot));
   });
   runner.on('end', function(){
@@ -1897,7 +1936,7 @@ exports = module.exports = HTML;
  * Stats template.
  */
-var statsTemplate = '<ul id="stats">'
+var statsTemplate = '<ul id="mocha-stats">'
   + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
   + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
   + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
@@ -1925,7 +1964,7 @@ function HTML(runner, root) {
     , failuresLink = items[2].getElementsByTagName('a')[0]
     , duration = items[3].getElementsByTagName('em')[0]
     , canvas = stat.getElementsByTagName('canvas')[0]
-    , report = fragment('<ul id="report"></ul>')
+    , report = fragment('<ul id="mocha-report"></ul>')
     , stack = [report]
     , progress
     , ctx
@@ -1992,7 +2031,7 @@ function HTML(runner, root) {
     window.scrollTo(0, document.body.scrollHeight);
     // TODO: add to stats
-    var percent = stats.tests / total * 100 | 0;
+    var percent = stats.tests / this.total * 100 | 0;
     if (progress) progress.update(percent).draw(ctx);
     // update stats
@@ -2003,11 +2042,11 @@ function HTML(runner, root) {
     // test
     if ('passed' == test.state) {
-      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span></h2></li>', test.speed, test.title, test.duration);
+      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="?grep=%e" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, encodeURIComponent(test.fullTitle()));
     } else if (test.pending) {
       var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
     } else {
-      var el = fragment('<li class="test fail"><h2>%e</h2></li>', test.title);
+      var el = fragment('<li class="test fail"><h2>%e <a href="?grep=%e" class="replay">‣</a></h2></li>', test.title, encodeURIComponent(test.fullTitle()));
       var str = test.err.stack || test.err.toString();
       // FF / Opera do not add the message
@@ -2043,7 +2082,8 @@ function HTML(runner, root) {
       pre.style.display = 'none';
     }
-    stack[0].appendChild(el);
+    // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
+    if (stack[0]) stack[0].appendChild(el);
   });
 }
@@ -2052,7 +2092,7 @@ function HTML(runner, root) {
  */
 function error(msg) {
-  document.body.appendChild(fragment('<div id="error">%s</div>', msg));
+  document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
 }
 /**
@@ -2230,6 +2270,10 @@ function map(cov) {
     ret.sloc += data.sloc;
   }
+  ret.files.sort(function(a, b) {
+    return a.filename.localeCompare(b.filename);
+  });
   if (ret.sloc > 0) {
     ret.coverage = (ret.hits / ret.sloc) * 100;
   }
@@ -2584,7 +2628,7 @@ function List(runner) {
   });
   runner.on('pass', function(test){
-    var fmt = color('checkmark', '  ✓')
+    var fmt = color('checkmark', '  '+Base.symbols.dot)
       + color('pass', ' %s: ')
       + color(test.speed, '%dms');
     cursor.CR();
@@ -2680,7 +2724,7 @@ function Markdown(runner) {
   runner.on('suite', function(suite){
     ++level;
     var slug = utils.slug(suite.fullTitle());
-    buf += '<a name="' + slug + '" />' + '\n';
+    buf += '<a name="' + slug + '"></a>' + '\n';
     buf += title(suite.title) + '\n';
   });
@@ -3056,7 +3100,7 @@ function Progress(runner, options) {
   // default chars
   options.open = options.open || '[';
   options.complete = options.complete || '▬';
-  options.incomplete = options.incomplete || '⋅';
+  options.incomplete = options.incomplete || Base.symbols.dot;
   options.close = options.close || ']';
   options.verbose = false;
@@ -3165,13 +3209,13 @@ function Spec(runner) {
   runner.on('pass', function(test){
     if ('fast' == test.speed) {
       var fmt = indent()
-        + color('checkmark', '  ✓')
+        + color('checkmark', '  ' + Base.symbols.ok)
         + color('pass', ' %s ');
       cursor.CR();
       console.log(fmt, test.title);
     } else {
       var fmt = indent()
-        + color('checkmark', '  ✓')
+        + color('checkmark', '  ' + Base.symbols.ok)
         + color('pass', ' %s ')
         + color(test.speed, '(%dms)');
       cursor.CR();
@@ -3461,7 +3505,8 @@ require.register("runnable.js", function(module, exports, require){
  */
 var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:runnable');
+  , debug = require('browser/debug')('mocha:runnable')
+  , milliseconds = require('./ms');
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -3473,6 +3518,12 @@ var Date = global.Date
   , clearTimeout = global.clearTimeout
   , clearInterval = global.clearInterval;
+/**
+ * Object#toString().
+ */
+var toString = Object.prototype.toString;
 /**
  * Expose `Runnable`.
  */
@@ -3508,13 +3559,14 @@ Runnable.prototype.constructor = Runnable;
 /**
  * Set & get timeout `ms`.
  *
- * @param {Number} ms
+ * @param {Number|String} ms
  * @return {Runnable|Number} ms or self
  * @api private
  */
 Runnable.prototype.timeout = function(ms){
   if (0 == arguments.length) return this._timeout;
+  if ('string' == typeof ms) ms = milliseconds(ms);
   debug('timeout %d', ms);
   this._timeout = ms;
   if (this.timer) this.resetTimeout();
@@ -3524,13 +3576,14 @@ Runnable.prototype.timeout = function(ms){
 /**
  * Set & get slow `ms`.
  *
- * @param {Number} ms
+ * @param {Number|String} ms
  * @return {Runnable|Number} ms or self
  * @api private
  */
 Runnable.prototype.slow = function(ms){
   if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
   debug('timeout %d', ms);
   this._slow = ms;
   return this;
@@ -3644,7 +3697,7 @@ Runnable.prototype.run = function(fn){
   if (this.async) {
     try {
       this.fn.call(ctx, function(err){
-        if (err instanceof Error) return done(err);
+        if (toString.call(err) === "[object Error]") return done(err);
         if (null != err) return done(new Error('done() invoked with non-Error: ' + err));
         done();
       });
@@ -3653,7 +3706,11 @@ Runnable.prototype.run = function(fn){
     }
     return;
   }
+  if (this.asyncOnly) {
+    return done(new Error('--async-only option in use without declaring `done()`'));
+  }
   // sync
   try {
     if (!this.pending) this.fn.call(ctx);
@@ -3680,6 +3737,19 @@ var EventEmitter = require('browser/events').EventEmitter
   , keys = utils.keys
   , noop = function(){};
+/**
+ * Non-enumerable globals.
+ */
+var globals = [
+  'setTimeout',
+  'clearTimeout',
+  'setInterval',
+  'clearInterval',
+  'XMLHttpRequest',
+  'Date'
+];
 /**
  * Expose `Runner`.
  */
@@ -3714,7 +3784,7 @@ function Runner(suite) {
   this.on('test end', function(test){ self.checkGlobals(test); });
   this.on('hook end', function(hook){ self.checkGlobals(hook); });
   this.grep(/.*/);
-  this.globals(utils.keys(global).concat(['errno']));
+  this.globals(this.globalProps().concat(['errno']));
 }
 /**
@@ -3765,6 +3835,25 @@ Runner.prototype.grepTotal = function(suite) {
   return total;
 };
+/**
+ * Return a list of global properties.
+ *
+ * @return {Array}
+ * @api private
+ */
+Runner.prototype.globalProps = function() {
+  var props = utils.keys(global);
+  // non-enumerables
+  for (var i = 0; i < globals.length; ++i) {
+    if (~props.indexOf(globals[i])) continue;
+    props.push(globals[i]);
+  }
+  return props;
+};
 /**
  * Allow the given `arr` of globals.
  *
@@ -3791,7 +3880,7 @@ Runner.prototype.globals = function(arr){
 Runner.prototype.checkGlobals = function(test){
   if (this.ignoreLeaks) return;
   var ok = this._globals;
-  var globals = keys(global);
+  var globals = this.globalProps();
   var isNode = process.kill;
   var leaks;
@@ -3971,6 +4060,8 @@ Runner.prototype.runTest = function(fn){
   var test = this.test
     , self = this;
+  if (this.asyncOnly) test.asyncOnly = true;
   try {
     test.on('error', function(err){
       self.fail(test, err);
@@ -3992,7 +4083,7 @@ Runner.prototype.runTest = function(fn){
 Runner.prototype.runTests = function(suite, fn){
   var self = this
-    , tests = suite.tests
+    , tests = suite.tests.slice()
     , test;
   function next(err) {
@@ -4160,6 +4251,8 @@ function filterLeaks(ok, globals) {
   return filter(globals, function(key){
     var matched = filter(ok, function(ok){
       if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
+      // Opera and IE expose global variables for HTML element IDs (issue #243)
+      if (/^mocha-/.test(key)) return true;
       return key == ok;
     });
     return matched.length == 0 && (!global.navigator || 'onerror' !== key);
@@ -4896,6 +4989,7 @@ process.on = function(e, fn){
     var query = Mocha.utils.parseQuery(window.location.search || '');
     if (query.grep) mocha.grep(query.grep);
+    if (query.invert) mocha.invert();
     return Mocha.prototype.run.call(mocha, function(){
       Mocha.utils.highlightTags('code');

data/vendor/assets/stylesheets/mocha.css CHANGED Viewed

@@ -55,16 +55,6 @@ body {
   margin-left: 15px;
 }
-#mocha .test:hover h2::after {
-  position: relative;
-  top: 0;
-  right: -10px;
-  content: '(view source)';
-  font-size: 12px;
-  font-family: arial;
-  color: #888;
-}
 #mocha .test.pending:hover h2::after {
   content: '(pending)';
   font-family: arial;
@@ -134,6 +124,8 @@ body {
 #mocha .test pre.error {
   color: #c00;
+  max-height: 300px;
+  overflow: auto;
 }
 #mocha .test pre {
@@ -145,24 +137,56 @@ body {
   border-bottom-color: #ddd;
   -webkit-border-radius: 3px;
   -webkit-box-shadow: 0 1px 3px #eee;
+  -moz-border-radius: 3px;
+  -moz-box-shadow: 0 1px 3px #eee;
+}
+#mocha .test h2 {
+  position: relative;
+}
+#mocha .test a.replay {
+  position: absolute;
+  top: 3px;
+  right: -20px;
+  text-decoration: none;
+  vertical-align: middle;
+  display: block;
+  width: 15px;
+  height: 15px;
+  line-height: 15px;
+  text-align: center;
+  background: #eee;
+  font-size: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+  -webkit-transition: opacity 200ms;
+  -moz-transition: opacity 200ms;
+  transition: opacity 200ms;
+  opacity: 0.2;
+  color: #888;
+}
+#mocha .test:hover a.replay {
+  opacity: 1;
 }
-#report.pass .test.fail {
+#mocha-report.pass .test.fail {
   display: none;
 }
-#report.fail .test.pass {
+#mocha-report.fail .test.pass {
   display: none;
 }
-#error {
+#mocha-error {
   color: #c00;
   font-size: 1.5  em;
   font-weight: 100;
   letter-spacing: 1px;
 }
-#stats {
+#mocha-stats {
   position: fixed;
   top: 15px;
   right: 10px;
@@ -171,25 +195,25 @@ body {
   color: #888;
 }
-#stats .progress {
+#mocha-stats .progress {
   float: right;
   padding-top: 0;
 }
-#stats em {
+#mocha-stats em {
   color: black;
 }
-#stats a {
+#mocha-stats a {
   text-decoration: none;
   color: inherit;
 }
-#stats a:hover {
+#mocha-stats a:hover {
   border-bottom: 1px solid #eee;
 }
-#stats li {
+#mocha-stats li {
   display: inline-block;
   margin: 0 5px;
   list-style: none;

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -219,7 +219,6 @@ files:
 - app/assets/javascripts/konacha/runner.js
 - app/assets/stylesheets/konacha.css
 - app/controllers/konacha/specs_controller.rb
-- app/helpers/konacha/specs_helper.rb
 - app/models/konacha/spec.rb
 - app/views/konacha/specs/iframe.html.erb
 - app/views/konacha/specs/parent.html.erb
@@ -293,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3302802791356111510
+      hash: 3925858609207323185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3302802791356111510
+      hash: 3925858609207323185
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24

data/app/helpers/konacha/specs_helper.rb DELETED Viewed

@@ -1,11 +0,0 @@
-module Konacha
-  module SpecsHelper
-    def spec_include_tag(*specs)
-      assets = specs.map do |spec|
-        asset_paths.asset_for(spec.asset_name, "js").to_a
-      end.flatten.map(&:logical_path).uniq
-      javascript_include_tag *(assets << {:body => true, :debug => false})
-    end
-  end
-end