teaspoon 0.7.8 → 0.7.9

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

@@ -5394,14 +5394,21 @@
     Teaspoon.messages = [];
 
     Teaspoon.execute = function() {
-      if (this.defer) {
-        this.defer = false;
+      if (Teaspoon.defer) {
+        Teaspoon.defer = false;
         return;
       }
-      this.started = true;
+      if (Teaspoon.started) {
+        Teaspoon.reload();
+      }
+      Teaspoon.started = true;
       return new Teaspoon.Runner();
     };
 
+    Teaspoon.reload = function() {
+      return window.location.reload();
+    };
+
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
       originalOnload = window.onload;
@@ -5419,7 +5426,7 @@
         all = [];
       }
       deps = [];
-      if ((paths = this.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+      if ((paths = Teaspoon.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
         return all;
       }
       for (_i = 0, _len = paths.length; _i < _len; _i++) {
@@ -5441,7 +5448,7 @@
 
     Teaspoon.log = function() {
       var e;
-      this.messages.push(arguments[0]);
+      Teaspoon.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
       } catch (_error) {
@@ -5452,8 +5459,8 @@
 
     Teaspoon.getMessages = function() {
       var messages;
-      messages = this.messages;
-      this.messages = [];
+      messages = Teaspoon.messages;
+      Teaspoon.messages = [];
       return messages;
     };
 
@@ -5790,7 +5797,8 @@
 
     function HTML() {
       this.toggleConfig = __bind(this.toggleConfig, this);
-      this.reportRunnerResults = __bind(this.reportRunnerResults, this);      this.start = new Teaspoon.Date().getTime();
+      this.reportRunnerResults = __bind(this.reportRunnerResults, this);
+      this.start = new Teaspoon.Date().getTime();
       this.config = {
         "use-catch": true,
         "build-full-report": false,
@@ -5815,7 +5823,6 @@
 
     HTML.prototype.build = function() {
       var _ref;
-
       this.buildLayout();
       this.setText("env-info", this.envInfo());
       this.setText("version", Teaspoon.version);
@@ -5833,7 +5840,6 @@
 
     HTML.prototype.buildLayout = function() {
       var el;
-
       el = this.createEl("div");
       el.id = "teaspoon-interface";
       el.innerHTML = Teaspoon.Reporters.HTML.template;
@@ -5842,7 +5848,6 @@
 
     HTML.prototype.buildSuiteSelect = function() {
       var options, suite, _i, _len, _ref;
-
       if (Teaspoon.suites.all.length === 1) {
         return "";
       }
@@ -5919,7 +5924,6 @@
 
     HTML.prototype.updateStatus = function(spec) {
       var elapsed, result, _ref, _ref1;
-
       spec = new Teaspoon.Spec(spec);
       result = spec.result();
       if (result.skipped || result.status === "pending") {
@@ -5948,7 +5952,6 @@
 
     HTML.prototype.showConfiguration = function() {
       var key, value, _ref, _results;
-
       _ref = this.config;
       _results = [];
       for (key in _ref) {
@@ -5964,7 +5967,6 @@
 
     HTML.prototype.setFilters = function() {
       var link;
-
       link = [Teaspoon.root, Teaspoon.suites.active].join('/');
       if (Teaspoon.params["file"]) {
         this.filters.push("by file: " + Teaspoon.params["file"] + " <a href='" + link + "'>remove</a>");
@@ -5976,7 +5978,6 @@
 
     HTML.prototype.readConfig = function() {
       var config;
-
       if (config = this.cookie("teaspoon")) {
         return this.config = config;
       }
@@ -5984,7 +5985,6 @@
 
     HTML.prototype.toggleConfig = function(e) {
       var button, name;
-
       button = e.target;
       if (button.tagName.toLowerCase() !== "button") {
         return;
@@ -6005,7 +6005,6 @@
 
     HTML.prototype.cookie = function(name, value) {
       var date, match;
-
       if (value == null) {
         value = void 0;
       }
@@ -6159,20 +6158,18 @@
 
     SpecView.prototype.build = function() {
       var classes;
-
       classes = ["spec"];
       if (this.spec.pending) {
         classes.push("state-pending");
       }
       SpecView.__super__.build.call(this, classes.join(" "));
-      this.el.innerHTML = "<a href=\"" + this.spec.link + "\">" + this.spec.description + "</a>";
+      this.el.innerHTML = "<a href=\"" + this.spec.link + "\">" + (this.htmlSafe(this.spec.description)) + "</a>";
       this.parentView = this.buildParent();
       return this.parentView.append(this.el);
     };
 
     SpecView.prototype.buildParent = function() {
       var parent, view;
-
       parent = this.spec.parent;
       if (parent.viewId) {
         return this.views.suites[parent.viewId];
@@ -6184,7 +6181,6 @@
 
     SpecView.prototype.buildErrors = function() {
       var div, error, html, _i, _len, _ref;
-
       div = this.createEl("div");
       html = "";
       _ref = this.spec.errors();
@@ -6198,7 +6194,6 @@
 
     SpecView.prototype.updateState = function(state, elapsed) {
       var classes, result, _base;
-
       result = this.spec.result();
       classes = ["state-" + state];
       if (elapsed > Teaspoon.slow) {
@@ -6233,9 +6228,8 @@
 
     FailureView.prototype.build = function() {
       var error, html, _i, _len, _ref;
-
       FailureView.__super__.build.call(this, "spec");
-      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + this.spec.fullDescription + "</a></h1>";
+      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + (this.htmlSafe(this.spec.fullDescription)) + "</a></h1>";
       _ref = this.spec.errors();
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         error = _ref[_i];
@@ -6272,14 +6266,13 @@
 
     SuiteView.prototype.build = function() {
       SuiteView.__super__.build.call(this, "suite");
-      this.el.innerHTML = "<h1><a href=\"" + this.suite.link + "\">" + this.suite.description + "</a></h1>";
+      this.el.innerHTML = "<h1><a href=\"" + this.suite.link + "\">" + (this.htmlSafe(this.suite.description)) + "</a></h1>";
       this.parentView = this.buildParent();
       return this.parentView.append(this.el);
     };
 
     SuiteView.prototype.buildParent = function() {
       var parent, view;
-
       parent = this.suite.parent;
       if (!parent) {
         return this.reporter;
@@ -6301,7 +6294,6 @@
 
     SuiteView.prototype.updateState = function(state) {
       var _base;
-
       if (this.state === "failed") {
         return;
       }
@@ -6611,7 +6603,6 @@
   Teaspoon.Suite = (function() {
     function Suite(suite) {
       var _ref;
-
       this.suite = suite;
       this.fullDescription = this.suite.fullTitle();
       this.description = this.suite.title;

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

@@ -2234,14 +2234,21 @@ if ( typeof exports !== "undefined" ) {
     Teaspoon.messages = [];
 
     Teaspoon.execute = function() {
-      if (this.defer) {
-        this.defer = false;
+      if (Teaspoon.defer) {
+        Teaspoon.defer = false;
         return;
       }
-      this.started = true;
+      if (Teaspoon.started) {
+        Teaspoon.reload();
+      }
+      Teaspoon.started = true;
       return new Teaspoon.Runner();
     };
 
+    Teaspoon.reload = function() {
+      return window.location.reload();
+    };
+
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
       originalOnload = window.onload;
@@ -2259,7 +2266,7 @@ if ( typeof exports !== "undefined" ) {
         all = [];
       }
       deps = [];
-      if ((paths = this.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+      if ((paths = Teaspoon.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
         return all;
       }
       for (_i = 0, _len = paths.length; _i < _len; _i++) {
@@ -2281,7 +2288,7 @@ if ( typeof exports !== "undefined" ) {
 
     Teaspoon.log = function() {
       var e;
-      this.messages.push(arguments[0]);
+      Teaspoon.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
       } catch (_error) {
@@ -2292,8 +2299,8 @@ if ( typeof exports !== "undefined" ) {
 
     Teaspoon.getMessages = function() {
       var messages;
-      messages = this.messages;
-      this.messages = [];
+      messages = Teaspoon.messages;
+      Teaspoon.messages = [];
       return messages;
     };
 
@@ -2318,6 +2325,7 @@ if ( typeof exports !== "undefined" ) {
 
     Runner.prototype.getParams = function() {
       var name, param, params, value, _i, _len, _ref, _ref1;
+
       params = {};
       _ref = Teaspoon.location.search.substring(1).split("&");
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -2364,6 +2372,7 @@ if ( typeof exports !== "undefined" ) {
 
     fixture.preload = function() {
       var url, urls, _i, _len, _results;
+
       urls = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       _results = [];
       for (_i = 0, _len = urls.length; _i < _len; _i++) {
@@ -2375,6 +2384,7 @@ if ( typeof exports !== "undefined" ) {
 
     fixture.load = function() {
       var append, index, url, urls, _i, _j, _len, _results;
+
       urls = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), append = arguments[_i++];
       if (append == null) {
         append = false;
@@ -2393,6 +2403,7 @@ if ( typeof exports !== "undefined" ) {
 
     fixture.set = function() {
       var append, html, htmls, index, _i, _j, _len, _results;
+
       htmls = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), append = arguments[_i++];
       if (append == null) {
         append = false;
@@ -2425,6 +2436,7 @@ if ( typeof exports !== "undefined" ) {
 
     load = function(url, append, preload) {
       var cached, value;
+
       if (preload == null) {
         preload = false;
       }
@@ -2486,6 +2498,7 @@ if ( typeof exports !== "undefined" ) {
 
     create = function() {
       var _ref;
+
       Teaspoon.fixture.el = document.createElement("div");
       if (typeof window.$ === 'function') {
         Teaspoon.fixture.$el = $(Teaspoon.fixture.el);
@@ -2496,6 +2509,7 @@ if ( typeof exports !== "undefined" ) {
 
     cleanup = function() {
       var _base, _ref, _ref1;
+
       (_base = Teaspoon.fixture).el || (_base.el = document.getElementById("teaspoon-fixtures"));
       if ((_ref = Teaspoon.fixture.el) != null) {
         if ((_ref1 = _ref.parentNode) != null) {
@@ -2507,6 +2521,7 @@ if ( typeof exports !== "undefined" ) {
 
     xhrRequest = function(url, callback) {
       var e;
+
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else if (window.ActiveXObject) {
@@ -2555,6 +2570,7 @@ if ( typeof exports !== "undefined" ) {
 
     BaseView.prototype.createEl = function(type, className) {
       var el;
+
       if (className == null) {
         className = "";
       }
@@ -2565,18 +2581,21 @@ if ( typeof exports !== "undefined" ) {
 
     BaseView.prototype.findEl = function(id) {
       var _base;
+
       this.elements || (this.elements = {});
       return (_base = this.elements)[id] || (_base[id] = document.getElementById("teaspoon-" + id));
     };
 
     BaseView.prototype.setText = function(id, value) {
       var el;
+
       el = this.findEl(id);
       return el.innerHTML = value;
     };
 
     BaseView.prototype.setHtml = function(id, value, add) {
       var el;
+
       if (add == null) {
         add = false;
       }
@@ -2590,12 +2609,14 @@ if ( typeof exports !== "undefined" ) {
 
     BaseView.prototype.setClass = function(id, value) {
       var el;
+
       el = this.findEl(id);
       return el.className = value;
     };
 
     BaseView.prototype.htmlSafe = function(str) {
       var el;
+
       el = document.createElement("div");
       el.appendChild(document.createTextNode(str));
       return el.innerHTML;
@@ -2895,6 +2916,7 @@ if ( typeof exports !== "undefined" ) {
 
     SimpleProgressView.prototype.update = function(total, run) {
       var percent;
+
       percent = total ? Math.ceil((run * 100) / total) : 0;
       return this.setHtml("progress-percent", "" + percent + "%");
     };
@@ -2920,6 +2942,7 @@ if ( typeof exports !== "undefined" ) {
 
     RadialProgressView.prototype.appendTo = function() {
       var canvas, e;
+
       RadialProgressView.__super__.appendTo.apply(this, arguments);
       this.size = 80;
       try {
@@ -2935,6 +2958,7 @@ if ( typeof exports !== "undefined" ) {
 
     RadialProgressView.prototype.update = function(total, run) {
       var half, percent;
+
       percent = total ? Math.ceil((run * 100) / total) : 0;
       this.setHtml("progress-percent", "" + percent + "%");
       if (!this.ctx) {
@@ -2979,7 +3003,7 @@ if ( typeof exports !== "undefined" ) {
         classes.push("state-pending");
       }
       SpecView.__super__.build.call(this, classes.join(" "));
-      this.el.innerHTML = "<a href=\"" + this.spec.link + "\">" + this.spec.description + "</a>";
+      this.el.innerHTML = "<a href=\"" + this.spec.link + "\">" + (this.htmlSafe(this.spec.description)) + "</a>";
       this.parentView = this.buildParent();
       return this.parentView.append(this.el);
     };
@@ -3045,7 +3069,7 @@ if ( typeof exports !== "undefined" ) {
     FailureView.prototype.build = function() {
       var error, html, _i, _len, _ref;
       FailureView.__super__.build.call(this, "spec");
-      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + this.spec.fullDescription + "</a></h1>";
+      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + (this.htmlSafe(this.spec.fullDescription)) + "</a></h1>";
       _ref = this.spec.errors();
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         error = _ref[_i];
@@ -3082,7 +3106,7 @@ if ( typeof exports !== "undefined" ) {
 
     SuiteView.prototype.build = function() {
       SuiteView.__super__.build.call(this, "suite");
-      this.el.innerHTML = "<h1><a href=\"" + this.suite.link + "\">" + this.suite.description + "</a></h1>";
+      this.el.innerHTML = "<h1><a href=\"" + this.suite.link + "\">" + (this.htmlSafe(this.suite.description)) + "</a></h1>";
       this.parentView = this.buildParent();
       return this.parentView.append(this.el);
     };
@@ -3134,8 +3158,7 @@ if ( typeof exports !== "undefined" ) {
 
   Teaspoon.Reporters.Console = (function() {
     function Console() {
-      this.reportRunnerResults = __bind(this.reportRunnerResults, this);
-      this.start = new Teaspoon.Date();
+      this.reportRunnerResults = __bind(this.reportRunnerResults, this);      this.start = new Teaspoon.Date();
       this.suites = {};
     }
 
@@ -3149,6 +3172,7 @@ if ( typeof exports !== "undefined" ) {
 
     Console.prototype.reportSuites = function() {
       var index, suite, _i, _len, _ref, _results;
+
       _ref = this.spec.getParents();
       _results = [];
       for (index = _i = 0, _len = _ref.length; _i < _len; index = ++_i) {
@@ -3168,6 +3192,7 @@ if ( typeof exports !== "undefined" ) {
 
     Console.prototype.reportSpecResults = function(spec) {
       var result;
+
       this.spec = new Teaspoon.Spec(spec);
       result = this.spec.result();
       if (result.skipped) {
@@ -3192,6 +3217,7 @@ if ( typeof exports !== "undefined" ) {
 
     Console.prototype.trackPending = function() {
       var result;
+
       result = this.spec.result();
       return this.log({
         type: "spec",
@@ -3204,6 +3230,7 @@ if ( typeof exports !== "undefined" ) {
 
     Console.prototype.trackFailure = function() {
       var error, result, _i, _len, _ref, _results;
+
       result = this.spec.result();
       _ref = this.spec.errors();
       _results = [];
@@ -3254,8 +3281,7 @@ if ( typeof exports !== "undefined" ) {
     __extends(Console, _super);
 
     function Console(env) {
-      this.reportSpecResults = __bind(this.reportSpecResults, this);
-      Console.__super__.constructor.apply(this, arguments);
+      this.reportSpecResults = __bind(this.reportSpecResults, this);      Console.__super__.constructor.apply(this, arguments);
       env.log(this.reportSpecResults);
       env.testDone(this.reportSpecResults);
       env.done(this.reportRunnerResults);
@@ -3390,7 +3416,7 @@ if ( typeof exports !== "undefined" ) {
     FailureView.prototype.build = function() {
       var error, html, _i, _len, _ref2;
       FailureView.__super__.build.call(this, "spec");
-      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + this.spec.fullDescription + "</a></h1>";
+      html = "<h1 class=\"teaspoon-clearfix\"><a href=\"" + this.spec.link + "\">" + (this.htmlSafe(this.spec.fullDescription)) + "</a></h1>";
       _ref2 = this.spec.errors();
       for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
         error = _ref2[_i];