teabag 0.3.5 → 0.3.6

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

@@ -1,58 +1,74 @@
 class Teabag.Reporters.Console
 
   constructor: ->
-    @start = new Teabag.Date().getTime()
+    @start = new Teabag.Date()
+    @suites = {}
+
+
+  reportRunnerStarting: (runner) ->
+    @log
+      type:  "runner"
+      total: runner.total || runner.specs().length
+      start: JSON.parse(JSON.stringify(@start))
+
+
+  reportSuites: ->
+    for suite, index in @spec.getParents()
+      continue if @suites[suite.fullDescription]
+      @suites[suite.fullDescription] = true
+      @log
+        type:  "suite"
+        label: suite.description
+        level: index
 
 
   reportSpecResults: (spec) ->
-    @spec = new Teabag.Reporters.NormalizedSpec(spec)
+    @spec = new Teabag.Spec(spec)
     result = @spec.result()
+    @reportSuites()
     switch result.status
       when "pending" then @trackPending()
       when "failed" then @trackFailure()
       else
         @log
-          type:             "spec"
-          suite:            @spec.suiteName
-          spec:             @spec.description
-          status:           result.status
-          skipped:          result.skipped
-          full_description: @spec.fullDescription
+          type:    "spec"
+          suite:   @spec.suiteName
+          label:   @spec.description
+          status:  result.status
+          skipped: result.skipped
 
 
   trackPending: ->
     result = @spec.result()
     @log
-      type:             "spec"
-      suite:            @spec.suiteName
-      spec:             @spec.description
-      status:           result.status
-      skipped:          result.skipped
-      full_description: @spec.fullDescription
+      type:    "spec"
+      suite:   @spec.suiteName
+      label:   @spec.description
+      status:  result.status
+      skipped: result.skipped
 
 
   trackFailure: ->
     result = @spec.result()
     for error in @spec.errors()
       @log
-        type:             "spec"
-        suite:            @spec.suiteName
-        spec:             @spec.description
-        status:           result.status
-        skipped:          result.skipped
-        full_description: @spec.fullDescription
-        link:             @spec.link
-        message:          error.message
-        trace:            error.stack || error.message || "Stack Trace Unavailable"
+        type:    "spec"
+        suite:   @spec.suiteName
+        label:   @spec.description
+        status:  result.status
+        skipped: result.skipped
+        link:    @spec.link
+        message: error.message
+        trace:   error.stack || error.message || "Stack Trace Unavailable"
 
 
   reportRunnerResults: =>
     @log
-      type:     "results"
-      elapsed:  ((new Teabag.Date().getTime() - @start) / 1000).toFixed(5)
+      type:    "result"
+      elapsed: ((new Teabag.Date().getTime() - @start.getTime()) / 1000).toFixed(5)
     Teabag.finished = true
 
 
   log: (obj = {}) ->
     obj["_teabag"] = true
-    Teabag.console.log(JSON.stringify(obj))
+    Teabag.log(JSON.stringify(obj))

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

@@ -1,3 +1,4 @@
+#= require teabag/base/reporters/html/base_view
 #= require_self
 #= require teabag/base/reporters/html/progress_view
 #= require teabag/base/reporters/html/spec_view
@@ -78,7 +79,7 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.BaseView
 
 
   reportSpecStarting: (spec) ->
-    spec = new Teabag.Reporters.NormalizedSpec(spec)
+    spec = new Teabag.Spec(spec)
     @reportView = new Teabag.Reporters.HTML.SpecView(spec, @) if @config["build-full-report"]
     @specStart = new Teabag.Date().getTime()
 
@@ -112,7 +113,7 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.BaseView
 
 
   updateStatus: (spec) ->
-    spec = new Teabag.Reporters.NormalizedSpec(spec)
+    spec = new Teabag.Spec(spec)
     result = spec.result()
 
     if result.skipped || result.status == "pending"
@@ -174,4 +175,4 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.BaseView
     else
       date = new Teabag.Date()
       date.setDate(date.getDate() + 365)
-      document.cookie = "#{name}=#{escape(JSON.stringify(value))}; path=/; expires=#{date.toUTCString()};"
+      document.cookie = "#{name}=#{escape(JSON.stringify(value))}; path=\"/\"; expires=#{date.toUTCString()};"

data/app/assets/javascripts/teabag/base/reporters/html/base_view.coffee

@@ -0,0 +1,49 @@
+class Teabag.Reporters.BaseView
+
+  constructor: ->
+    @elements = {}
+    @build()
+
+
+  build: (className) ->
+    @el = @createEl("li", className)
+
+
+  appendTo: (el) ->
+    el.appendChild(@el)
+
+
+  append: (el) ->
+    @el.appendChild(el)
+
+
+  createEl: (type, className = "") ->
+    el = document.createElement(type)
+    el.className = className
+    el
+
+
+  findEl: (id) ->
+    @elements ||= {}
+    @elements[id] ||= document.getElementById("teabag-#{id}")
+
+
+  setText: (id, value) ->
+    el = @findEl(id)
+    el.innerHTML = value
+
+
+  setHtml: (id, value, add = false) ->
+    el = @findEl(id)
+    if add then el.innerHTML += value else el.innerHTML = value
+
+
+  setClass: (id, value) ->
+    el = @findEl(id)
+    el.className = value
+
+
+  htmlSafe: (str) ->
+    el = document.createElement("div")
+    el.appendChild(document.createTextNode(str))
+    el.innerHTML

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

@@ -6,7 +6,7 @@ class Teabag.Reporters.HTML.SuiteView extends Teabag.Reporters.BaseView
     @views = @reporter.views
     @suite.viewId = viewId += 1
     @views.suites[@suite.viewId] = @
-    @suite = new Teabag.Reporters.NormalizedSuite(suite)
+    @suite = new Teabag.Suite(suite)
     super
 
 

data/app/assets/javascripts/teabag/base/runner.coffee

@@ -18,5 +18,15 @@ class Teabag.Runner
     params
 
 
+  getReporter: ->
+    if @params["reporter"]
+      Teabag.Reporters[@params["reporter"]]
+    else
+      if window.navigator.userAgent.match(/PhantomJS/)
+        Teabag.Reporters.Console
+      else
+        Teabag.Reporters.HTML
+
+
   setup: ->
     # left for subclasses to implement

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

@@ -1,6 +1,7 @@
 #= require_self
 #= require teabag/base/runner
-#= require teabag/base/reporters
+#= require teabag/base/reporters/html
+#= require teabag/base/reporters/console
 
 class @Teabag
   @defer       : false
@@ -11,9 +12,22 @@ class @Teabag
   @Date        : Date
   @location    : window.location
   @console     : window.console
+  @messages    : []
 
   @execute: ->
     if @defer
       @defer = false
       return
     new Teabag.Runner()
+
+
+  # logging methods -- used by selenium / phantomJS to get information back to ruby
+  @log: ->
+    @messages.push(arguments[0])
+    @console.log(arguments...)
+
+
+  @getMessages: ->
+    messages = @messages
+    @messages = []
+    messages

data/app/assets/javascripts/teabag/jasmine.coffee

@@ -1,6 +1,6 @@
 #= require jasmine-1.3.0
 #= require teabag/base/teabag
-#= require_tree ./jasmine/reporters
+#= require teabag/jasmine/reporters/html
 
 class Teabag.Runner extends Teabag.Runner
 
@@ -19,10 +19,7 @@ class Teabag.Runner extends Teabag.Runner
       env.specFilter = (spec) -> return spec.getFullName().indexOf(grep) == 0
 
     # add the reporter and set the filter
-    if navigator.userAgent.match(/PhantomJS/)
-      reporter = new Teabag.Reporters.Console()
-    else
-      reporter = new Teabag.Reporters.HTML()
+    reporter = new (@getReporter())()
     reporter.setFilter?(@params["grep"])
     env.addReporter(reporter)
 
@@ -36,3 +33,54 @@ class Teabag.Runner extends Teabag.Runner
     jasmine.getFixtures().fixturesPath = @fixturePath
     jasmine.getStyleFixtures().fixturesPath = @fixturePath
     jasmine.getJSONFixtures().fixturesPath = @fixturePath
+
+
+
+class Teabag.Spec
+
+  constructor: (@spec) ->
+    @fullDescription = @spec.getFullName()
+    @description = @spec.description
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = @spec.suite
+    @suiteName = @parent.getFullName()
+    @viewId = @spec.viewId
+    @pending = @spec.pending
+
+
+  errors: ->
+    return [] unless @spec.results
+    for item in @spec.results().getItems()
+      continue if item.passed()
+      {message: item.message, stack: item.trace.stack}
+
+
+  getParents: ->
+    return @parents if @parents
+    @parents ||= []
+    parent = @parent
+    while parent
+      parent = new Teabag.Suite(parent)
+      @parents.unshift(parent)
+      parent = parent.parent
+    @parents
+
+
+  result: ->
+    results = @spec.results()
+    status = "failed"
+    status = "passed" if results.passed()
+    status = "pending" if @spec.pending
+    status: status
+    skipped: results.skipped
+
+
+
+class Teabag.Suite
+
+  constructor: (@suite) ->
+    @fullDescription = @suite.getFullName()
+    @description = @suite.description
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = @suite.parentSuite
+    @viewId = @suite.viewId

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

@@ -1,6 +1,7 @@
 #= require mocha-1.7.3
 #= require teabag/base/teabag
-#= require_tree ./mocha/reporters
+#= require teabag/mocha/reporters/console
+#= require teabag/mocha/reporters/html
 
 class Teabag.Runner extends Teabag.Runner
 
@@ -13,9 +14,54 @@ class Teabag.Runner extends Teabag.Runner
 
   setup: ->
     # add the reporter and set the filter
-    if navigator.userAgent.match(/PhantomJS/)
-      reporter = Teabag.Reporters.Console
-    else
-      reporter = Teabag.Reporters.HTML
+    reporter = @getReporter()
     reporter.filter = @params["grep"]
     env.setup(reporter: reporter)
+
+
+
+class Teabag.Spec
+
+  constructor: (@spec) ->
+    @fullDescription = @spec.fullTitle()
+    @description = @spec.title
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = @spec.parent
+    @suiteName = @parent.fullTitle()
+    @viewId = @spec.viewId
+    @pending = @spec.pending
+
+
+  errors: ->
+    return [] unless @spec.err
+    [@spec.err]
+
+
+  getParents: ->
+    return @parents if @parents
+    @parents ||= []
+    parent = @parent
+    while parent
+      parent = new Teabag.Suite(parent)
+      @parents.unshift(parent)
+      parent = parent.parent
+    @parents
+
+
+  result: ->
+    status = "failed"
+    status = "passed" if @spec.state == "passed" || @spec.state == "skipped"
+    status = "pending" if @spec.pending
+    status: status
+    skipped: @spec.state == "skipped"
+
+
+
+class Teabag.Suite
+
+  constructor: (@suite) ->
+    @fullDescription = @suite.fullTitle()
+    @description = @suite.title
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = if @suite.parent.root then null else @suite.parent
+    @viewId = @suite.viewId

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

@@ -2,13 +2,14 @@ class Teabag.Reporters.Console extends Teabag.Reporters.Console
 
   constructor: (runner) ->
     super
+    @reportRunnerStarting(runner)
     runner.on("fail", @reportSpecResults)
     runner.on("test end", @reportSpecResults)
     runner.on("end", @reportRunnerResults)
 
 
-  reportSpecResults: (@spec, err) =>
+  reportSpecResults: (spec, err) =>
     if err
-      @spec.err = err
+      spec.err = err
       return
     super

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

@@ -0,0 +1,61 @@
+#= require qunit-1.10.0
+#= require teabag/base/teabag
+#= require teabag/qunit/reporters/console
+#= require teabag/qunit/reporters/html
+
+class Teabag.Runner extends Teabag.Runner
+
+  env = QUnit
+  env.config.autostart = false
+  env.config.altertitle = false
+
+  constructor: ->
+    super
+    env.start()
+
+
+  setup: ->
+    reporter = new (@getReporter())(env)
+    reporter.setFilter?(@params["grep"])
+
+
+
+class Teabag.Spec
+
+  constructor: (@spec) ->
+    @fullDescription = "#{@spec.module} #{@spec.name}"
+    @description = "#{@spec.name} (#{@spec.failed}, #{@spec.passed}, #{@spec.total})"
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = if @spec.module then new Teabag.Suite({description: @spec.module}) else null
+    @suiteName = @spec.module
+    @viewId = @spec.viewId
+    @pending = false
+
+
+  errors: ->
+    return [] unless @spec.failed
+    for item in @spec.assertions
+      continue if item.result
+      {message: item.message, stack: item.source}
+
+
+  getParents: ->
+    return [] unless @parent
+    [@parent]
+
+
+  result: ->
+    status = "failed"
+    status = "passed" unless @spec.failed
+    status: status
+    skipped: false
+
+
+
+class Teabag.Suite
+
+  constructor: (@suite) ->
+    @fullDescription = @suite.description
+    @description = @suite.description
+    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @parent = null