teaspoon 0.7.4 → 0.7.5

data/README.md

@@ -1,11 +1,11 @@
 Teaspoon
-======
+========
 [![Build Status](https://travis-ci.org/modeset/teaspoon.png)](https://travis-ci.org/modeset/teaspoon)
 [![Code Climate](https://codeclimate.com/github/modeset/teaspoon.png)](https://codeclimate.com/github/modeset/teaspoon)
 
 Teaspoon is a Javascript test runner built on top of Rails. It can run tests in the browser, or headlessly using PhantomJS or with Selenium WebDriver.
 
-It's objective is to be the simplest, while also being the most complete Javascript testing solution for Rails. It takes full advantage of the asset pipeline and ships with support for Jasmine, Mocha, QUnit, and (experiementally) Angular.
+Its objective is to be the simplest, while also being the most complete Javascript testing solution for Rails. It takes full advantage of the asset pipeline and ships with support for Jasmine, Mocha, QUnit, and (experimentally) Angular.
 
 Ok, another Javascript test runner, right? Really? Yeah, that's tough, but we're pretty confident Teaspoon is one of the nicest and most full featured you'll find at the moment. And if you disagree, let us know and we'll probably fix whatever it is that you didn't like.
 
@@ -15,7 +15,7 @@ If you'd like to use Teaspoon with [Guard](https://github.com/guard/guard), chec
 
 ### Developer Notice:
 
-Teabag has been renamed to Teaspoon, thanks to (bigtunacan)[https://github.com/bigtunacan].
+Teabag has been renamed to Teaspoon, thanks to [bigtunacan](https://github.com/bigtunacan).
 
 This means you should change your gemspec to point to "teaspoon". A deprecation notice was provided with the last release of the gem under the teabag name, and versions will continue to move forward from 0.7.3.
 
@@ -50,10 +50,10 @@ Updating requires that you rename your `teabag.rb` initializer to `teaspoon.rb`,
 
 ## Installation
 
-Add it to your Gemfile. In most cases you'll want to restrict it to the `:asset`, or `:development, :test` groups.
+Add it to your Gemfile. In most cases you'll want to restrict it to the `:development, :test` or `:asset` groups.
 
 ```ruby
-group :assets do
+group :development, :test do
   gem "teaspoon"
 end
 ```
@@ -89,8 +89,14 @@ You can focus tests in various ways, and Teaspoon provides an interface to run f
 
 ### Rake
 
+The rake task provides several ways of foucusing tests. You can specify the suite to run, the files to run, and/or directories to run.
+
 ```
 rake teaspoon suite=my_fantastic_suite
+rake teaspoon files=test/javascripts/controllers/my_controller_test.js
+rake teaspoon files=test/javascripts/integration,test/javascripts/models
+rake teaspoon files=test/javascripts/integration,test/javascripts/models,test/javascripts/controllers/my_controller_test.js
+rake teaspoon suite=my_fantastic_suite files=test/javascripts/integration,test/javascripts/models,test/javascripts/controllers/my_controller_test.js
 ```
 
 ### Command Line Interface
@@ -101,11 +107,12 @@ The command line interface requires a `teaspoon_env.rb` file that you can get by
 bundle exec teaspoon
 ```
 
-The CLI provides several ways of focusing tests. You can specify the suite to run, the files to run, and a filter.
+The CLI provides several ways of focusing tests. You can specify the suite to run, the files to run, directories to run, and a filter.
 
 ```
 bundle exec teaspoon --suite=my_fantastic_suite
 bundle exec teaspoon spec/javascripts/calculator_spec.js
+bundle exec teaspoon spec/javascripts/integration
 bundle exec teaspoon --filter="Calculator should add two digits"
 ```
 

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

@@ -26227,7 +26227,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
-
       originalOnload = window.onload;
       return window.onload = function() {
         if (originalOnload && originalOnload.call) {
@@ -26239,7 +26238,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.resolveDependenciesFromParams = function(all) {
       var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
-
       if (all == null) {
         all = [];
       }
@@ -26266,7 +26264,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.log = function() {
       var e;
-
       this.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
@@ -26278,7 +26275,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Teaspoon.getMessages = function() {
       var messages;
-
       messages = this.messages;
       this.messages = [];
       return messages;
@@ -27391,7 +27387,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Spec.prototype.errors = function() {
       var step, _i, _len, _ref1, _results;
-
       if (!this.spec.steps) {
         return [];
       }
@@ -27412,7 +27407,6 @@ angular.element(document).find('head').append('<style type="text/css">@charset "
 
     Spec.prototype.result = function() {
       var status;
-
       status = "failed";
       if (this.spec.status === "success") {
         status = "passed";

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

@@ -2633,7 +2633,6 @@ jasmine.version_= {
 
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
-
       originalOnload = window.onload;
       return window.onload = function() {
         if (originalOnload && originalOnload.call) {
@@ -2645,7 +2644,6 @@ jasmine.version_= {
 
     Teaspoon.resolveDependenciesFromParams = function(all) {
       var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
-
       if (all == null) {
         all = [];
       }
@@ -2672,7 +2670,6 @@ jasmine.version_= {
 
     Teaspoon.log = function() {
       var e;
-
       this.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
@@ -2684,7 +2681,6 @@ jasmine.version_= {
 
     Teaspoon.getMessages = function() {
       var messages;
-
       messages = this.messages;
       this.messages = [];
       return messages;
@@ -3719,7 +3715,6 @@ jasmine.version_= {
 
     Runner.prototype.setup = function() {
       var grep, reporter;
-
       env.updateInterval = 1000;
       if (grep = this.params["grep"]) {
         env.specFilter = function(spec) {
@@ -3759,7 +3754,6 @@ jasmine.version_= {
 
     Spec.prototype.errors = function() {
       var item, _i, _len, _ref, _results;
-
       if (!this.spec.results) {
         return [];
       }
@@ -3780,7 +3774,6 @@ jasmine.version_= {
 
     Spec.prototype.getParents = function() {
       var parent;
-
       if (this.parents) {
         return this.parents;
       }
@@ -3796,7 +3789,6 @@ jasmine.version_= {
 
     Spec.prototype.result = function() {
       var results, status;
-
       results = this.spec.results();
       status = "failed";
       if (results.passed()) {
@@ -3842,7 +3834,6 @@ jasmine.version_= {
     fixture.load = function() {
       var args,
         _this = this;
-
       args = arguments;
       if (!(env.currentSuite || env.currentSpec)) {
         throw "Teaspoon can't load fixtures outside of describe.";
@@ -3866,7 +3857,6 @@ jasmine.version_= {
     fixture.set = function() {
       var args,
         _this = this;
-
       args = arguments;
       if (!(env.currentSuite || env.currentSpec)) {
         throw "Teaspoon can't load fixtures outside of describe.";

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

@@ -5404,7 +5404,6 @@
 
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
-
       originalOnload = window.onload;
       return window.onload = function() {
         if (originalOnload && originalOnload.call) {
@@ -5416,7 +5415,6 @@
 
     Teaspoon.resolveDependenciesFromParams = function(all) {
       var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
-
       if (all == null) {
         all = [];
       }
@@ -5443,7 +5441,6 @@
 
     Teaspoon.log = function() {
       var e;
-
       this.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
@@ -5455,7 +5452,6 @@
 
     Teaspoon.getMessages = function() {
       var messages;
-
       messages = this.messages;
       this.messages = [];
       return messages;
@@ -6549,7 +6545,6 @@
 
     Runner.prototype.setup = function() {
       var reporter;
-
       reporter = this.getReporter();
       return env.setup({
         reporter: reporter
@@ -6581,7 +6576,6 @@
 
     Spec.prototype.getParents = function() {
       var parent;
-
       if (this.parents) {
         return this.parents;
       }
@@ -6597,7 +6591,6 @@
 
     Spec.prototype.result = function() {
       var status;
-
       status = "failed";
       if (this.spec.state === "passed" || this.spec.state === "skipped") {
         status = "passed";
@@ -6617,11 +6610,13 @@
 
   Teaspoon.Suite = (function() {
     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.parent = this.suite.parent.root ? null : this.suite.parent;
+      this.parent = ((_ref = this.suite.parent) != null ? _ref.root : void 0) ? null : this.suite.parent;
       this.viewId = this.suite.viewId;
     }
 
@@ -6642,7 +6637,6 @@
     fixture.load = function() {
       var args,
         _this = this;
-
       args = arguments;
       if (env.started) {
         return fixture.__super__.constructor.load.apply(this, arguments);
@@ -6656,7 +6650,6 @@
     fixture.set = function() {
       var args,
         _this = this;
-
       args = arguments;
       if (env.started) {
         return fixture.__super__.constructor.set.apply(this, arguments);

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

@@ -2184,7 +2184,6 @@
 
     Teaspoon.onWindowLoad = function(method) {
       var originalOnload;
-
       originalOnload = window.onload;
       return window.onload = function() {
         if (originalOnload && originalOnload.call) {
@@ -2196,7 +2195,6 @@
 
     Teaspoon.resolveDependenciesFromParams = function(all) {
       var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
-
       if (all == null) {
         all = [];
       }
@@ -2223,7 +2221,6 @@
 
     Teaspoon.log = function() {
       var e;
-
       this.messages.push(arguments[0]);
       try {
         return console.log.apply(console, arguments);
@@ -2235,7 +2232,6 @@
 
     Teaspoon.getMessages = function() {
       var messages;
-
       messages = this.messages;
       this.messages = [];
       return messages;
@@ -3436,7 +3432,6 @@
 
     Spec.prototype.errors = function() {
       var item, _i, _len, _ref, _results;
-
       if (!this.spec.failed) {
         return [];
       }
@@ -3464,7 +3459,6 @@
 
     Spec.prototype.result = function() {
       var status;
-
       status = "failed";
       if (!this.spec.failed) {
         status = "passed";

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

@@ -4,7 +4,8 @@
 
   TeaspoonInterface = (function() {
     function TeaspoonInterface() {
-      this.filter = __bind(this.filter, this);      this.files = $u("#teaspoon-suite-list .file a");
+      this.filter = __bind(this.filter, this);
+      this.files = $u("#teaspoon-suite-list .file a");
       this.input = $u("#teaspoon-filter-input")[0];
       this.input.value = "";
       this.input.onkeyup = this.filter;
@@ -13,7 +14,6 @@
 
     TeaspoonInterface.prototype.filter = function() {
       var file, _i, _len, _ref, _results;
-
       _ref = this.files;
       _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {

data/app/assets/javascripts/teaspoon/base/teaspoon.coffee

@@ -22,13 +22,14 @@ class @Teaspoon
     @started = true
     new Teaspoon.Runner()
 
+
   @onWindowLoad: (method) ->
     originalOnload = window.onload
     window.onload = ->
       originalOnload() if originalOnload && originalOnload.call
       method()
 
-  # provides interface for AMD usage -- pass all dependencies in as an array, and params will be checked for matches
+
   @resolveDependenciesFromParams: (all = []) ->
     deps = []
     return all if (paths = @location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
@@ -41,7 +42,6 @@ class @Teaspoon
     deps
 
 
-  # logging methods -- used by selenium / phantomJS to get information back to ruby
   @log: ->
     @messages.push(arguments[0])
     try console.log(arguments...)

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

@@ -62,7 +62,7 @@ class Teaspoon.Suite
     @fullDescription = @suite.fullTitle()
     @description = @suite.title
     @link = "?grep=#{encodeURIComponent(@fullDescription)}"
-    @parent = if @suite.parent.root then null else @suite.parent
+    @parent = if @suite.parent?.root then null else @suite.parent
     @viewId = @suite.viewId
 
 

data/app/views/teaspoon/spec/_require_js.html.erb

@@ -0,0 +1,19 @@
+<%= javascript_include_tag_for_teaspoon *@suite.helper, @javascript_options %>
+<script type="text/javascript">
+  // When the DOM is loaded, we then use require to include currently selected file/suite, then once those are all loaded, we run Teaspoon
+  // @suite.spec_javascripts_for_require strips off the .js file extension
+  Teaspoon.onWindowLoad(function () {
+    // setup the Teaspoon path prefix to load /assets
+    require.config(
+      <% if Rails.application.config.respond_to?(:requirejs) %>
+        <%=raw Rails.application.config.requirejs.user_config.merge({baseUrl: '/assets'}).to_json %>
+      <% else %>
+        {baseUrl: '/assets'}
+      <% end %>
+    );
+
+    require(<%=raw @suite.spec_javascripts_for_require.to_json %>, function () {
+      Teaspoon.execute();
+    });
+  });
+</script>

data/app/views/teaspoon/spec/_standard.html.erb

@@ -0,0 +1,4 @@
+<%= javascript_include_tag_for_teaspoon *@suite.spec_javascripts, @javascript_options %>
+<script type="text/javascript">
+  Teaspoon.onWindowLoad(Teaspoon.execute);
+</script>

data/app/views/teaspoon/spec/runner.html.erb

@@ -1,4 +1,4 @@
-<!DOCTYPE>
+<!DOCTYPE html>
 <html>
 <head>
   <title>Teaspoon :: Javascript Test Runner</title>
@@ -7,40 +7,12 @@
   <%= stylesheet_link_tag_for_teaspoon *@suite.stylesheets %>
   <%= javascript_include_tag_for_teaspoon *@suite.core_javascripts %>
   <script type="text/javascript">
-    // pass relevant info to javascript
     Teaspoon.version = <%=raw Teaspoon::VERSION.inspect %>;
     Teaspoon.root = <%=raw Teaspoon.configuration.mount_at.inspect %>;
     Teaspoon.suites = <%=raw @suite.suites.to_json %>;
+    Teaspoon.config = <%=raw @suite.js_config.to_json %>;
   </script>
-  <% if @suite.use_require %>
-    <%= javascript_include_tag_for_teaspoon *@suite.helper %>
-    <script type="text/javascript">
-      // When the DOM is loaded, we then use require to include currently selected file/suite, then once those are all loaded, we run Teaspoon
-      // @suite.spec_javascripts_for_require strips off the .js and adds the Teaspoon prefix
-      Teaspoon.onWindowLoad(function () {
-        //setup the Teaspoon path prefix to load /assets
-        require.config(
-            <% if Rails.application.config.respond_to?('requirejs') %>
-              <%= Rails.application.config.requirejs.user_config.merge({baseUrl: '/assets'}).to_json.html_safe %>
-            <% else %>
-              {
-                baseUrl: '/assets'
-              }
-            <% end %>
-        );
-
-        require(<%= html_escape @suite.spec_javascripts_for_require.to_json.html_safe %>, function () {
-          Teaspoon.execute();
-        });
-      });
-    </script>
-  <% else %>
-    <%= javascript_include_tag_for_teaspoon *@suite.spec_javascripts, @javascript_options %>
-    <script type="text/javascript">
-      // start the execution of the specs
-      Teaspoon.onWindowLoad(Teaspoon.execute);
-    </script>
-  <% end %>
+  <%= render @suite.boot_partial || 'standard' %>
 </head>
 <body>
 </body>

data/app/views/teaspoon/spec/suites.html.erb

@@ -1,4 +1,4 @@
-<!DOCTYPE>
+<!DOCTYPE html>
 <html>
   <head>
     <title>Teaspoon :: Suites</title>