konacha 1.5.0 → 1.5.1

data/History.md

@@ -1,4 +1,10 @@
-# master
+# 1.x-stable
+
+# 1.5.1
+
+* Fix exit code to be 0 if there are pending tests
+* Show full backtrace when test runner fails
+* Update mocha (1.4.1)
 
 # 1.5.0
 

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

data/lib/konacha/runner.rb

@@ -40,7 +40,7 @@ module Konacha
     end
 
     def passed?
-      examples.all? { |example| example.passed? }
+      examples.all? { |example| example.passed? || example.pending? }
     end
 
     def failure_messages
@@ -102,9 +102,7 @@ module Konacha
         Example.new(row)
       end
     rescue => e
-      msg = [e.inspect]
-      msg << e.message unless e.message.blank?
-      raise Konacha::Error, "Error communicating with browser process:\n#{msg.join("\n")}"
+      raise e, "Error communicating with browser process: #{e}", e.backtrace
     end
   end
 
@@ -139,5 +137,11 @@ module Konacha
   end
 
   class Error < StandardError
+    attr_accessor :original
+
+    def initialize(msg, original=nil);
+      super(msg);
+      @original = original;
+    end
   end
 end

data/vendor/assets/javascripts/mocha.js

@@ -940,7 +940,8 @@ require.register("mocha.js", function(module, exports, require){
  * Module dependencies.
  */
 
-var path = require('browser/path');
+var path = require('browser/path')
+  , utils = require('./utils');
 
 /**
  * Expose `Mocha`.
@@ -952,7 +953,7 @@ exports = module.exports = Mocha;
  * Expose internals.
  */
 
-exports.utils = require('./utils');
+exports.utils = utils;
 exports.interfaces = require('./interfaces');
 exports.reporters = require('./reporters');
 exports.Runnable = require('./runnable');
@@ -1086,16 +1087,16 @@ Mocha.prototype._growl = function(runner, reporter) {
 };
 
 /**
- * Add regexp to grep for to the options object
+ * Add regexp to grep, if `re` is a string it is escaped.
  *
- * @param {RegExp} or {String} re
+ * @param {RegExp|String} re
  * @return {Mocha}
  * @api public
  */
 
 Mocha.prototype.grep = function(re){
   this.options.grep = 'string' == typeof re
-    ? new RegExp(re)
+    ? new RegExp(utils.escapeRegexp(re))
     : re;
   return this;
 };
@@ -1758,12 +1759,13 @@ var statsTemplate = '<ul id="stats">'
  * @api public
  */
 
-function HTML(runner, root) {
+function HTML(runner) {
   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]
@@ -1777,8 +1779,6 @@ function HTML(runner, root) {
     , progress
     , ctx
 
-  root = root || document.getElementById('mocha');
-
   if (canvas.getContext) {
     var ratio = window.devicePixelRatio || 1;
     canvas.style.width = canvas.width;
@@ -1814,7 +1814,7 @@ function HTML(runner, root) {
 
     // suite
     var grep = '^' + encodeURIComponent(utils.escapeRegexp(suite.fullTitle()));
-    var url = '?grep=' + grep;
+    var url = location.protocol + '//' + location.host + location.pathname + '?grep=' + grep;
     var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
 
     // container
@@ -1957,6 +1957,7 @@ exports.Min = require('./min');
 exports.Spec = require('./spec');
 exports.Nyan = require('./nyan');
 exports.XUnit = require('./xunit');
+exports.Markdown = require('./markdown');
 exports.Progress = require('./progress');
 exports.Landing = require('./landing');
 exports.JSONCov = require('./json-cov');

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: konacha
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - John Firebaugh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-28 00:00:00 Z
+date: 2012-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties