teabag 0.3.6 → 0.4.0

data/README.md

@@ -16,7 +16,7 @@ We've just released Teabag, and we expect to be working on it for a while to get
 ### Running in the console using [Tapout](https://github.com/rubyworks/tapout)
 ![Console Reporter Tapout](https://raw.github.com/modeset/teabag/master/screenshots/console-reporter-tapout.png)
 ### Running in the browser
-![Browser Reporter](https://raw.github.com/modeset/teabag/master/screenshots/html-reporter.png)
+![Browser Reporter](https://raw.github.com/modeset/teabag/master/screenshots/html-reporter.jpg)
 
 
 ## Table of Contents
@@ -204,7 +204,7 @@ To load fixtures in your specs you'll need to include jasmine-jquery -- and then
 
 ```coffeescript
 #= require jquery
-#= require jasmine-jquery
+#= require support/jasmine-jquery
 describe "fixtures", ->
 
   it "loads fixtures", ->
@@ -390,9 +390,9 @@ Because we know that testing usually requires more than just the test framework
 You can require these files in your spec helper using:
 
 ```javascript
-//=require jasmine-jquery
-//=require sinon
-//=require expect
+//=require support/jasmine-jquery
+//=require support/sinon
+//=require support/expect
 ```
 
 
@@ -414,4 +414,4 @@ Check the [issues](https://github.com/modeset/teabag/issues) to see / discuss fe
 
 Licensed under the [MIT License](http://creativecommons.org/licenses/MIT/)
 
-All licenses for the [bundled Javascript libraries](https://github.com/modeset/teabag/tree/master/vendor/assets/javascripts) are included (all MIT).
+All licenses for the [bundled Javascript libraries](https://github.com/modeset/teabag/tree/master/vendor/assets/javascripts) are included (MIT/BSD).

data/app/assets/javascripts/teabag/jasmine.coffee

@@ -1,4 +1,4 @@
-#= require jasmine-1.3.0
+#= require jasmine-1.3.1
 #= require teabag/base/teabag
 #= require teabag/jasmine/reporters/html
 

data/app/assets/javascripts/teabag/mocha/reporters/html.coffee

@@ -18,7 +18,7 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.HTML
 
 
   envInfo: ->
-    "mocha 1.7.3"
+    "mocha 1.7.4"
 
 
 class Teabag.Reporters.HTML.SpecView extends Teabag.Reporters.HTML.SpecView

data/app/assets/javascripts/teabag/mocha.coffee

@@ -1,4 +1,4 @@
-#= require mocha-1.7.3
+#= require mocha-1.7.4
 #= require teabag/base/teabag
 #= require teabag/mocha/reporters/console
 #= require teabag/mocha/reporters/html

data/app/assets/javascripts/teabag-jasmine.js

@@ -220,7 +220,7 @@ jasmine.any = function(clazz) {
  * @returns matchable object for the sample
  */
 jasmine.objectContaining = function (sample) {
-    return new jasmine.Matchers.ObjectContaining(sample);
+  return new jasmine.Matchers.ObjectContaining(sample);
 };
 
 /**
@@ -629,15 +629,15 @@ jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
   var xhr = tryIt(function() {
     return new ActiveXObject("Msxml2.XMLHTTP.6.0");
   }) ||
-    tryIt(function() {
-      return new ActiveXObject("Msxml2.XMLHTTP.3.0");
-    }) ||
-    tryIt(function() {
-      return new ActiveXObject("Msxml2.XMLHTTP");
-    }) ||
-    tryIt(function() {
-      return new ActiveXObject("Microsoft.XMLHTTP");
-    });
+      tryIt(function() {
+        return new ActiveXObject("Msxml2.XMLHTTP.3.0");
+      }) ||
+      tryIt(function() {
+        return new ActiveXObject("Msxml2.XMLHTTP");
+      }) ||
+      tryIt(function() {
+        return new ActiveXObject("Microsoft.XMLHTTP");
+      });
 
   if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
 
@@ -695,8 +695,8 @@ jasmine.util.formatException = function(e) {
 jasmine.util.htmlEscape = function(str) {
   if (!str) return str;
   return str.replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;');
 };
 
 jasmine.util.argsToArray = function(args) {
@@ -1102,7 +1102,7 @@ jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
     type: isSuite ? 'suite' : 'spec',
     children: []
   };
-  
+
   if (isSuite) {
     var children = suiteOrSpec.children();
     for (var i = 0; i < children.length; i++) {
@@ -1328,11 +1328,11 @@ jasmine.Matchers.prototype.toBeNull = function() {
  * Matcher that compares the actual to NaN.
  */
 jasmine.Matchers.prototype.toBeNaN = function() {
-	this.message = function() {
-		return [ "Expected " + jasmine.pp(this.actual) + " to be NaN." ];
-	};
+  this.message = function() {
+    return [ "Expected " + jasmine.pp(this.actual) + " to be NaN." ];
+  };
 
-	return (this.actual !== this.actual);
+  return (this.actual !== this.actual);
 };
 
 /**
@@ -1931,8 +1931,8 @@ jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
   for (var property in obj) {
     if (!obj.hasOwnProperty(property)) continue;
     if (property == '__Jasmine_been_here_before__') continue;
-    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && 
-                                         obj.__lookupGetter__(property) !== null) : false);
+    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined &&
+        obj.__lookupGetter__(property) !== null) : false);
   }
 };
 
@@ -2063,7 +2063,7 @@ jasmine.Queue.prototype.next_ = function() {
 
   while (goAgain) {
     goAgain = false;
-    
+
     if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) {
       var calledSynchronously = true;
       var completedSynchronously = false;
@@ -2101,7 +2101,7 @@ jasmine.Queue.prototype.next_ = function() {
       if (completedSynchronously) {
         onComplete();
       }
-      
+
     } else {
       self.running = false;
       if (self.onComplete) {
@@ -2597,8 +2597,8 @@ jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
 jasmine.version_= {
   "major": 1,
   "minor": 3,
-  "build": 0,
-  "revision": 1354052693
+  "build": 1,
+  "revision": 1354556913
 };
 (function() {
 

data/app/assets/javascripts/teabag-mocha.js

@@ -3269,7 +3269,9 @@
 
       var self = this
           , stats = this.stats
-          , n = 1;
+          , n = 1
+          , passes = 0
+          , failures = 1;
 
       runner.on('start', function(){
         var total = runner.grepTotal(runner.suite);
@@ -3285,13 +3287,21 @@
       });
 
       runner.on('pass', function(test){
+        passes++;
         console.log('ok %d %s', n, title(test));
       });
 
       runner.on('fail', function(test, err){
+        failures++;
         console.log('not ok %d %s', n, title(test));
         console.log(err.stack.replace(/^/gm, '  '));
       });
+
+      runner.on('end', function(){
+        console.log('# tests ' + (passes + failures));
+        console.log('# pass ' + passes);
+        console.log('# fail ' + failures);
+      });
     }
 
     /**
@@ -3847,7 +3857,7 @@
 
       // non-enumerables
       for (var i = 0; i < globals.length; ++i) {
-        if (~props.indexOf(globals[i])) continue;
+        if (~utils.indexOf(props, globals[i])) continue;
         props.push(globals[i]);
       }
 
@@ -4218,7 +4228,9 @@
       // callback
       this.on('end', function(){
         debug('end');
-        process.removeListener('uncaughtException', function(err) { self.uncaught.call(self, err) });
+        process.removeListener('uncaughtException', function(err){
+          self.uncaught(err);
+        });
         fn(self.failures);
       });
 
@@ -4230,7 +4242,9 @@
       });
 
       // uncaught exception
-      process.on('uncaughtException', function(err) { self.uncaught.call(self, err) });
+      process.on('uncaughtException', function(err){
+        self.uncaught(err);
+      });
 
       return this;
     };
@@ -5825,7 +5839,7 @@
     };
 
     HTML.prototype.envInfo = function() {
-      return "mocha 1.7.3";
+      return "mocha 1.7.4";
     };
 
     return HTML;

data/app/assets/javascripts/teabag-qunit.js

@@ -2865,6 +2865,9 @@
     SpecView.prototype.buildParent = function() {
       var parent, view;
       parent = this.spec.parent;
+      if (!parent) {
+        return this.reporter;
+      }
       if (this.views.suites[parent.description]) {
         return this.views.suites[parent.description];
       } else {

data/lib/generators/teabag/install/templates/spec_helper.js

@@ -3,9 +3,9 @@
 // You can require other javascript files here.
 //
 // Teabag includes some useful javascripts for you, and you can include them here.
-// require jasmine-jquery
-// require sinon
-// require expect
+// require support/jasmine-jquery
+// require support/sinon
+// require support/expect
 //
 // You're also able to include any of the files in support as well.
 // require support/your-support-file

data/lib/teabag/version.rb

@@ -1,3 +1,3 @@
 module Teabag
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/spec/dummy/config/initializers/teabag.rb

@@ -15,7 +15,7 @@ Teabag.setup do |config|
 
   config.suite :mocha do |suite|
     suite.matcher = "spec/javascripts/**/*_mspec.{js,js.coffee,coffee}"
-    suite.javascripts = ["teabag/mocha", "expect"]
+    suite.javascripts = ["teabag/mocha"]
     suite.helper = "mocha_helper"
   end