teabag 0.3.5 → 0.3.6

data/app/assets/javascripts/teabag/qunit/reporters/console.coffee

@@ -0,0 +1,25 @@
+class Teabag.Reporters.Console extends Teabag.Reporters.Console
+
+  constructor: (env) ->
+    super
+    env.log(@reportSpecResults)
+    env.testDone(@reportSpecResults)
+    env.done(@reportRunnerResults)
+    @reportRunnerStarting()
+
+
+  reportRunnerStarting: ->
+    @currentAssertions = []
+    @log
+      type:  "runner"
+      total: null
+      start: JSON.parse(JSON.stringify(@start))
+
+
+  reportSpecResults: (result) =>
+    unless typeof(result.total) == "number"
+      @currentAssertions.push(result)
+      return
+    result.assertions = @currentAssertions
+    @currentAssertions = []
+    super(result)

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

@@ -0,0 +1,80 @@
+class Teabag.Reporters.HTML extends Teabag.Reporters.HTML
+
+  constructor: (env) ->
+    super
+    env.log(@reportSpecResults)
+    env.testDone(@reportSpecResults)
+    env.done(@reportRunnerResults)
+    @currentAssertions = []
+    @reportRunnerStarting()
+
+
+  reportRunnerStarting: ->
+    @total.exist = null
+    @setText("stats-duration", "...")
+
+
+  reportSpecResults: (spec) =>
+    unless typeof(spec.total) == "number"
+      @currentAssertions.push(spec)
+      return
+    spec.assertions = @currentAssertions
+    @currentAssertions = []
+    @reportSpecStarting(spec)
+    super(spec)
+
+
+  reportRunnerResults: (result) =>
+    @total.exist = @total.run = result.total
+    super
+
+
+  readConfig: ->
+    super
+    QUnit.config.notrycatch = @config["use-catch"]
+
+
+  envInfo: ->
+    "qunit 1.10.0"
+
+
+
+class Teabag.Reporters.HTML.SpecView extends Teabag.Reporters.HTML.SpecView
+
+  buildErrors: ->
+    div = @createEl("div")
+    html = ""
+    for error in @spec.errors()
+      html += """<strong>#{error.message}</strong><br/>#{@htmlSafe(error.stack || "Stack trace unavailable")}<br/>"""
+    div.innerHTML = html
+    @append(div)
+
+
+  buildParent: ->
+    parent = @spec.parent
+    return @reporter unless parent
+    if @views.suites[parent.description]
+      @views.suites[parent.description]
+    else
+      view = new Teabag.Reporters.HTML.SuiteView(parent, @reporter)
+      @views.suites[parent.description] = view
+
+
+
+class Teabag.Reporters.HTML.FailureView extends Teabag.Reporters.HTML.FailureView
+
+  build: ->
+    super("spec")
+    html = """<h1 class="teabag-clearfix"><a href="#{@spec.link}">#{@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
+
+
+
+class Teabag.Reporters.HTML.SuiteView extends Teabag.Reporters.HTML.SuiteView
+
+  constructor: (@suite, @reporter) ->
+    @views = @reporter.views
+    @views.suites[@suite.description] = @
+    @build()

data/app/helpers/teabag/spec_helper.rb

@@ -1,19 +1,11 @@
 module Teabag::SpecHelper
-  def javascript_include_tag_for_teabag(*sources)
-    options = sources.extract_options!
-    debug   = options.key?(:debug)  ? options.delete(:debug)  : debug_assets?
-    body    = options.key?(:body)   ? options.delete(:body)   : false
-    digest  = options.key?(:digest) ? options.delete(:digest) : digest_assets?
 
-    foo = sources.collect do |source|
-      if asset = asset_paths.asset_for(source, 'js')
-        asset.to_a.map { |dep|
-          javascript_include_tag(dep.pathname.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
-        }
-      else
-        javascript_include_tag(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
+  def javascript_include_tag_for_teabag(*sources)
+    sources.collect do |source|
+      asset = asset_paths.asset_for(source, "js")
+      asset.to_a.map do |dep|
+        javascript_include_tag(dep.pathname.to_s, src: path_to_asset(dep, ext: "js", body: true))
       end
-    end
-    foo.flatten.uniq.join("\n").html_safe
+    end.flatten.uniq.join("\n").html_safe
   end
 end

data/lib/generators/teabag/install/templates/initializer.rb

@@ -58,7 +58,8 @@ Teabag.setup do |config|
   #end
 
   # When Teabag is run from the command line these configuration directives apply.
-  #config.formatters = "progress"
+  #config.driver = "phantomjs" # or selenium
+  #config.formatters = "dot" # or tap_y, swayze_or_oprah
   #config.server_timeout = 20
   #config.fail_fast = true
   #config.suppress_log = false

data/lib/teabag/configuration.rb

@@ -5,16 +5,26 @@ module Teabag
 
     include Singleton
 
-    cattr_accessor :root, :mount_at, :asset_paths, :fixture_path, :formatters, :server_timeout, :fail_fast, :suppress_log, :suites
+    cattr_accessor :root,
+                   :mount_at,
+                   :asset_paths,
+                   :fixture_path,
+                   :driver,
+                   :formatters,
+                   :server_timeout,
+                   :fail_fast,
+                   :suppress_log,
+                   :suites
 
     @@mount_at          = "/teabag"
     @@root              = nil # will default to Rails.root if left unset
-    @@asset_paths       = ["spec/javascripts", "spec/javascripts/stylesheets"]
+    @@asset_paths       = ["spec/javascripts", "spec/javascripts/stylesheets", "test/javascripts", "test/javascripts/stylesheets"]
     @@fixture_path      = "spec/javascripts/fixtures"
     @@suites            = {}
 
     # console runner specific
-    @@formatters        = "progress"
+    @@driver            = "phantomjs"
+    @@formatters        = "dot"
     @@server_timeout    = 20
     @@fail_fast         = true
     @@suppress_log      = false
@@ -44,6 +54,7 @@ module Teabag
   end
 
   autoload :Formatters, "teabag/formatters/base_formatter"
+  autoload :Drivers,    "teabag/drivers/base_driver"
 
   mattr_accessor :configuration
   @@configuration = Configuration
@@ -60,7 +71,7 @@ module Teabag
       next unless ENV[directive].present?
       @@configuration.send("#{directive.downcase}=", ENV[directive] == "true")
     end
-    %w(FORMATTERS).each do |directive|
+    %w(FORMATTERS DRIVER).each do |directive|
       next unless ENV[directive].present?
       @@configuration.send("#{directive.downcase}=", ENV[directive])
     end

data/lib/teabag/console.rb

@@ -1,6 +1,4 @@
 require "teabag/server"
-require "teabag/runner"
-require "phantomjs"
 
 module Teabag
   class Console
@@ -17,11 +15,11 @@ module Teabag
     end
 
     def execute
-      STDOUT.print "Starting server...\n"
+      STDOUT.print "Starting server...\n" unless Teabag.configuration.suppress_log
       start_server
       failure_count = 0
       @suites.each do |suite|
-        STDOUT.print "Teabag running #{suite} suite at #{url(suite)}...\n"
+        STDOUT.print "Teabag running #{suite} suite at #{url(suite)}...\n" unless Teabag.configuration.suppress_log
         failure_count += run_specs(suite)
       end
       failure_count > 0
@@ -37,17 +35,13 @@ module Teabag
     end
 
     def run_specs(suite)
-      runner = Teabag::Runner.new(suite)
-      Phantomjs.run(script, url(suite)) do |line|
-        runner.process(line)
-      end
-      runner.failure_count
+      driver.run_specs(suite, url(suite))
     end
 
     protected
 
-    def script
-      File.expand_path("../phantomjs/runner.coffee", __FILE__)
+    def driver
+      @driver ||= Teabag::Drivers.const_get("#{Teabag.configuration.driver.to_s.camelize}Driver").new
     end
 
     def url(suite)

data/lib/teabag/drivers/base_driver.rb

@@ -0,0 +1,10 @@
+module Teabag
+  module Drivers
+
+    autoload :PhantomjsDriver, 'teabag/drivers/phantomjs_driver'
+    autoload :SeleniumDriver,  'teabag/drivers/selenium_driver'
+
+    class BaseDriver
+    end
+  end
+end

data/lib/teabag/drivers/phantomjs_driver.rb

@@ -0,0 +1,25 @@
+require "phantomjs"
+require "teabag/runner"
+
+module Teabag
+  module Drivers
+    class PhantomjsDriver < BaseDriver
+
+      def run_specs(suite, url)
+        runner = Teabag::Runner.new(suite)
+
+        Phantomjs.run(script, url) do |line|
+          runner.process(line)
+        end
+
+        runner.failure_count
+      end
+
+      protected
+
+      def script
+        File.expand_path("../phantomjs/runner.coffee", __FILE__)
+      end
+    end
+  end
+end

data/lib/teabag/drivers/selenium_driver.rb

@@ -0,0 +1,29 @@
+require "selenium-webdriver"
+require "teabag/runner"
+
+module Teabag
+  module Drivers
+    class SeleniumDriver < BaseDriver
+
+      def run_specs(suite, url)
+        runner = Teabag::Runner.new(suite)
+
+        driver = Selenium::WebDriver.for(:firefox)
+        driver.navigate.to("#{url}?reporter=Console")
+
+        Selenium::WebDriver::Wait.new(timeout: 180, interval: 0.01, message: "Timed out").until do
+          done = driver.execute_script("return window.Teabag && window.Teabag.finished")
+          driver.execute_script("return Teabag.getMessages()").each do |line|
+            runner.process("#{line}\n")
+          end
+          done
+        end
+
+        runner.failure_count
+      ensure
+        driver.quit
+      end
+    end
+  end
+end
+

data/lib/teabag/formatters/base_formatter.rb

@@ -1,14 +1,16 @@
 module Teabag
   module Formatters
 
-    autoload :ProgressFormatter,      'teabag/formatters/progress_formatter'
+    autoload :DotFormatter,           'teabag/formatters/dot_formatter'
+    autoload :TapYFormatter,          'teabag/formatters/tap_y_formatter'
     autoload :SwayzeOrOprahFormatter, 'teabag/formatters/swayze_or_oprah_formatter'
 
     class BaseFormatter
 
       attr_accessor :total, :passes, :pendings, :failures, :errors
 
-      def initialize
+      def initialize(suite_name = :default)
+        @suite_name = suite_name.to_s
         @total    = 0
         @passes   = []
         @pendings = []

data/lib/teabag/formatters/{progress_formatter.rb → dot_formatter.rb}

@@ -2,7 +2,7 @@ require 'teabag/formatters/base_formatter'
 
 module Teabag
   module Formatters
-    class ProgressFormatter < BaseFormatter
+    class DotFormatter < BaseFormatter
 
       RED = 31
       GREEN = 32
@@ -29,7 +29,7 @@ module Teabag
         log "\n"
       end
 
-      def results(results)
+      def result(results)
         log "\n\n"
         pending_log if pendings.size > 0
         failure_log if failures.size > 0
@@ -59,7 +59,7 @@ module Teabag
       def failure_log
         log "Failures:\n"
         failures.each_with_index do |failure, index|
-          log "\n  #{index + 1}) #{failure.full_description}\n"
+          log "\n  #{index + 1}) #{failure.description}\n"
           log "     Failure/Error: #{failure.message}\n", RED
         end
         log "\n"
@@ -68,7 +68,7 @@ module Teabag
       def failed_examples
         log "\nFailed examples:\n"
         failures.each do |failure|
-          log "\n#{Teabag.configuration.mount_at}/#{failure.teabag_suite}#{failure.link}", RED
+          log "\n#{Teabag.configuration.mount_at}/#{@suite_name}#{failure.link}", RED
         end
         log "\n\n"
       end
@@ -76,7 +76,7 @@ module Teabag
       def pending_log
         log "Pending:"
         pendings.each do |result|
-          log "\n  #{result.full_description}\n", YELLOW
+          log "\n  #{result.description}\n", YELLOW
           log "    # Not yet implemented\n", CYAN
         end
         log "\n"

data/lib/teabag/formatters/swayze_or_oprah_formatter.rb

@@ -2,7 +2,7 @@ module Teabag
   module Formatters
     class SwayzeOrOprahFormatter < BaseFormatter
 
-      def results(results)
+      def result(results)
         quote = QUOTES[Random.rand(QUOTES.size)]
         STDOUT.print("\n#{quote.inspect} -- Oprah Winfrey or Patrick Swayze?\n")
       end

data/lib/teabag/formatters/tap_y_formatter.rb

@@ -0,0 +1,85 @@
+require 'teabag/formatters/base_formatter'
+require 'yaml'
+
+module Teabag
+  module Formatters
+    class TapYFormatter < BaseFormatter
+
+      def runner(result)
+        log "type"  => "suite",
+            "start" => result.start,
+            "count" => result.total,
+            "seed"  => 0,
+            "rev"   => 4
+      end
+
+      def suite(result)
+        log "type"  => "case",
+            "label" => result.label,
+            "level" => result.level
+      end
+
+      def spec(result)
+        super
+        @result = result
+        return passing_spec if result.passing?
+        return pending_spec if result.pending?
+        failing_spec
+      end
+
+      def result(result)
+        log "type" => "final",
+            "time" => result.elapsed,
+            "counts" => {
+              "total" => @total,
+              "pass"  => @passes.size,
+              "fail"  => @failures.size,
+              "error" => @errors.size,
+              "omit"  => 0,
+              "todo"  => @pendings.size
+            }
+      end
+
+      def error(error)
+        @errors << error
+      end
+
+      private
+
+      def passing_spec
+        log "type"   => "test",
+            "status" => "pass",
+            "label"  => @result.label
+      end
+
+      def pending_spec
+        log "type"   => "test",
+            "status" => "pending",
+            "label"  => @result.label,
+            "exception" => {
+              "message"   => @result.message
+            }
+      end
+
+      def failing_spec
+        log "type"   => "test",
+            "status" => "fail",
+            "label"  => @result.label,
+            "exception" => {
+              "message"   => @result.message,
+              "backtrace" => ["#{@result.link}#:0"],
+              "file"      => "unknown",
+              "line"      => "unknown",
+              "source"    => "unknown",
+              "snippet"   => {"0" => @result.link},
+              "class"     => "Unknown"
+            }
+      end
+
+      def log(hash)
+        STDOUT.print(hash.to_yaml)
+      end
+
+    end
+  end
+end