teaspoon 0.8.0 → 0.9.0

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

@@ -1,10 +1,10 @@
 (function() {
   var TeaspoonInterface,
-    __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
   TeaspoonInterface = (function() {
     function TeaspoonInterface() {
-      this.filter = __bind(this.filter, this);
+      this.filter = bind(this.filter, this);
       this.files = $u("#teaspoon-suite-list .file a");
       this.input = $u("#teaspoon-filter-input")[0];
       this.input.value = "";
@@ -12,18 +12,18 @@
     }
 
     TeaspoonInterface.prototype.filter = function() {
-      var file, _i, _len, _ref, _results;
-      _ref = this.files;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        file = _ref[_i];
+      var file, i, len, ref, results;
+      ref = this.files;
+      results = [];
+      for (i = 0, len = ref.length; i < len; i++) {
+        file = ref[i];
         if (LiquidMetal.score(file.innerHTML, this.input.value) > 0) {
-          _results.push(file.parentNode.style.display = "block");
+          results.push(file.parentNode.style.display = "block");
         } else {
-          _results.push(file.parentNode.style.display = "none");
+          results.push(file.parentNode.style.display = "none");
         }
       }
-      return _results;
+      return results;
     };
 
     return TeaspoonInterface;

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

@@ -72,7 +72,6 @@ class Teaspoon.fixture
     Teaspoon.fixture.el.innerHTML += content
 
 
-
   create = =>
     Teaspoon.fixture.el = document.createElement("div")
     Teaspoon.fixture.$el = $(Teaspoon.fixture.el) if typeof(window.$) == 'function'

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

@@ -1,8 +1,8 @@
-Teaspoon.hook = (name, options = {}) ->
-
+Teaspoon.hook = (name, payload = {}) ->
+  method = "POST"
   xhr = null
 
-  xhrRequest = (url, options, callback) ->
+  xhrRequest = (url, payload, callback) ->
     if window.XMLHttpRequest # Mozilla, Safari, ...
       xhr = new XMLHttpRequest()
     else if window.ActiveXObject # IE
@@ -13,9 +13,10 @@ Teaspoon.hook = (name, options = {}) ->
     throw("Unable to make Ajax Request") unless xhr
 
     xhr.onreadystatechange = callback
-    xhr.open(options['method'] || "GET", "#{Teaspoon.root}/#{url}", false)
-    xhr.send(options['payload'])
+    xhr.open("POST", "#{Teaspoon.root}/#{url}", false)
+    xhr.setRequestHeader("Content-Type", "application/json")
+    xhr.send(JSON.stringify(args: payload))
 
-  xhrRequest "#{Teaspoon.suites.active}/#{name}", options, ->
+  xhrRequest "#{Teaspoon.suites.active}/#{name}", payload, ->
     return unless xhr.readyState == 4
     throw("Unable to call hook \"#{url}\".") unless xhr.status == 200

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

@@ -33,6 +33,7 @@ class Teaspoon.Spec
     return [] unless @spec.failed
     for item in @spec.assertions
       continue if item.result
+      @provideFallbackMessage(item)
       {message: item.message, stack: item.source}
 
 
@@ -48,6 +49,15 @@ class Teaspoon.Spec
     skipped: false
 
 
+  provideFallbackMessage: (item) ->
+    return if item.message
+
+    if item.actual && item.expected
+      item.message ||= "Expected #{JSON.stringify(item.actual)} to equal #{JSON.stringify(item.expected)}"
+    else
+      item.message = 'failed'
+
+
 
 class Teaspoon.Suite
 

data/app/controllers/teaspoon/suite_controller.rb

@@ -1,6 +1,4 @@
 class Teaspoon::SuiteController < ActionController::Base
-  helper Teaspoon::SuiteHelper rescue nil
-
   before_filter :prepend_fixture_paths
 
   layout false
@@ -14,12 +12,13 @@ class Teaspoon::SuiteController < ActionController::Base
   end
 
   def hook
-    Teaspoon::Suite.new(params).hooks[params[:hook].to_s].each { |hook| hook.call }
+    hooks = Teaspoon::Suite.new(params).hooks[params[:hook].to_s]
+    hooks.each { |hook| hook.call(params[:args]) }
     render nothing: true
   end
 
   def fixtures
-    render "/#{params[:filename]}"
+    render template: "/#{params[:filename]}"
   end
 
   private

data/app/views/teaspoon/suite/_boot.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag *@suite.spec_assets %>
+<%= javascript_include_tag *@suite.spec_assets, debug: @suite.config.expand_assets %>
 <script type="text/javascript">
   Teaspoon.onWindowLoad(Teaspoon.execute);
 </script>

data/app/views/teaspoon/suite/_boot_require_js.html.erb

@@ -1,6 +1,7 @@
 <%
 rails_config = Rails.application.config
 require_options = {baseUrl: rails_config.assets.prefix}
+require_options.merge!(urlArgs: "instrument=1", waitSeconds: 0) if Teaspoon.configuration.use_coverage
 require_options.merge!(rails_config.requirejs.user_config) if rails_config.respond_to?(:requirejs)
 specs = @suite.spec_assets(false).map{ |s| "#{s.gsub(/\.js.*$/, "")}" }
 %>

data/bin/teaspoon

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-root = File.expand_path('../../lib', __FILE__)
+root = File.expand_path("../../lib", __FILE__)
 $:.unshift(root) unless $:.include?(root)
 
 require "teaspoon/command_line"

data/config/routes.rb

@@ -1,16 +1,6 @@
 Teaspoon::Engine.routes.draw do
-
-  root  to: "suite#index"
-
-  match "/fixtures/*filename",
-        to: "suite#fixtures", via: [:get]
-
-  match "/:suite", as: "suite",
-        to: "suite#show", via: [:get],
-        defaults: { suite: "default" }
-
-  match "/:suite/:hook", as: "suite_hook",
-        to: "suite#hook", via: [:get, :post],
-        defaults: { suite: "default", hook: "default" }
-
+  root to: "suite#index"
+  match "/fixtures/*filename", to: "suite#fixtures", via: :get
+  match "/:suite", as: "suite", to: "suite#show", via: :get, defaults: { suite: "default" }
+  match "/:suite/:hook", as: "suite_hook", to: "suite#hook", via: :post, defaults: { suite: "default", hook: "default" }
 end

data/lib/generators/teaspoon/install/install_generator.rb

@@ -1,40 +1,48 @@
 module Teaspoon
   module Generators
     class InstallGenerator < Rails::Generators::Base
-
       source_root File.expand_path("../", __FILE__)
 
       desc "Installs the Teaspoon initializer into your application."
 
-      class_option :framework, type: :string,
+      class_option :framework,
+                   type: :string,
                    aliases: "-t",
                    default: "jasmine",
                    desc:    "Specify which test framework to use (Available: jasmine, mocha, or qunit)"
 
-      class_option :coffee, type: :boolean,
+      class_option :coffee,
+                   type: :boolean,
                    aliases: "-c",
                    default: false,
                    desc:    "Generate a CoffeeScript spec helper instead of Javascript"
 
-      class_option :no_comments, type: :boolean,
+      class_option :no_comments,
+                   type: :boolean,
                    aliases: "-q",
                    default: false,
                    desc:    "Install the teaspoon_env.rb without comments"
 
-      class_option :partials, type: :boolean,
+      class_option :partials,
+                   type: :boolean,
                    aliases: "-p",
                    default: false,
                    desc:    "Copy the boot and body partials"
 
       def validate_framework
         return if frameworks.include?(options[:framework])
-        puts "Unknown framework -- available #{frameworks.join(", ")}"
+        puts "Unknown framework -- available #{frameworks.join(', ')}"
         exit(1)
       end
 
       def copy_environment
-        source = options[:no_comments] ? "env.rb" : "env_comments.rb"
-        copy_file "templates/#{framework}/#{source}", "#{framework_type}/teaspoon_env.rb"
+        if options[:no_comments]
+          copy_file "templates/#{framework}/env.rb",
+                    "#{framework_type}/teaspoon_env.rb"
+        else
+          template "templates/#{framework}/env_comments.rb.tt",
+                   "#{framework_type}/teaspoon_env.rb"
+        end
       end
 
       def create_structure
@@ -43,13 +51,16 @@ module Teaspoon
       end
 
       def copy_spec_helper
-        copy_file "templates/#{framework}/#{framework_type}_helper.#{helper_ext}", "#{framework_type}/javascripts/#{framework_type}_helper.#{helper_ext}"
+        copy_file "templates/#{framework}/#{framework_type}_helper.#{helper_ext}",
+                  "#{framework_type}/javascripts/#{framework_type}_helper.#{helper_ext}"
       end
 
       def copy_partials
         return unless options[:partials]
-        copy_file "templates/_boot.html.erb", "/#{framework_type}/javascripts/fixtures/_boot.html.erb"
-        copy_file "templates/_body.html.erb", "/#{framework_type}/javascripts/fixtures/_body.html.erb"
+        copy_file "templates/_boot.html.erb",
+                  "#{framework_type}/javascripts/fixtures/_boot.html.erb"
+        copy_file "templates/_body.html.erb",
+                  "#{framework_type}/javascripts/fixtures/_body.html.erb"
       end
 
       def display_readme

data/lib/generators/teaspoon/install/templates/jasmine/{env_comments.rb → env_comments.rb.tt}

@@ -41,7 +41,7 @@ Teaspoon.configure do |config|
     # directives.
     # Note: If no version is specified, the latest is assumed.
     #
-    # Available: jasmine[1.3.1, 2.0.0], mocha[1.10.0, 1.17.1] qunit[1.12.0, 1.14.0]
+    # Available: jasmine[1.3.1], mocha[1.10.0, 1.17.1] qunit[1.12.0, 1.14.0]
     suite.use_framework :jasmine, "1.3.1"
 
     # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
@@ -80,6 +80,11 @@ Teaspoon.configure do |config|
     # synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
     #suite.hook :fixtures, proc{ }
 
+    # Determine whether specs loaded into the test harness should be embedded as individual script tags or concatenated
+    # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default, 
+    # Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
+    #suite.expand_assets = false
+
   end
 
   # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
@@ -134,8 +139,8 @@ Teaspoon.configure do |config|
   # Specify the formatters to use when outputting the results.
   # Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
   #
-  # Available: dot, documentation, clean, json, junit, pride, snowday, swayze_or_oprah, tap, tap_y, teamcity
-  #config.formatters = ["dot"]
+  # Available: <%= Teaspoon::Formatters.known_formatters.map(&:name).join ", " %>
+  #config.formatters = ["<%= Teaspoon::Formatters.known_formatters.select(&:default?).first.name %>"]
 
   # Specify if you want color output from the formatters.
   #config.color = true
@@ -161,14 +166,14 @@ Teaspoon.configure do |config|
 
   config.coverage do |coverage|
 
-    # Which coverage reports Instanbul should generate. Correlates directly to what Istanbul supports.
+    # Which coverage reports Istanbul should generate. Correlates directly to what Istanbul supports.
     #
     # Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
     #coverage.reports = ["text-summary", "html"]
 
     # The path that the coverage should be written to - when there's an artifact to write to disk.
     # Note: Relative to `config.root`.
-    #coverage.output_dir = "coverage"
+    #coverage.output_path = "coverage"
 
     # Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
     # aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.

data/lib/generators/teaspoon/install/templates/jasmine/spec_helper.coffee

@@ -8,6 +8,10 @@
 # Use this polyfill to avoid the confusion.
 #= require support/bind-poly
 #
+# You can require your own javascript files here. By default this will include everything in application, however you
+# may get better load performance if you require the specific files that are being used in the spec that tests them.
+#= require application
+#
 # Deferring execution
 # If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
 # Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
@@ -18,14 +22,10 @@
 # Matching files
 # By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
 # spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
-# configuration in config/initializers/teaspoon.rb
+# configuration in teaspoon_env.rb
 #
 # Manifest
 # If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 # the configuration and use this file as a manifest.
 #
 # For more information: http://github.com/modeset/teaspoon
-#
-# You can require your own javascript files here. By default this will include everything in application, however you
-# may get better load performance if you require the specific files that are being used in the spec that tests them.
-#= require application

data/lib/generators/teaspoon/install/templates/jasmine/spec_helper.js

@@ -8,6 +8,10 @@
 // Use this polyfill to avoid the confusion.
 //= require support/bind-poly
 //
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the spec that tests them.
+//= require application
+//
 // Deferring execution
 // If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
 // Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
@@ -18,14 +22,10 @@
 // Matching files
 // By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
 // spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
-// configuration in config/initializers/teaspoon.rb
+// configuration in teaspoon_env.rb
 //
 // Manifest
 // If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 // the configuration and use this file as a manifest.
 //
 // For more information: http://github.com/modeset/teaspoon
-//
-// You can require your own javascript files here. By default this will include everything in application, however you
-// may get better load performance if you require the specific files that are being used in the spec that tests them.
-//= require application

data/lib/generators/teaspoon/install/templates/mocha/{env_comments.rb → env_comments.rb.tt}

@@ -41,7 +41,7 @@ Teaspoon.configure do |config|
     # directives.
     # Note: If no version is specified, the latest is assumed.
     #
-    # Available: jasmine[1.3.1, 2.0.0], mocha[1.10.0, 1.17.1] qunit[1.12.0, 1.14.0]
+    # Available: jasmine[1.3.1], mocha[1.10.0, 1.17.1] qunit[1.12.0, 1.14.0]
     suite.use_framework :mocha
 
     # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
@@ -80,6 +80,11 @@ Teaspoon.configure do |config|
     # synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
     #suite.hook :fixtures, proc{ }
 
+    # Determine whether specs loaded into the test harness should be embedded as individual script tags or concatenated
+    # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default, 
+    # Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
+    #suite.expand_assets = false
+
   end
 
   # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
@@ -134,8 +139,8 @@ Teaspoon.configure do |config|
   # Specify the formatters to use when outputting the results.
   # Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
   #
-  # Available: dot, documentation, clean, json, junit, pride, snowday, swayze_or_oprah, tap, tap_y, teamcity
-  #config.formatters = ["dot"]
+  # Available: <%= Teaspoon::Formatters.known_formatters.map(&:name).join ", " %>
+  #config.formatters = ["<%= Teaspoon::Formatters.known_formatters.select(&:default?).first.name %>"]
 
   # Specify if you want color output from the formatters.
   #config.color = true
@@ -161,14 +166,14 @@ Teaspoon.configure do |config|
 
   config.coverage do |coverage|
 
-    # Which coverage reports Instanbul should generate. Correlates directly to what Istanbul supports.
+    # Which coverage reports Istanbul should generate. Correlates directly to what Istanbul supports.
     #
     # Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
     #coverage.reports = ["text-summary", "html"]
 
     # The path that the coverage should be written to - when there's an artifact to write to disk.
     # Note: Relative to `config.root`.
-    #coverage.output_dir = "coverage"
+    #coverage.output_path = "coverage"
 
     # Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
     # aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.

data/lib/generators/teaspoon/install/templates/mocha/spec_helper.coffee

@@ -2,12 +2,17 @@
 # require support/expect
 # require support/sinon
 # require support/chai
+# require support/chai-jq-0.0.7
 # require support/your-support-file
 #
 # PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 # Use this polyfill to avoid the confusion.
 #= require support/bind-poly
 #
+# You can require your own javascript files here. By default this will include everything in application, however you
+# may get better load performance if you require the specific files that are being used in the spec that tests them.
+#= require application
+#
 # Deferring execution
 # If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
 # Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
@@ -18,7 +23,7 @@
 # Matching files
 # By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
 # spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
-# configuration in config/initializers/teaspoon.rb
+# configuration in teaspoon_env.rb
 #
 # Manifest
 # If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
@@ -33,7 +38,3 @@
 # window.assert = chai.assert
 # window.expect = chai.expect
 # window.should = chai.should()
-#
-# You can require your own javascript files here. By default this will include everything in application, however you
-# may get better load performance if you require the specific files that are being used in the spec that tests them.
-#= require application

data/lib/generators/teaspoon/install/templates/mocha/spec_helper.js

@@ -2,12 +2,17 @@
 // require support/expect
 // require support/sinon
 // require support/chai
+// require support/chai-jq-0.0.7
 // require support/your-support-file
 //
 // PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 // Use this polyfill to avoid the confusion.
 //= require support/bind-poly
 //
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the spec that tests them.
+//= require application
+//
 // Deferring execution
 // If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
 // Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
@@ -18,7 +23,7 @@
 // Matching files
 // By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
 // spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
-// configuration in config/initializers/teaspoon.rb
+// configuration in teaspoon_env.rb
 //
 // Manifest
 // If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
@@ -33,7 +38,3 @@
 // window.assert = chai.assert;
 // window.expect = chai.expect;
 // window.should = chai.should();
-//
-// You can require your own javascript files here. By default this will include everything in application, however you
-// may get better load performance if you require the specific files that are being used in the spec that tests them.
-//= require application