konacha 1.3.1 → 1.4.0

data/History.md

@@ -1,5 +1,11 @@
 # master
 
+# 1.4.0
+
+* Update mocha (1.3.0)
+* Support all Mocha interfaces (set through `Konacha.mochaOptions.ui`)
+* Backup spec files (.js.bak, .js.orig, etc.) are ignored
+
 # 1.3.1
 
 * Specs in subdirectories no longer run twice

data/README.md

@@ -143,6 +143,10 @@ named `konacha_config.js` or `konacha_config.js.coffee` in `spec/javascripts` an
 setting properties of `Konacha.mochaOptions`:
 
 ```javascript
+// set the Mocha test interface
+// see http://visionmedia.github.com/mocha/#interfaces
+Konacha.mochaOptions.ui = 'bdd';
+
 // ignore the following globals during leak detection
 Konacha.mochaOptions.globals = ['YUI'];
 
@@ -158,14 +162,16 @@ The `ui` and `reporter` Mocha options are set by Konacha and must not be modifie
 ## Test Interface and Assertions
 
 Konacha includes a vendored copy of mocha.js and the [chai](http://chaijs.com/)
-assertion libraries. It configures Mocha to use the "BDD" test interface, which
-provides `describe()`, `it()`, `before()`, `after()`, `beforeEach()`, and `afterEach()`.
+assertion libraries. By default, it configures Mocha to use the "BDD" test
+interface, which provides `describe()`, `it()`, `before()`, `after()`,
+`beforeEach()`, and `afterEach()`.
 
 Konacha will make all three of chai's assertion styles available to you: `expect`,
 `should`, and `assert`. See the chai documentation for the details.
 
 If you use jQuery, you may want to check out [chai-jquery](https://github.com/jfirebaugh/chai-jquery)
-for some jQuery-specific assertions.
+for some jQuery-specific assertions. You can add it painlessly with the
+[chai-jquery-rails](https://github.com/wordofchristian/chai-jquery-rails) gem.
 
 ## Transactions
 

data/Rakefile

@@ -8,8 +8,8 @@ RSpec::Core::RakeTask.new :spec
 desc 'Build and copy Mocha and Chai assets from submodules into vendor/assets'
 task :assets do
   sh 'git submodule update --init' unless File.exist?('mocha/Makefile') || File.exist?('chai/Makefile')
-  sh 'cd mocha && make clean && make'
-  sh 'cd chai && make clean && make'
+  sh 'cd mocha && npm install && make clean && make'
+  sh 'cd chai && npm install && make clean && make'
   mkdir_p 'vendor/assets/javascripts'
   mkdir_p 'vendor/assets/stylesheets'
   cp 'mocha/mocha.js',  'vendor/assets/javascripts/'

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.3.1"
+  gem.version       = "1.4.0"
 
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "actionpack", "~> 3.1"
@@ -29,6 +29,5 @@ the asset pipeline and engines.}
   gem.add_development_dependency "capybara-firebug", "~> 1.1"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "ejs"
-  gem.add_development_dependency "vendorer"
   gem.add_development_dependency "tzinfo"
 end

data/lib/assets/javascripts/konacha.js

@@ -1,6 +1,6 @@
 mocha.setup(Konacha.mochaOptions);
 
-beforeEach(function () {
+mocha.suite.beforeEach(function () {
   var e = document.getElementById('konacha');
   if (e) {
     e.parentNode.removeChild(e);

data/lib/konacha.rb

@@ -1,3 +1,4 @@
+require "tilt"
 require "konacha/engine"
 require "konacha/runner"
 require "konacha/server"
@@ -33,9 +34,14 @@ module Konacha
     end
 
     def spec_paths
-      Dir[File.join(spec_root, "**{,/*/**}/*{_spec,_test}.*")].uniq.map do |path|
-        path.gsub(File.join(spec_root, ''), '')
-      end
+      Rails.application.assets.each_file.find_all { |pathname|
+        pathname.to_s.start_with?(spec_root) &&
+        pathname.basename.to_s =~ /_spec\.|_test\./ &&
+        (pathname.extname == '.js' || Tilt[pathname]) &&
+        Rails.application.assets.content_type_of(pathname) == 'application/javascript'
+      }.map { |pathname|
+        pathname.to_s.gsub(File.join(spec_root, ''), '')
+      }
     end
   end
 end

data/spec/konacha_spec.rb

@@ -54,6 +54,14 @@ describe Konacha do
     it "includes *_test.* files" do
       subject.should include("file_ending_in_test.js")
     end
+
+    it "only includes JavaScript files" do
+      subject.should_not include("do_not_include_spec.png")
+    end
+
+    it "does not include non-asset files" do
+      subject.should_not include("do_not_include_spec.js.bak")
+    end
   end
 
   it "can be configured in an initializer" do

data/vendor/assets/javascripts/mocha.js

@@ -885,12 +885,6 @@ var path = require('browser/path');
 
 exports = module.exports = Mocha;
 
-/**
- * Library version.
- */
-
-exports.version = '1.2.1';
-
 /**
  * Expose internals.
  */
@@ -1683,7 +1677,7 @@ function HTML(runner) {
 
     // suite
     var url = location.protocol + '//' + location.host + location.pathname + '?grep=^' + utils.escapeRegexp(suite.fullTitle());
-    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, suite.title);
+    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
 
     // container
     stack[0].appendChild(el);
@@ -1701,6 +1695,8 @@ function HTML(runner) {
   });
 
   runner.on('test end', function(test){
+    window.scrollTo(0, document.body.scrollHeight);
+
     // TODO: add to stats
     var percent = stats.tests / total * 100 | 0;
     if (progress) progress.update(percent).draw(ctx);
@@ -1821,13 +1817,14 @@ exports.HTML = require('./html');
 exports.List = require('./list');
 exports.Min = require('./min');
 exports.Spec = require('./spec');
+exports.Nyan = require('./nyan');
+exports.XUnit = require('./xunit');
 exports.Progress = require('./progress');
 exports.Landing = require('./landing');
 exports.JSONCov = require('./json-cov');
 exports.HTMLCov = require('./html-cov');
 exports.JSONStream = require('./json-stream');
-exports.XUnit = require('./xunit')
-exports.Teamcity = require('./teamcity')
+exports.Teamcity = require('./teamcity');
 
 }); // module: reporters/index.js
 
@@ -2389,6 +2386,7 @@ function Markdown(runner) {
 }); // module: reporters/markdown.js
 
 require.register("reporters/min.js", function(module, exports, require){
+
 /**
  * Module dependencies.
  */
@@ -3284,16 +3282,16 @@ Runnable.prototype.run = function(fn){
   }
 
   // called multiple times
-  function multiple() {
+  function multiple(err) {
     if (emitted) return;
     emitted = true;
-    self.emit('error', new Error('done() called multiple times'));
+    self.emit('error', err || new Error('done() called multiple times'));
   }
 
   // finished
   function done(err) {
     if (self.timedOut) return;
-    if (finished) return multiple();
+    if (finished) return multiple(err);
     self.clearTimeout();
     self.duration = new Date - start;
     finished = true;
@@ -3393,13 +3391,15 @@ Runner.prototype.constructor = Runner;
  * with number of tests matched.
  *
  * @param {RegExp} re
+ * @param {Boolean} invert
  * @return {Runner} for chaining
  * @api public
  */
 
-Runner.prototype.grep = function(re){
+Runner.prototype.grep = function(re, invert){
   debug('grep %s', re);
   this._grep = re;
+  this._invert = invert;
   this.total = this.grepTotal(this.suite);
   return this;
 };
@@ -3418,7 +3418,9 @@ Runner.prototype.grepTotal = function(suite) {
   var total = 0;
 
   suite.eachTest(function(test){
-    if (self._grep.test(test.fullTitle())) total++;
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (match) total++;
   });
 
   return total;
@@ -3658,7 +3660,9 @@ Runner.prototype.runTests = function(suite, fn){
     if (!test) return fn();
 
     // grep
-    if (!self._grep.test(test.fullTitle())) return next();
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (!match) return next();
 
     // pending
     if (test.pending) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -155,22 +155,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vendorer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +225,8 @@ files:
 - spec/dummy/spec/javascripts/array_sum_cs_spec.js.coffee
 - spec/dummy/spec/javascripts/array_sum_js_spec.js
 - spec/dummy/spec/javascripts/assert_spec.js.coffee
+- spec/dummy/spec/javascripts/do_not_include_spec.js.bak
+- spec/dummy/spec/javascripts/do_not_include_spec.png
 - spec/dummy/spec/javascripts/failing_spec.js
 - spec/dummy/spec/javascripts/file_ending_in_test.js
 - spec/dummy/spec/javascripts/konacha_config.js
@@ -275,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1466616259803470458
+      hash: 3335057078696497361
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1466616259803470458
+      hash: 3335057078696497361
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -305,6 +291,8 @@ test_files:
 - spec/dummy/spec/javascripts/array_sum_cs_spec.js.coffee
 - spec/dummy/spec/javascripts/array_sum_js_spec.js
 - spec/dummy/spec/javascripts/assert_spec.js.coffee
+- spec/dummy/spec/javascripts/do_not_include_spec.js.bak
+- spec/dummy/spec/javascripts/do_not_include_spec.png
 - spec/dummy/spec/javascripts/failing_spec.js
 - spec/dummy/spec/javascripts/file_ending_in_test.js
 - spec/dummy/spec/javascripts/konacha_config.js