konacha 2.0.0.beta2 → 2.0.0.beta3

data/vendor/assets/javascripts/mocha.js

@@ -1462,14 +1462,22 @@ exports.list = function(failures){
       , index = stack.indexOf(message) + message.length
       , msg = stack.slice(0, index)
       , actual = err.actual
-      , expected = err.expected;
+      , expected = err.expected
+      , escape = true;
+
+    // explicitly show diff
+    if (err.showDiff) {
+      escape = false;
+      err.actual = actual = JSON.stringify(actual, null, 2);
+      err.expected = expected = JSON.stringify(expected, null, 2);
+    }
 
     // actual / expected diff
     if ('string' == typeof actual && 'string' == typeof expected) {
       var len = Math.max(actual.length, expected.length);
 
-      if (len < 20) msg = errorDiff(err, 'Chars');
-      else msg = errorDiff(err, 'Words');
+      if (len < 20) msg = errorDiff(err, 'Chars', escape);
+      else msg = errorDiff(err, 'Words', escape);
 
       // linenos
       var lines = msg.split('\n');
@@ -1645,12 +1653,14 @@ function pad(str, len) {
  * @api private
  */
 
-function errorDiff(err, type) {
+function errorDiff(err, type, escape) {
   return diff['diff' + type](err.actual, err.expected).map(function(str){
-    str.value = str.value
-      .replace(/\t/g, '<tab>')
-      .replace(/\r/g, '<CR>')
-      .replace(/\n/g, '<LF>\n');
+    if (escape) {
+      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;
@@ -1936,15 +1946,19 @@ function HTML(runner, root) {
   if (!root) return error('#mocha div missing, add it to your document');
 
   // pass toggle
-  on(passesLink, 'click', function () {
-    var className = /pass/.test(report.className) ? '' : ' pass';
-    report.className = report.className.replace(/fail|pass/g, '') + className;
+  on(passesLink, 'click', function(){
+    unhide();
+    var name = /pass/.test(report.className) ? '' : ' pass';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test pass');
   });
 
   // failure toggle
-  on(failuresLink, 'click', function () {
-    var className = /fail/.test(report.className) ? '' : ' fail';
-    report.className = report.className.replace(/fail|pass/g, '') + className;
+  on(failuresLink, 'click', function(){
+    unhide();
+    var name = /fail/.test(report.className) ? '' : ' fail';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test fail');
   });
 
   root.appendChild(stat);
@@ -2060,6 +2074,30 @@ function fragment(html) {
   return div.firstChild;
 }
 
+/**
+ * Check for suites that do not have elements
+ * with `classname`, and hide them.
+ */
+
+function hideSuitesWithout(classname) {
+  var suites = document.getElementsByClassName('suite');
+  for (var i = 0; i < suites.length; i++) {
+    var els = suites[i].getElementsByClassName(classname);
+    if (0 == els.length) suites[i].className += ' hidden';
+  }
+}
+
+/**
+ * Unhide .hidden suites.
+ */
+
+function unhide() {
+  var els = document.getElementsByClassName('suite hidden');
+  for (var i = 0; i < els.length; ++i) {
+    els[i].className = els[i].className.replace('suite hidden', 'suite');
+  }
+}
+
 /**
  * Set `el` text to `str`.
  */
@@ -3752,8 +3790,16 @@ Runner.prototype.globals = function(arr){
 
 Runner.prototype.checkGlobals = function(test){
   if (this.ignoreLeaks) return;
-  var leaks = filterLeaks(this._globals);
+  var ok = this._globals;
+  var globals = keys(global);
+  var isNode = process.kill;
+  var leaks;
+
+  // check length - 2 ('errno' and 'location' globals)
+  if (isNode && 1 == ok.length - globals.length) return
+  else if (2 == ok.length - globals.length) return;
 
+  leaks = filterLeaks(ok, globals);
   this._globals = this._globals.concat(leaks);
 
   if (leaks.length > 1) {
@@ -4105,12 +4151,13 @@ Runner.prototype.run = function(fn){
  * Filter leaks with the given globals flagged as `ok`.
  *
  * @param {Array} ok
+ * @param {Array} globals
  * @return {Array}
  * @api private
  */
 
-function filterLeaks(ok) {
-  return filter(keys(global), function(key){
+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]);
       return key == ok;

data/vendor/assets/stylesheets/mocha.css

@@ -37,6 +37,10 @@ body {
   font-size: .8em;
 }
 
+.hidden {
+  display: none;
+}
+
 #mocha h2 {
   font-size: 12px;
   font-weight: normal;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -228,6 +228,11 @@ files:
 - konacha.gemspec
 - lib/konacha.rb
 - lib/konacha/engine.rb
+- lib/konacha/formatter.rb
+- lib/konacha/reporter.rb
+- lib/konacha/reporter/example.rb
+- lib/konacha/reporter/example_group.rb
+- lib/konacha/reporter/metadata.rb
 - lib/konacha/runner.rb
 - lib/konacha/server.rb
 - lib/tasks/konacha.rake
@@ -259,8 +264,13 @@ files:
 - spec/dummy/spec/javascripts/templating_spec.js
 - spec/dummy/spec/javascripts/ui_spec.js
 - spec/error_handling_spec.rb
+- spec/formatter_spec.rb
 - spec/konacha_spec.rb
 - spec/models/spec_spec.rb
+- spec/reporter/example_group_spec.rb
+- spec/reporter/example_spec.rb
+- spec/reporter/metadata_spec.rb
+- spec/reporter_spec.rb
 - spec/runner_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
@@ -281,6 +291,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1614270189281322721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -289,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 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
@@ -323,8 +336,13 @@ test_files:
 - spec/dummy/spec/javascripts/templating_spec.js
 - spec/dummy/spec/javascripts/ui_spec.js
 - spec/error_handling_spec.rb
+- spec/formatter_spec.rb
 - spec/konacha_spec.rb
 - spec/models/spec_spec.rb
+- spec/reporter/example_group_spec.rb
+- spec/reporter/example_spec.rb
+- spec/reporter/metadata_spec.rb
+- spec/reporter_spec.rb
 - spec/runner_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb