teaspoon 0.7.8 → 0.7.9

data/app/assets/javascripts/teaspoon/base/reporters/html/failure_view.coffee

@@ -6,7 +6,7 @@ class Teaspoon.Reporters.HTML.FailureView extends Teaspoon.Reporters.BaseView
 
   build: ->
     super("spec")
-    html = """<h1 class="teaspoon-clearfix"><a href="#{@spec.link}">#{@spec.fullDescription}</a></h1>"""
+    html = """<h1 class="teaspoon-clearfix"><a href="#{@spec.link}">#{@htmlSafe(@spec.fullDescription)}</a></h1>"""
     for error in @spec.errors()
       html += """<div><strong>#{@htmlSafe(error.message)}</strong><br/>#{@htmlSafe(error.stack || "Stack trace unavailable")}</div>"""
     @el.innerHTML = html

data/app/assets/javascripts/teaspoon/base/reporters/html/spec_view.coffee

@@ -13,7 +13,7 @@ class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
     classes = ["spec"]
     classes.push("state-pending") if @spec.pending
     super(classes.join(" "))
-    @el.innerHTML = """<a href="#{@spec.link}">#{@spec.description}</a>"""
+    @el.innerHTML = """<a href="#{@spec.link}">#{@htmlSafe(@spec.description)}</a>"""
     @parentView = @buildParent()
     @parentView.append(@el)
 

data/app/assets/javascripts/teaspoon/base/reporters/html/suite_view.coffee

@@ -12,7 +12,7 @@ class Teaspoon.Reporters.HTML.SuiteView extends Teaspoon.Reporters.BaseView
 
   build: ->
     super("suite")
-    @el.innerHTML = """<h1><a href="#{@suite.link}">#{@suite.description}</a></h1>"""
+    @el.innerHTML = """<h1><a href="#{@suite.link}">#{@htmlSafe(@suite.description)}</a></h1>"""
     @parentView = @buildParent()
     @parentView.append(@el)
 

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

@@ -16,13 +16,18 @@ class @Teaspoon
   @messages:  []
 
   @execute: ->
-    if @defer
-      @defer = false
+    if Teaspoon.defer
+      Teaspoon.defer = false
       return
-    @started = true
+    Teaspoon.reload() if Teaspoon.started
+    Teaspoon.started = true
     new Teaspoon.Runner()
 
 
+  @reload: ->
+    window.location.reload()
+
+
   @onWindowLoad: (method) ->
     originalOnload = window.onload
     window.onload = ->
@@ -32,7 +37,7 @@ class @Teaspoon
 
   @resolveDependenciesFromParams: (all = []) ->
     deps = []
-    return all if (paths = @location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
+    return all if (paths = Teaspoon.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
 
     for path in paths
       parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i)
@@ -43,13 +48,13 @@ class @Teaspoon
 
 
   @log: ->
-    @messages.push(arguments[0])
+    Teaspoon.messages.push(arguments[0])
     try console.log(arguments...)
     catch e
       throw new Error("Unable to use console.log for logging")
 
 
   @getMessages: ->
-    messages = @messages
-    @messages = []
+    messages = Teaspoon.messages
+    Teaspoon.messages = []
     messages

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

@@ -65,7 +65,7 @@ class Teaspoon.Reporters.HTML.FailureView extends Teaspoon.Reporters.HTML.Failur
 
   build: ->
     super("spec")
-    html = """<h1 class="teaspoon-clearfix"><a href="#{@spec.link}">#{@spec.fullDescription}</a></h1>"""
+    html = """<h1 class="teaspoon-clearfix"><a href="#{@spec.link}">#{@htmlSafe(@spec.fullDescription)}</a></h1>"""
     for error in @spec.errors()
       html += """<div><strong>#{error.message}</strong><br/>#{@htmlSafe(error.stack || "Stack trace unavailable")}</div>"""
     @el.innerHTML = html

data/app/assets/stylesheets/teaspoon.css

@@ -63,7 +63,7 @@ html[xmlns] #teaspoon-interface .teaspoon-clearfix {
   color: #000;
 }
 #teaspoon-title a:hover {
-  text-decoration: underline;
+  border-bottom: 1px solid #000;
 }
 
 /* Progress indicator

data/app/helpers/teaspoon/spec_helper.rb

@@ -30,6 +30,7 @@ module Teaspoon::SpecHelper
   def asset_src(dep, instrument = false)
     params = "?body=1"
     params << "&instrument=1" if instrument && @suite && @suite.instrument_file?(dep.pathname.to_s)
-    "#{Rails.application.config.assets.prefix}/#{dep.logical_path}#{params}"
+
+    "#{Teaspoon.configuration.context}#{Rails.application.config.assets.prefix}/#{dep.logical_path}#{params}"
   end
 end

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

@@ -3,6 +3,10 @@
 # require support/sinon
 # 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
+#
 # 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:

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

@@ -3,6 +3,10 @@
 // require support/sinon
 // 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
+//
 // 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:

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

@@ -4,6 +4,10 @@
 # require support/chai
 # 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
+#
 # 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:
@@ -25,8 +29,8 @@
 # For more information see: http://chaijs.com/guide/styles
 # Examples:
 #
-#   window.assert = chai.assert()
-#   window.expect = chai.expect()
+#   window.assert = chai.assert
+#   window.expect = chai.expect
 #   window.should = chai.should()
 #
 # For more information: http://github.com/modeset/teaspoon

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

@@ -4,6 +4,10 @@
 // require support/chai
 // 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
+//
 // 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:

data/lib/generators/teaspoon/install/templates/qunit/test_helper.coffee

@@ -2,6 +2,10 @@
 # require support/sinon
 # 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
+#
 # 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:

data/lib/generators/teaspoon/install/templates/qunit/test_helper.js

@@ -2,6 +2,10 @@
 // require support/sinon
 // 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
+//
 // 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:

data/lib/teaspoon/configuration.rb

@@ -4,9 +4,10 @@ module Teaspoon
   class Configuration
     include Singleton
 
-    cattr_accessor :mount_at, :root, :asset_paths, :fixture_path, :suites, :driver_cli_options
+    cattr_accessor :mount_at, :context, :root, :asset_paths, :fixture_path, :suites, :driver_cli_options
     @@mount_at           = "/teaspoon"
-    @@root               = nil # will default to Rails.root if left unset
+    @@context            = nil # will default to Rails #relative_url_root
+    @@root               = nil # will default to Rails.root
     @@asset_paths        = ["spec/javascripts", "spec/javascripts/stylesheets", "test/javascripts", "test/javascripts/stylesheets"]
     @@fixture_path       = "spec/javascripts/fixtures"
     @@suites             = {"default" => proc{}}
@@ -50,7 +51,7 @@ module Teaspoon
       end
 
       def use_require=(val) # todo: deprecated in version 0.7.4
-        puts "Deprecation Notice: use_require will be removed, specify 'require_js' for config.boot_partial instead."
+        puts "Deprecation Notice: use_require will be removed, set config.boot_partial to 'require_js' instead."
         self.boot_partial = 'require_js' if val
       end
 

data/lib/teaspoon/coverage.rb

@@ -2,8 +2,9 @@ module Teaspoon
   class Coverage
     include Teaspoon::Utility
 
-    def initialize(data)
+    def initialize(data, suite_name)
       @data = data
+      @suite_name = suite_name
     end
 
     def reports
@@ -23,7 +24,7 @@ module Teaspoon
     private
 
     def generate_report(input, format)
-      result = %x{#{executable} report #{format} #{input.shellescape} --dir #{Teaspoon.configuration.coverage_output_dir}}
+      result = %x{#{executable} report #{format} #{input.shellescape} --dir #{File.join(Teaspoon.configuration.coverage_output_dir, @suite_name)}}
       raise "Could not generate coverage report for #{format}" unless $?.exitstatus == 0
       result.gsub("Done", "").gsub("Using reporter [#{format}]", "").strip
     end

data/lib/teaspoon/drivers/phantomjs/runner.js

@@ -0,0 +1,108 @@
+(function() {
+  var system = require("system");
+  var webpage = require("webpage");
+
+  this.Runner = (function() {
+
+    function Runner() {
+      this.url = system.args[1];
+      this.timeout = parseInt(system.args[2] || 180) * 1000;
+
+      var _this = this;
+      this.waitForResults = function() { Runner.prototype.waitForResults.apply(_this, arguments) };
+    }
+
+    Runner.prototype.run = function() {
+      this.initPage();
+      this.loadPage();
+    };
+
+    Runner.prototype.initPage = function() {
+      this.page = webpage.create();
+      this.page.viewportSize = {
+        width: 800,
+        height: 800
+      };
+    };
+
+    Runner.prototype.loadPage = function() {
+      var method, name, _ref, _results;
+      this.page.open(this.url);
+      _ref = this.pageCallbacks();
+      _results = [];
+      for (name in _ref) {
+        method = _ref[name];
+        _results.push(this.page[name] = method);
+      }
+      return _results;
+    };
+
+    Runner.prototype.waitForResults = function() {
+      if ((new Date().getTime() - this.start) >= this.timeout) this.fail("Timed out");
+      var finished = this.page.evaluate(function() { return window.Teaspoon && window.Teaspoon.finished });
+      finished ? this.finish() : setTimeout(this.waitForResults, 200);
+    };
+
+    Runner.prototype.fail = function(msg, errno) {
+      if (msg == null) msg = null;
+      if (errno == null) errno = 1;
+      if (msg) console.log("Error: " + msg);
+
+      console.log(JSON.stringify({
+        _teaspoon: true,
+        type: "exception"
+      }));
+      phantom.exit(errno);
+    };
+
+    Runner.prototype.finish = function() {
+      console.log(" ");
+      phantom.exit(0);
+    };
+
+    Runner.prototype.pageCallbacks = function() {
+      var _this = this;
+      return {
+        onError: function(message, trace) {
+          console.log(JSON.stringify({
+            _teaspoon: true,
+            type: "error",
+            message: message,
+            trace: trace
+          }));
+          _this.errored = true;
+        },
+
+        onConsoleMessage: function(msg) {
+          console.log(msg);
+          if (_this.errorTimeout) clearTimeout(_this.errorTimeout);
+          if (_this.errored) {
+            _this.errorTimeout = setTimeout((function() {
+              return _this.fail('Javascript error has cause a timeout.');
+            }), 1000);
+            return _this.errored = false;
+          }
+        },
+
+        onLoadFinished: function(status) {
+          if (_this.start) return;
+          _this.start = new Date().getTime();
+          var defined = _this.page.evaluate(function() {
+            return window.Teaspoon;
+          });
+          if (!(status === "success" && defined)) {
+            _this.fail("Failed to load: " + _this.url);
+            return;
+          }
+          _this.waitForResults();
+        }
+      };
+    };
+
+    return Runner;
+
+  })();
+
+  new Runner().run();
+
+}).call(this);

data/lib/teaspoon/drivers/phantomjs_driver.rb

@@ -1,18 +1,20 @@
-require "phantomjs"
 require "teaspoon/runner"
 require 'teaspoon/utility'
 
+begin
+  require "phantomjs"
+rescue LoadError
+end
+
 module Teaspoon
   module Drivers
     class PhantomjsDriver < BaseDriver
       include Teaspoon::Utility
 
-      def run_specs(suite, url, driver_cli_options = nil)
+      def run_specs(suite, url, cli_options = nil)
         runner = Teaspoon::Runner.new(suite)
 
-        Phantomjs.instance_variable_set(:@path, executable)
-        # Phantomjs.run takes the command-line args as an array, so if we need to pass in switches/flags, need to split on space
-        Phantomjs.run(*([driver_cli_options && driver_cli_options.split(" "), script, url].flatten.compact)) do |line|
+        run(*cli_arguments(url, cli_options)) do |line|
           runner.process(line) if line && line.strip != ""
         end
 
@@ -21,12 +23,28 @@ module Teaspoon
 
       protected
 
+      def run(*args, &block)
+        IO.popen([executable, *args]) { |io|
+          io.each(&block)
+        }
+      end
+
+      def cli_arguments(url, cli_options)
+        [cli_options.to_s.split(" "), script, url].flatten.compact
+      end
+
       def executable
-        @executable ||= which('phantomjs')
+        executable ||= which('phantomjs')
+        executable = Phantomjs.path if executable.blank? && defined?(::Phantomjs)
+        if executable.blank?
+          STDOUT.print("Could not find PhantomJS. Install phantomjs or try the phantomjs gem.")
+          exit(1)
+        end
+        executable
       end
 
       def script
-        File.expand_path("../phantomjs/runner.coffee", __FILE__)
+        File.expand_path("../phantomjs/runner.js", __FILE__)
       end
     end
   end

data/lib/teaspoon/engine.rb

@@ -1,3 +1,5 @@
+require File.expand_path(__FILE__, '../../../app/controllers/teaspoon/spec_controller')
+
 module Teaspoon
   class Engine < ::Rails::Engine
 
@@ -7,6 +9,9 @@ module Teaspoon
       # default the root if it's not set
       Teaspoon.configuration.root ||= app.root
 
+      # set proper root url
+      Teaspoon.configuration.context ||= app.config.relative_url_root
+
       # append the asset paths from the configuration
       Teaspoon.configuration.asset_paths.each do |path|
         app.config.assets.paths << Teaspoon.configuration.root.join(path).to_s

data/lib/teaspoon/environment.rb

@@ -4,10 +4,8 @@ module Teaspoon
   module Environment
 
     def self.load(options = {})
-      unless rails_loaded?
-        require_environment(options[:environment])
-        raise "Rails environment not found." unless rails_loaded?
-      end
+      require_environment(options[:environment])
+      raise "Rails environment not found." unless rails_loaded?
 
       require "teaspoon"
       require "teaspoon/suite"

data/lib/teaspoon/formatters/base_formatter.rb

@@ -1,13 +1,15 @@
 module Teaspoon
   module Formatters
 
-    autoload :DotFormatter,           'teaspoon/formatters/dot_formatter'
     autoload :CleanFormatter,         'teaspoon/formatters/clean_formatter'
-    autoload :TapYFormatter,          'teaspoon/formatters/tap_y_formatter'
-    autoload :TapFormatter,           'teaspoon/formatters/tap_formatter'
+    autoload :DotFormatter,           'teaspoon/formatters/dot_formatter'
+    autoload :JunitFormatter,         'teaspoon/formatters/junit_formatter'
+    autoload :PrideFormatter,         'teaspoon/formatters/pride_formatter'
+    autoload :SnowdayFormatter,       'teaspoon/formatters/snowday_formatter'
     autoload :SwayzeOrOprahFormatter, 'teaspoon/formatters/swayze_or_oprah_formatter'
+    autoload :TapFormatter,           'teaspoon/formatters/tap_formatter'
+    autoload :TapYFormatter,          'teaspoon/formatters/tap_y_formatter'
     autoload :TeamcityFormatter,      'teaspoon/formatters/teamcity_formatter'
-    autoload :JunitFormatter,         'teaspoon/formatters/junit_formatter'
 
     class BaseFormatter
 
@@ -52,8 +54,9 @@ module Teaspoon
       private
 
       def log_coverage(data)
-        return if data.blank? || suppress_logs?
-        STDOUT.print(Teaspoon::Coverage.new(data).reports)
+        return if data.blank?
+        report_output = Teaspoon::Coverage.new(data, @suite_name).reports
+        STDOUT.print(report_output) unless suppress_logs?
       end
     end
   end