teaspoon-mocha 2.2.4 → 2.3.3

data/lib/teaspoon/mocha/assets/teaspoon-mocha.js

@@ -80,7 +80,7 @@
       var e;
       Teaspoon.messages.push(arguments[0]);
       try {
-        return console.log.apply(console, arguments);
+        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log.apply(console, arguments) : void 0 : void 0;
       } catch (_error) {
         e = _error;
         throw new Error("Unable to use console.log for logging");
@@ -126,6 +126,46 @@
 
   })();
 
+}).call(this);
+(function() {
+  Teaspoon.Mixins || (Teaspoon.Mixins = {});
+
+}).call(this);
+(function() {
+  Teaspoon.Mixins.FilterUrl = {
+    filterUrl: function(grep) {
+      var params;
+      params = [];
+      params.push("grep=" + (encodeURIComponent(grep)));
+      if (Teaspoon.params.file) {
+        params.push("file=" + Teaspoon.params.file);
+      }
+      return "?" + (params.join("&"));
+    }
+  };
+
+}).call(this);
+(function() {
+  Teaspoon.Utility = (function() {
+    function Utility() {}
+
+    Utility.extend = function(obj, mixin) {
+      var method, name;
+      for (name in mixin) {
+        method = mixin[name];
+        obj[name] = method;
+      }
+      return obj;
+    };
+
+    Utility.include = function(klass, mixin) {
+      return this.extend(klass.prototype, mixin);
+    };
+
+    return Utility;
+
+  })();
+
 }).call(this);
 (function() {
   Teaspoon.Runner = (function() {
@@ -180,7 +220,7 @@
   var slice = [].slice;
 
   Teaspoon.Fixture = (function() {
-    var addContent, cleanup, create, load, loadComplete, preload, putContent, set, xhr, xhrRequest;
+    var addContent, cleanup, create, jQueryAvailable, load, loadComplete, preload, putContent, set, xhr, xhrRequest;
 
     Fixture.cache = {};
 
@@ -191,19 +231,19 @@
     Fixture.json = [];
 
     Fixture.preload = function() {
-      var i, len, results, url, urls;
+      var j, len, results, url, urls;
       urls = 1 <= arguments.length ? slice.call(arguments, 0) : [];
       results = [];
-      for (i = 0, len = urls.length; i < len; i++) {
-        url = urls[i];
+      for (j = 0, len = urls.length; j < len; j++) {
+        url = urls[j];
         results.push(preload(url));
       }
       return results;
     };
 
     Fixture.load = function() {
-      var append, i, index, j, len, results, url, urls;
-      urls = 2 <= arguments.length ? slice.call(arguments, 0, i = arguments.length - 1) : (i = 0, []), append = arguments[i++];
+      var append, index, j, k, len, results, url, urls;
+      urls = 2 <= arguments.length ? slice.call(arguments, 0, j = arguments.length - 1) : (j = 0, []), append = arguments[j++];
       if (append == null) {
         append = false;
       }
@@ -212,7 +252,7 @@
         append = false;
       }
       results = [];
-      for (index = j = 0, len = urls.length; j < len; index = ++j) {
+      for (index = k = 0, len = urls.length; k < len; index = ++k) {
         url = urls[index];
         results.push(load(url, append || index > 0));
       }
@@ -220,8 +260,8 @@
     };
 
     Fixture.set = function() {
-      var append, html, htmls, i, index, j, len, results;
-      htmls = 2 <= arguments.length ? slice.call(arguments, 0, i = arguments.length - 1) : (i = 0, []), append = arguments[i++];
+      var append, html, htmls, index, j, k, len, results;
+      htmls = 2 <= arguments.length ? slice.call(arguments, 0, j = arguments.length - 1) : (j = 0, []), append = arguments[j++];
       if (append == null) {
         append = false;
       }
@@ -230,7 +270,7 @@
         append = false;
       }
       results = [];
-      for (index = j = 0, len = htmls.length; j < len; index = ++j) {
+      for (index = k = 0, len = htmls.length; k < len; index = ++k) {
         html = htmls[index];
         results.push(set(html, append || index > 0));
       }
@@ -301,21 +341,30 @@
 
     putContent = function(content) {
       cleanup();
-      create();
-      return window.fixture.el.innerHTML = content;
+      return addContent(content);
     };
 
     addContent = function(content) {
+      var i, j, parsed, ref, results;
       if (!window.fixture.el) {
         create();
       }
-      return window.fixture.el.innerHTML += content;
+      if (jQueryAvailable()) {
+        parsed = $($.parseHTML(content, document, true));
+        results = [];
+        for (i = j = 0, ref = parsed.length; 0 <= ref ? j < ref : j > ref; i = 0 <= ref ? ++j : --j) {
+          results.push(window.fixture.el.appendChild(parsed[i]));
+        }
+        return results;
+      } else {
+        return window.fixture.el.innerHTML += content;
+      }
     };
 
     create = function() {
       var ref;
       window.fixture.el = document.createElement("div");
-      if (typeof window.$ === 'function') {
+      if (jQueryAvailable()) {
         window.fixture.$el = $(window.fixture.el);
       }
       window.fixture.el.id = "teaspoon-fixtures";
@@ -357,6 +406,10 @@
       return xhr.send();
     };
 
+    jQueryAvailable = function() {
+      return typeof window.$ === 'function';
+    };
+
     return Fixture;
 
   })();
@@ -405,6 +458,28 @@
     });
   };
 
+}).call(this);
+(function() {
+  Teaspoon.Spec = (function() {
+    function Spec() {}
+
+    Teaspoon.Utility.include(Spec, Teaspoon.Mixins.FilterUrl);
+
+    return Spec;
+
+  })();
+
+}).call(this);
+(function() {
+  Teaspoon.Suite = (function() {
+    function Suite() {}
+
+    Teaspoon.Utility.include(Suite, Teaspoon.Mixins.FilterUrl);
+
+    return Suite;
+
+  })();
+
 }).call(this);
 (function() {
   Teaspoon.Reporters.BaseView = (function() {
@@ -547,7 +622,7 @@
       this.setText("stats-passes", this.total.passes);
       this.setText("stats-failures", this.total.failures);
       if (this.total.run < this.total.exist) {
-        this.total.skipped = this.total.exist - this.total.run;
+        this.total.skipped = this.total.exist - this.total.run + this.total.skipped;
         this.total.run = this.total.exist;
       }
       this.setText("stats-skipped", this.total.skipped);
@@ -568,7 +643,8 @@
     HTML.prototype.reportSpecResults = function(spec) {
       this.total.run += 1;
       this.updateProgress();
-      return this.updateStatus(spec);
+      this.updateStatus(spec);
+      return delete this.reportView;
     };
 
     HTML.prototype.buildLayout = function() {
@@ -623,27 +699,24 @@
     };
 
     HTML.prototype.updateStatus = function(spec) {
-      var elapsed, ref, ref1, ref2, result;
-      result = spec.result();
-      if (result.skipped) {
-        this.updateStat("skipped", this.total.skipped += 1);
-        return;
-      }
+      var elapsed, ref, result;
       elapsed = new Teaspoon.Date().getTime() - this.specStart;
-      if (result.status === "passed") {
-        this.updateStat("passes", this.total.passes += 1);
-        return (ref = this.reportView) != null ? ref.updateState("passed", elapsed) : void 0;
-      } else if (result.status === "pending") {
-        return (ref1 = this.reportView) != null ? ref1.updateState("pending", elapsed) : void 0;
-      } else {
+      if ((ref = this.reportView) != null) {
+        ref.updateState(spec, elapsed);
+      }
+      result = spec.result();
+      if (result.status === "pending") {
+        return this.updateStat("skipped", this.total.skipped += 1);
+      } else if (result.status === "failed") {
         this.updateStat("failures", this.total.failures += 1);
-        if ((ref2 = this.reportView) != null) {
-          ref2.updateState("failed", elapsed);
-        }
         if (!this.config["build-full-report"]) {
           new (Teaspoon.resolveClass("Reporters.HTML.FailureView"))(spec).appendTo(this.findEl("report-failures"));
         }
         return this.setStatus("failed");
+      } else if (result.skipped) {
+        return this.updateStat("skipped", this.total.skipped += 1);
+      } else {
+        return this.updateStat("passes", this.total.passes += 1);
       }
     };
 
@@ -896,8 +969,8 @@
 
     viewId = 0;
 
-    function SpecView(spec, reporter) {
-      this.spec = spec;
+    function SpecView(spec1, reporter) {
+      this.spec = spec1;
       this.reporter = reporter;
       this.views = this.reporter.views;
       this.spec.viewId = viewId += 1;
@@ -920,6 +993,9 @@
     SpecView.prototype.buildParent = function() {
       var parent, view;
       parent = this.spec.parent;
+      if (!parent) {
+        return this.reporter;
+      }
       if (parent.viewId) {
         return this.views.suites[parent.viewId];
       } else {
@@ -941,21 +1017,52 @@
       return this.append(div);
     };
 
-    SpecView.prototype.updateState = function(state, elapsed) {
-      var base, classes, result;
-      result = this.spec.result();
-      classes = ["state-" + state];
-      if (elapsed > Teaspoon.slow) {
-        classes.push("slow");
-      }
-      if (state === "passed") {
-        this.el.innerHTML += "<span>" + elapsed + "ms</span>";
+    SpecView.prototype.updateState = function(spec, elapsed) {
+      var result;
+      result = spec.result();
+      this.clearClasses();
+      if (result.status === "pending") {
+        return this.updatePending(spec, elapsed);
+      } else if (result.status === "failed") {
+        return this.updateFailed(spec, elapsed);
+      } else if (result.skipped) {
+        return this.updateDisabled(spec, elapsed);
+      } else {
+        return this.updatePassed(spec, elapsed);
       }
-      this.el.className = classes.join(" ");
-      if (result.status === "failed") {
-        this.buildErrors();
+    };
+
+    SpecView.prototype.updatePassed = function(spec, elapsed) {
+      this.addStatusClass("passed");
+      if (elapsed > Teaspoon.slow) {
+        this.addClass("slow");
       }
-      return typeof (base = this.parentView).updateState === "function" ? base.updateState(state) : void 0;
+      return this.el.innerHTML += "<span>" + elapsed + "ms</span>";
+    };
+
+    SpecView.prototype.updateFailed = function(spec, elapsed) {
+      var base;
+      this.addStatusClass("failed");
+      this.buildErrors();
+      return typeof (base = this.parentView).updateState === "function" ? base.updateState("failed") : void 0;
+    };
+
+    SpecView.prototype.updatePending = function(spec, elapsed) {
+      return this.addStatusClass("pending");
+    };
+
+    SpecView.prototype.updateDisabled = function(spec, elapsed) {};
+
+    SpecView.prototype.clearClasses = function() {
+      return this.el.className = "";
+    };
+
+    SpecView.prototype.addStatusClass = function(status) {
+      return this.addClass("state-" + status);
+    };
+
+    SpecView.prototype.addClass = function(name) {
+      return this.el.className += " " + name;
     };
 
     return SpecView;
@@ -1091,52 +1198,45 @@
       var result;
       this.spec = spec1;
       result = this.spec.result();
-      if (result.skipped) {
-        return;
+      if (result.status === "pending") {
+        return this.trackPending(this.spec);
+      } else if (result.status === "failed") {
+        return this.trackFailed(this.spec);
+      } else if (result.skipped) {
+        return this.trackDisabled(this.spec);
+      } else {
+        return this.trackPassed(this.spec);
       }
-      this.reportSuites();
-      switch (result.status) {
-        case "pending":
-          return this.trackPending();
-        case "failed":
-          return this.trackFailure();
-        default:
-          return this.log({
-            type: "spec",
-            suite: this.spec.suiteName,
-            label: this.spec.description,
-            status: result.status,
-            skipped: result.skipped
-          });
-      }
-    };
-
-    Console.prototype.trackPending = function() {
+    };
+
+    Console.prototype.trackPending = function(spec) {
       var result;
-      result = this.spec.result();
+      this.reportSuites();
+      result = spec.result();
       return this.log({
         type: "spec",
-        suite: this.spec.suiteName,
-        label: this.spec.description,
+        suite: spec.suiteName,
+        label: spec.description,
         status: result.status,
         skipped: result.skipped
       });
     };
 
-    Console.prototype.trackFailure = function() {
+    Console.prototype.trackFailed = function(spec) {
       var error, i, len, ref, result, results;
-      result = this.spec.result();
-      ref = this.spec.errors();
+      this.reportSuites();
+      result = spec.result();
+      ref = spec.errors();
       results = [];
       for (i = 0, len = ref.length; i < len; i++) {
         error = ref[i];
         results.push(this.log({
           type: "spec",
-          suite: this.spec.suiteName,
-          label: this.spec.description,
+          suite: spec.suiteName,
+          label: spec.description,
           status: result.status,
           skipped: result.skipped,
-          link: this.spec.fullDescription,
+          link: spec.fullDescription,
           message: error.message,
           trace: error.stack || error.message || "Stack Trace Unavailable"
         }));
@@ -1144,6 +1244,20 @@
       return results;
     };
 
+    Console.prototype.trackDisabled = function(spec) {};
+
+    Console.prototype.trackPassed = function(spec, result) {
+      this.reportSuites();
+      result = spec.result();
+      return this.log({
+        type: "spec",
+        suite: spec.suiteName,
+        label: spec.description,
+        status: result.status,
+        skipped: result.skipped
+      });
+    };
+
     Console.prototype.log = function(obj) {
       if (obj == null) {
         obj = {};
@@ -1362,12 +1476,17 @@
 
 }).call(this);
 (function() {
-  Teaspoon.Mocha.Spec = (function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  Teaspoon.Mocha.Spec = (function(superClass) {
+    extend(Spec, superClass);
+
     function Spec(spec) {
       this.spec = spec;
       this.fullDescription = this.spec.fullTitle();
       this.description = this.spec.title;
-      this.link = "?grep=" + (encodeURIComponent(this.fullDescription));
+      this.link = this.filterUrl(this.fullDescription);
       this.parent = this.spec.parent;
       this.suiteName = this.parent.fullTitle();
       this.viewId = this.spec.viewId;
@@ -1407,29 +1526,34 @@
       }
       return {
         status: status,
-        skipped: this.spec.state === "skipped"
+        skipped: this.spec.state === "skipped" || this.pending
       };
     };
 
     return Spec;
 
-  })();
+  })(Teaspoon.Spec);
 
 }).call(this);
 (function() {
-  Teaspoon.Mocha.Suite = (function() {
+  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  Teaspoon.Mocha.Suite = (function(superClass) {
+    extend(Suite, superClass);
+
     function Suite(suite) {
       var ref;
       this.suite = suite;
       this.fullDescription = this.suite.fullTitle();
       this.description = this.suite.title;
-      this.link = "?grep=" + (encodeURIComponent(this.fullDescription));
+      this.link = this.filterUrl(this.fullDescription);
       this.parent = ((ref = this.suite.parent) != null ? ref.root : void 0) ? null : this.suite.parent;
       this.viewId = this.suite.viewId;
     }
 
     return Suite;
 
-  })();
+  })(Teaspoon.Suite);
 
 }).call(this);