teaspoon 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8b06c0ee5371ab133340a4de55d246e8e21932
-  data.tar.gz: e92763c49f0fb454911371a0e88024f681ee33f8
+  metadata.gz: 8cef218e8022c1570a522f1d4a1d7f7f8e2a367f
+  data.tar.gz: ca33470c138fad431468907cb7e8c0961cd6d739
 SHA512:
-  metadata.gz: 8dfff685fb1c85aecdfbb81921302a592f9fb0e2330b6b1f8e2895300cfd8c4ff31fe530c1b59c0d93139dcb44a031151049e0c6de7560b0495ef6ea7d4f6d03
-  data.tar.gz: bae8e8493def887c1777cb54dc547dc6a9209732340e08a5d34487afefbf032a550f5fc922a285111d77783e65a89fbe9a9ef2e0081a079de40673be03041610
+  metadata.gz: e3d0cfcf706cf47bff2d7bb0b727159ba2e77dfa02dfaca7199ff68bae1583fd9d46ef331340c2cfc0fcefd9c3138892abdbf01990ff5db0e6cc45e266d5776a
+  data.tar.gz: ad850647cd5f11675c4bb3995326a4bb31eb40bc0b7e1f0b14d6438786f098272aee1858bafc65294a448bf6467d3b46763099123d21c9ea7eff55a218e55e12

data/README.md

@@ -53,8 +53,11 @@ Updating requires that you rename your `teabag.rb` initializer to `teaspoon.rb`,
 
 Add it to your Gemfile. In most cases you'll want to restrict it to the `:development, :test` or `:asset` groups.
 
+You should [install phantomjs](http://phantomjs.org/download.html).  If phantomjs is found it will be used, otherwise you can use the gem as a fallback -- which might not be optimal.
+
 ```ruby
 group :development, :test do
+  gem "phantomjs", ">= 1.8.1.1" # this is optional if you install phantomjs manually (as of teaspoon 0.7.9)
   gem "teaspoon"
 end
 ```
@@ -71,9 +74,6 @@ You can tell the generator which framework you want to use, if you want coffeesc
 rails generate teaspoon:install --framework=mocha --coffee
 ```
 
-You can optionally [install phantomjs](http://phantomjs.org/download.html).  If phantomjs is found it will be used, otherwise the gem will be used as a fallback -- which might not be optimal.
-
-
 ## Usage
 
 Teaspoon uses the Rails asset pipeline to serve files. This allows you to use `= require` in your test files, and allows you use things like HAML or RABL/JBuilder within your fixtures.  You can run Teaspoon in three ways -- in the browser, via the rake task, and using the command line interface.
@@ -278,7 +278,7 @@ An example text report that's output to the console after the tests have complet
 File                |   % Stmts |% Branches |   % Funcs |   % Lines |
 --------------------+-----------+-----------+-----------+-----------+
   phantomjs/        |     93.75 |        75 |     94.12 |     93.65 |
-    runner.coffee   |     93.75 |        75 |     94.12 |     93.65 |
+    runner.js       |     93.75 |        75 |     94.12 |     93.65 |
 --------------------+-----------+-----------+-----------+-----------+
 All files           |     93.75 |        75 |     94.12 |     93.65 |
 --------------------+-----------+-----------+-----------+-----------+
@@ -598,7 +598,16 @@ You can require these files in your spec helper by using:
 
 ## CI Support
 
-Teaspoon works great on CI setups. If you're using TravisCI it just works, but if you're using something else all you should need is to ensure phantomjs is installed.
+Teaspoon works great on CI setups. Add a line to execute Teaspoon (e.g. `bundle exec teaspoon`) in your CI config file. If you're using TravisCI or CircleCI it just works, but if you're using something else all you should need is to ensure phantomjs is installed.
+
+You can add teaspoon to the default rake tasks by clearing out the defaults (this is sometimes not required), and then adding teaspoon in the chain where you want. So with rspec and cucumber, you get the rspec specs running first, then the javascript specs, and then cucumber (or whatever integration specs you have). This is what I do personally, and then I don't have to do any CI setup.
+
+```ruby
+Rake::Task['default'].prerequisites.clear
+Rake::Task['default'].clear
+
+task default: [:spec, :teaspoon, :cucumber]
+```
 
 If you want to generate reports that CI can use you can install istanbul for coverage reports -- and output the report using the cobertura format, which Hudson can read.
 

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

@@ -26217,14 +26217,21 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
     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;
@@ -26242,7 +26249,7 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
         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++) {
@@ -26264,7 +26271,7 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.log = function() {
       var e;
-      this.messages.push(arguments[0]);
+      Teaspoon.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
       } catch (_error) {
@@ -26275,8 +26282,8 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.getMessages = function() {
       var messages;
-      messages = this.messages;
-      this.messages = [];
+      messages = Teaspoon.messages;
+      Teaspoon.messages = [];
       return messages;
     };
 
@@ -26613,7 +26620,8 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     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,
@@ -26638,7 +26646,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.build = function() {
       var _ref;
-
       this.buildLayout();
       this.setText("env-info", this.envInfo());
       this.setText("version", Teaspoon.version);
@@ -26656,7 +26663,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.buildLayout = function() {
       var el;
-
       el = this.createEl("div");
       el.id = "teaspoon-interface";
       el.innerHTML = Teaspoon.Reporters.HTML.template;
@@ -26665,7 +26671,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.buildSuiteSelect = function() {
       var options, suite, _i, _len, _ref;
-
       if (Teaspoon.suites.all.length === 1) {
         return "";
       }
@@ -26742,7 +26747,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.updateStatus = function(spec) {
       var elapsed, result, _ref, _ref1;
-
       spec = new Teaspoon.Spec(spec);
       result = spec.result();
       if (result.skipped || result.status === "pending") {
@@ -26771,7 +26775,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.showConfiguration = function() {
       var key, value, _ref, _results;
-
       _ref = this.config;
       _results = [];
       for (key in _ref) {
@@ -26787,7 +26790,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     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>");
@@ -26799,7 +26801,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.readConfig = function() {
       var config;
-
       if (config = this.cookie("teaspoon")) {
         return this.config = config;
       }
@@ -26807,7 +26808,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.toggleConfig = function(e) {
       var button, name;
-
       button = e.target;
       if (button.tagName.toLowerCase() !== "button") {
         return;
@@ -26828,7 +26828,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     HTML.prototype.cookie = function(name, value) {
       var date, match;
-
       if (value == null) {
         value = void 0;
       }
@@ -26982,20 +26981,18 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     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];
@@ -27007,7 +27004,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     SpecView.prototype.buildErrors = function() {
       var div, error, html, _i, _len, _ref;
-
       div = this.createEl("div");
       html = "";
       _ref = this.spec.errors();
@@ -27021,7 +27017,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     SpecView.prototype.updateState = function(state, elapsed) {
       var classes, result, _base;
-
       result = this.spec.result();
       classes = ["state-" + state];
       if (elapsed > Teaspoon.slow) {
@@ -27056,9 +27051,8 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     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];
@@ -27095,14 +27089,13 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     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;
@@ -27124,7 +27117,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     SuiteView.prototype.updateState = function(state) {
       var _base;
-
       if (this.state === "failed") {
         return;
       }

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

@@ -2623,14 +2623,21 @@ jasmine.version_= {
     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;
@@ -2648,7 +2655,7 @@ jasmine.version_= {
         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++) {
@@ -2670,7 +2677,7 @@ jasmine.version_= {
 
     Teaspoon.log = function() {
       var e;
-      this.messages.push(arguments[0]);
+      Teaspoon.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
       } catch (_error) {
@@ -2681,8 +2688,8 @@ jasmine.version_= {
 
     Teaspoon.getMessages = function() {
       var messages;
-      messages = this.messages;
-      this.messages = [];
+      messages = Teaspoon.messages;
+      Teaspoon.messages = [];
       return messages;
     };
 
@@ -3019,7 +3026,8 @@ jasmine.version_= {
 
     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,
@@ -3044,7 +3052,6 @@ jasmine.version_= {
 
     HTML.prototype.build = function() {
       var _ref;
-
       this.buildLayout();
       this.setText("env-info", this.envInfo());
       this.setText("version", Teaspoon.version);
@@ -3062,7 +3069,6 @@ jasmine.version_= {
 
     HTML.prototype.buildLayout = function() {
       var el;
-
       el = this.createEl("div");
       el.id = "teaspoon-interface";
       el.innerHTML = Teaspoon.Reporters.HTML.template;
@@ -3071,7 +3077,6 @@ jasmine.version_= {
 
     HTML.prototype.buildSuiteSelect = function() {
       var options, suite, _i, _len, _ref;
-
       if (Teaspoon.suites.all.length === 1) {
         return "";
       }
@@ -3148,7 +3153,6 @@ jasmine.version_= {
 
     HTML.prototype.updateStatus = function(spec) {
       var elapsed, result, _ref, _ref1;
-
       spec = new Teaspoon.Spec(spec);
       result = spec.result();
       if (result.skipped || result.status === "pending") {
@@ -3177,7 +3181,6 @@ jasmine.version_= {
 
     HTML.prototype.showConfiguration = function() {
       var key, value, _ref, _results;
-
       _ref = this.config;
       _results = [];
       for (key in _ref) {
@@ -3193,7 +3196,6 @@ jasmine.version_= {
 
     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>");
@@ -3205,7 +3207,6 @@ jasmine.version_= {
 
     HTML.prototype.readConfig = function() {
       var config;
-
       if (config = this.cookie("teaspoon")) {
         return this.config = config;
       }
@@ -3213,7 +3214,6 @@ jasmine.version_= {
 
     HTML.prototype.toggleConfig = function(e) {
       var button, name;
-
       button = e.target;
       if (button.tagName.toLowerCase() !== "button") {
         return;
@@ -3234,7 +3234,6 @@ jasmine.version_= {
 
     HTML.prototype.cookie = function(name, value) {
       var date, match;
-
       if (value == null) {
         value = void 0;
       }
@@ -3388,20 +3387,18 @@ jasmine.version_= {
 
     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];
@@ -3413,7 +3410,6 @@ jasmine.version_= {
 
     SpecView.prototype.buildErrors = function() {
       var div, error, html, _i, _len, _ref;
-
       div = this.createEl("div");
       html = "";
       _ref = this.spec.errors();
@@ -3427,7 +3423,6 @@ jasmine.version_= {
 
     SpecView.prototype.updateState = function(state, elapsed) {
       var classes, result, _base;
-
       result = this.spec.result();
       classes = ["state-" + state];
       if (elapsed > Teaspoon.slow) {
@@ -3462,9 +3457,8 @@ jasmine.version_= {
 
     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];
@@ -3501,14 +3495,13 @@ jasmine.version_= {
 
     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;
@@ -3530,7 +3523,6 @@ jasmine.version_= {
 
     SuiteView.prototype.updateState = function(state) {
       var _base;
-
       if (this.state === "failed") {
         return;
       }