konacha 1.2.2 → 1.2.3

data/History.md

@@ -1,5 +1,10 @@
 # master
 
+# 1.2.3
+
+* Update mocha (1.1.0) and chai (1.0.4)
+* Traverse symlinked directories when discovering specs
+
 # 1.2.2
 
 * Update chai (1.0.3)

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.2.2"
+  gem.version       = "1.2.3"
 
   gem.add_dependency "rails", "~> 3.1"
   gem.add_dependency "capybara"

data/lib/konacha.rb

@@ -33,7 +33,7 @@ module Konacha
     end
 
     def spec_paths
-      Dir[File.join(spec_root, "**/*{_spec,_test}.*")].map do |path|
+      Dir[File.join(spec_root, "**{,/*/**}/*{_spec,_test}.*")].map do |path|
         path.gsub(File.join(spec_root, ''), '')
       end
     end

data/spec/konacha_spec.rb

@@ -23,6 +23,26 @@ describe Konacha do
       subject.should include("subdirectory/subdirectory_spec.js")
     end
 
+    it "traverses symlinked directories" do
+      begin
+        # Create a directory with specs outside of 'spec/javascripts'.
+        Dir.mkdir "spec/dummy/app/external_specs"
+        File.new "spec/dummy/app/external_specs/my_spec.js", "w"
+
+        # Symlink it into 'spec/javascripts'.
+        File.symlink "../../app/external_specs/", "spec/dummy/spec/javascripts/external_specs"
+
+        subject.should include("external_specs/my_spec.js")
+
+        File.unlink "spec/dummy/spec/javascripts/external_specs"
+      rescue NotImplementedError
+        # Don't test this on platforms that don't support symlinking.
+      end
+
+      File.unlink "spec/dummy/app/external_specs/my_spec.js"
+      Dir.unlink "spec/dummy/app/external_specs"
+    end
+
     it "does not include spec_helper" do
       subject.should_not include("spec_helper.js")
     end

data/vendor/assets/javascripts/chai.js

@@ -305,11 +305,11 @@ Assertion.addChainableMethod('a', an);
  * @api public
  */
 
-function includeChainingBehavior() {
+function includeChainingBehavior () {
   flag(this, 'contains', true);
 }
 
-function include(val) {
+function include (val) {
   var obj = flag(this, 'object')
   this.assert(
       ~obj.indexOf(val)
@@ -527,24 +527,22 @@ Object.defineProperty(Assertion.prototype, 'empty',
  *     }
  *
  * @name arguments
+ * @alias Arguments
  * @api public
  */
 
-Object.defineProperty(Assertion.prototype, 'arguments',
-  { get: function () {
-      var obj = flag(this, 'object');
-      this.assert(
-          '[object Arguments]' == Object.prototype.toString.call(obj)
-        , 'expected #{this} to be arguments'
-        , 'expected #{this} to not be arguments'
-        , '[object Arguments]'
-        , Object.prototype.toString.call(obj)
-      );
+function checkArguments () {
+  var obj = flag(this, 'object')
+    , type = Object.prototype.toString.call(obj);
+  this.assert(
+      '[object Arguments]' === type
+    , 'expected #{this} to be arguments but got ' + type
+    , 'expected #{this} to not be arguments'
+  );
+}
 
-      return this;
-    }
-  , configurable: true
-});
+Assertion.addProperty('arguments', checkArguments);
+Assertion.addProperty('Arguments', checkArguments);
 
 /**
  * ### .equal(value)
@@ -1042,9 +1040,16 @@ Assertion.prototype.Throw = function (constructor, msg) {
  *
  * Asserts that the object or class target will respond to a method.
  *
+ *     Klass.prototype.bar = function(){};
  *     expect(Klass).to.respondTo('bar');
  *     expect(obj).to.respondTo('bar');
  *
+ * To check if a constructor will respond to a static function,
+ * set the `itself` flag.
+ *
+ *    Klass.baz = function(){};
+ *    expect(Klass).itself.to.respondTo('baz');
+ *
  * @name respondTo
  * @param {String} method
  * @api public
@@ -1052,7 +1057,8 @@ Assertion.prototype.Throw = function (constructor, msg) {
 
 Assertion.prototype.respondTo = function (method) {
   var obj = flag(this, 'object')
-    , context = ('function' === typeof obj)
+    , itself = flag(this, 'itself')
+    , context = ('function' === typeof obj && !itself)
       ? obj.prototype[method]
       : obj[method];
 
@@ -1067,6 +1073,29 @@ Assertion.prototype.respondTo = function (method) {
   return this;
 };
 
+/**
+ * ### .itself
+ *
+ * Sets the `itself` flag, later used by the `respondTo` assertion.
+ *
+ *    function Foo() {}
+ *    Foo.bar = function() {}
+ *    Foo.prototype.baz = function() {}
+ *
+ *    expect(Foo).itself.to.respondTo('bar');
+ *    expect(Foo).itself.not.to.respondTo('baz');
+ *
+ * @name itself
+ * @api public
+ */
+Object.defineProperty(Assertion.prototype, 'itself',
+  { get: function () {
+      flag(this, 'itself', true);
+      return this;
+    }
+  , configurable: true
+});
+
 /**
  * ### .satisfy(method)
  *
@@ -1183,7 +1212,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '1.0.3';
+exports.version = '1.0.4';
 
 /*!
  * Primary `Assertion` prototype
@@ -2336,9 +2365,8 @@ var transferFlags = require('./transferFlags');
  */
 
 module.exports = function (ctx, name, method, chainingBehavior) {
-  if (typeof chainingBehavior !== 'function') {
+  if (typeof chainingBehavior !== 'function')
     chainingBehavior = function () { };
-  }
 
   Object.defineProperty(ctx, name,
     { get: function () {
@@ -2352,20 +2380,15 @@ module.exports = function (ctx, name, method, chainingBehavior) {
         // Re-enumerate every time to better accomodate plugins.
         var asserterNames = Object.getOwnPropertyNames(ctx);
         asserterNames.forEach(function (asserterName) {
-          var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
-
-          // Avoid trying to overwrite things that we can't, like `length`
-          // and `arguments`.
-          var functionProtoPD = Object.getOwnPropertyDescriptor(Function.prototype, asserterName);
-          if (functionProtoPD && !functionProtoPD.configurable) {
-            return;
-          }
-
+          var pd = Object.getOwnPropertyDescriptor(ctx, asserterName)
+            , functionProtoPD = Object.getOwnPropertyDescriptor(Function.prototype, asserterName);
+          // Avoid trying to overwrite things that we can't, like `length` and `arguments`.
+          if (functionProtoPD && !functionProtoPD.configurable) return;
+          if (asserterName === 'arguments') return; // @see chaijs/chai/issues/69
           Object.defineProperty(assert, asserterName, pd);
         });
 
         transferFlags(this, assert);
-
         return assert;
       }
     , configurable: true
@@ -3000,7 +3023,7 @@ function formatValue(ctx, value, recurseTimes) {
 
   // Make error with message first say the error
   if (isError(value)) {
-    base = ' ' + formatError(value);
+    return formatError(value);
   }
 
   if (keys.length === 0 && (!array || value.length == 0)) {
@@ -3181,6 +3204,7 @@ function isError(e) {
 function objectToString(o) {
   return Object.prototype.toString.call(o);
 }
+
 }); // module: utils/inspect.js
 
 require.register("utils/overwriteMethod.js", function(module, exports, require){

data/vendor/assets/javascripts/mocha.js

@@ -80,7 +80,7 @@ function isArray(obj) {
 /**
  * Event emitter constructor.
  *
- * @api public.
+ * @api public
  */
 
 function EventEmitter(){};
@@ -188,7 +188,7 @@ EventEmitter.prototype.removeAllListeners = function (name) {
 /**
  * Gets all listeners for a certain event.
  *
- * @api publci
+ * @api public
  */
 
 EventEmitter.prototype.listeners = function (name) {
@@ -560,7 +560,7 @@ module.exports = function(suite){
      * and/or tests.
      */
   
-    context.describe = function(title, fn){
+    context.describe = context.context = function(title, fn){
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
       fn();
@@ -870,7 +870,7 @@ exports = module.exports = Mocha;
  * Library version.
  */
 
-exports.version = '1.0.3';
+exports.version = '1.1.0';
 
 /**
  * Expose internals.
@@ -908,6 +908,7 @@ function image(name) {
  *   - `globals` array of accepted globals
  *   - `timeout` timeout in milliseconds
  *   - `ignoreLeaks` ignore global leaks
+ *   - `grep` string or regexp to filter tests with
  *
  * @param {Object} options
  * @api public
@@ -917,6 +918,7 @@ function Mocha(options) {
   options = options || {};
   this.files = [];
   this.options = options;
+  this.grep(options.grep);
   this.suite = new exports.Suite('', new exports.Context);
   this.ui(options.ui);
   this.reporter(options.reporter);
@@ -1003,6 +1005,21 @@ Mocha.prototype.growl = function(runner, reporter) {
   });
 };
 
+/**
+ * Add regexp to grep for to the options object
+ *
+ * @param {RegExp} or {String} re
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.grep = function(re){
+  this.options.grep = 'string' == typeof re
+    ? new RegExp(re)
+    : re;
+  return this;
+};
+
 /**
  * Run tests and invoke `fn()` when complete.
  *
@@ -1023,7 +1040,6 @@ Mocha.prototype.run = function(fn){
   if (options.growl) this.growl(runner, reporter);
   return runner.run(fn);
 };
-
 }); // module: mocha.js
 
 require.register("reporters/base.js", function(module, exports, require){
@@ -1035,6 +1051,16 @@ require.register("reporters/base.js", function(module, exports, require){
 var tty = require('browser/tty')
   , diff = require('browser/diff');
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Check if both stdio streams are associated with a tty.
  */
@@ -1351,7 +1377,7 @@ function pad(str, len) {
 
 function errorDiff(err, type) {
   return diff['diff' + type](err.actual, err.expected).map(function(str){
-    if (str.value == '\n') str.value = '<newline>\n';
+    if (/^(\n+)$/.test(str.value)) str.value = Array(++RegExp.$1.length).join('<newline>');
     if (str.added) return colorLines('diff added', str.value);
     if (str.removed) return colorLines('diff removed', str.value);
     return str.value;
@@ -1577,6 +1603,16 @@ var Base = require('./base')
   , Progress = require('../browser/progress')
   , escape = utils.escape;
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `Doc`.
  */
@@ -1614,7 +1650,8 @@ function HTML(runner) {
     , failures = items[2].getElementsByTagName('em')[0]
     , duration = items[3].getElementsByTagName('em')[0]
     , canvas = stat.getElementsByTagName('canvas')[0]
-    , stack = [root]
+    , report = fragment('<ul id="report"></ul>')
+    , stack = [report]
     , progress
     , ctx
 
@@ -1626,6 +1663,7 @@ function HTML(runner) {
   if (!root) return error('#mocha div missing, add it to your document');
 
   root.appendChild(stat);
+  root.appendChild(report);
 
   if (progress) progress.size(40);
 
@@ -1633,11 +1671,12 @@ function HTML(runner) {
     if (suite.root) return;
 
     // suite
-    var el = fragment('<div class="suite"><h1>%s</h1></div>', suite.title);
+    var url = location.origin + location.pathname + '?grep=^' + utils.escapeRegexp(suite.fullTitle());
+    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, suite.title);
 
     // container
     stack[0].appendChild(el);
-    stack.unshift(document.createElement('div'));
+    stack.unshift(document.createElement('ul'));
     el.appendChild(stack[0]);
   });
 
@@ -1663,11 +1702,11 @@ function HTML(runner) {
 
     // test
     if ('passed' == test.state) {
-      var el = fragment('<div class="test pass %e"><h2>%e<span class="duration">%ems</span></h2></div>', test.speed, test.title, test.duration);
+      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span></h2></li>', test.speed, test.title, test.duration);
     } else if (test.pending) {
-      var el = fragment('<div class="test pass pending"><h2>%e</h2></div>', test.title);
+      var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
     } else {
-      var el = fragment('<div class="test fail"><h2>%e</h2></div>', test.title);
+      var el = fragment('<li class="test fail"><h2>%e</h2></li>', test.title);
       var str = test.err.stack || test.err.toString();
 
       // FF / Opera do not add the message
@@ -2702,23 +2741,23 @@ function Teamcity(runner) {
   });
 
   runner.on('test', function(test) {
-    console.log("##teamcity[testStarted name='%s']", escape(test.fullTitle()));
+    console.log("##teamcity[testStarted name='" + escape(test.fullTitle()) + "']");
   });
 
   runner.on('fail', function(test, err) {
-    console.log("##teamcity[testFailed name='%s' message='%s']", escape(test.fullTitle()), escape(err.message));
+    console.log("##teamcity[testFailed name='" + escape(test.fullTitle()) + "' message='" + escape(err.message) + "']");
   });
 
   runner.on('pending', function(test) {
-    console.log("##teamcity[testIgnored name='%s' message='pending']", escape(test.fullTitle()));
+    console.log("##teamcity[testIgnored name='" + escape(test.fullTitle()) + "' message='pending']");
   });
 
   runner.on('test end', function(test) {
-    console.log("##teamcity[testFinished name='%s' duration='%s']", escape(test.fullTitle()), test.duration);
+    console.log("##teamcity[testFinished name='" + escape(test.fullTitle()) + "' duration='" + test.duration + "']");
   });
 
   runner.on('end', function() {
-    console.log("##teamcity[testSuiteFinished name='mocha.suite' duration='%s']", stats.duration);
+    console.log("##teamcity[testSuiteFinished name='mocha.suite' duration='" + stats.duration + "']");
   });
 }
 
@@ -2727,8 +2766,18 @@ function Teamcity(runner) {
  */
 
 function escape(str) {
-  return str.replace(/'/g, "|'");
+  return str
+    .replace(/\|/g, "||")
+    .replace(/\n/g, "|n")
+    .replace(/\r/g, "|r")
+    .replace(/\[/g, "|[")
+    .replace(/\]/g, "|]")
+    .replace(/\u0085/g, "|x")
+    .replace(/\u2028/g, "|l")
+    .replace(/\u2029/g, "|p")
+    .replace(/'/g, "|'");
 }
+
 }); // module: reporters/teamcity.js
 
 require.register("reporters/xunit.js", function(module, exports, require){
@@ -2741,6 +2790,16 @@ var Base = require('./base')
   , utils = require('../utils')
   , escape = utils.escape;
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `XUnit`.
  */
@@ -2847,6 +2906,16 @@ require.register("runnable.js", function(module, exports, require){
 var EventEmitter = require('browser/events').EventEmitter
   , debug = require('browser/debug')('runnable');
 
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
 /**
  * Expose `Runnable`.
  */
@@ -3151,6 +3220,9 @@ Runner.prototype.checkGlobals = function(test){
 Runner.prototype.fail = function(test, err){
   ++this.failures;
   test.state = 'failed';
+  if ('string' == typeof err) {
+    err = new Error('the string "' + err + '" was thrown, throw an Error :)');
+  }
   this.emit('fail', test, err);
 };
 
@@ -3978,6 +4050,7 @@ exports.files = function(dir, ret){
  *
  * @param {String} str
  * @return {String}
+ * @api private
  */
 
 exports.slug = function(str){
@@ -3986,6 +4059,18 @@ exports.slug = function(str){
     .replace(/ +/g, '-')
     .replace(/[^-\w]/g, '');
 };
+
+/**
+ * Escape regular expression characters in `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.escapeRegexp = function(str){
+  return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");
+};
 }); // module: utils.js
 /**
  * Node shims.

data/vendor/assets/stylesheets/mocha.css

@@ -4,7 +4,16 @@ body {
   padding: 60px 50px;
 }
 
-#mocha h1, h2 {
+#mocha ul, #mocha li {
+  margin: 0;
+  padding: 0;
+}
+
+#mocha ul {
+  list-style: none;
+}
+
+#mocha h1, #mocha h2 {
   margin: 0;
 }
 
@@ -14,6 +23,15 @@ body {
   font-weight: 200;
 }
 
+#mocha h1 a {
+  text-decoration: none;
+  color: inherit;
+}
+
+#mocha h1 a:hover {
+  text-decoration: underline;
+}
+
 #mocha .suite .suite h1 {
   margin-top: 0;
   font-size: .8em;
@@ -62,6 +80,7 @@ body {
   display: block;
   float: left;
   margin-right: 5px;
+  color: #00d6b2;
 }
 
 #mocha .test.pass .duration {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,15 +224,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2642027270440006025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2642027270440006025
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Unit-test your Rails JavaScript with the mocha test framework and chai assertion