teaspoon 0.7.9 → 0.8.0

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

@@ -9,7 +9,6 @@
       this.input = $u("#teaspoon-filter-input")[0];
       this.input.value = "";
       this.input.onkeyup = this.filter;
-      this.input.focus();
     }
 
     TeaspoonInterface.prototype.filter = function() {

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

@@ -1,8 +1,10 @@
-#= require angular-scenario-1.0.5
 #= require teaspoon/base/teaspoon
 #= require teaspoon/angular/reporters/console
 #= require teaspoon/angular/reporters/html
 
+unless angular?.scenario
+  throw new Teaspoon.Error('Angular Scenario not found -- use `suite.use_framework :angular` and adjust or remove the `suite.javascripts` directive.')
+
 class Teaspoon.Runner extends Teaspoon.Runner
 
   setup: ->

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

@@ -0,0 +1,21 @@
+Teaspoon.hook = (name, options = {}) ->
+
+  xhr = null
+
+  xhrRequest = (url, options, callback) ->
+    if window.XMLHttpRequest # Mozilla, Safari, ...
+      xhr = new XMLHttpRequest()
+    else if window.ActiveXObject # IE
+      try xhr = new ActiveXObject("Msxml2.XMLHTTP")
+      catch e
+        try xhr = new ActiveXObject("Microsoft.XMLHTTP")
+        catch e
+    throw("Unable to make Ajax Request") unless xhr
+
+    xhr.onreadystatechange = callback
+    xhr.open(options['method'] || "GET", "#{Teaspoon.root}/#{url}", false)
+    xhr.send(options['payload'])
+
+  xhrRequest "#{Teaspoon.suites.active}/#{name}", options, ->
+    return unless xhr.readyState == 4
+    throw("Unable to call hook \"#{url}\".") unless xhr.status == 200

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

@@ -29,8 +29,6 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
     @findEl("suites").innerHTML = @buildSuiteSelect()
     @findEl("suite-select")?.onchange = @changeSuite
 
-    @findEl("root-link").href = Teaspoon.root
-
     @el = @findEl("report-all")
 
     @showConfiguration()
@@ -41,15 +39,19 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
   buildLayout: ->
     el = @createEl("div")
     el.id = "teaspoon-interface"
-    el.innerHTML = Teaspoon.Reporters.HTML.template
+    el.innerHTML = Teaspoon.Reporters.HTML.template()
     document.body.appendChild(el)
 
 
   buildSuiteSelect: ->
     return "" if Teaspoon.suites.all.length == 1
+    filename = ""
+    filename = "/index.html" if /index\.html$/.test(window.location.pathname)
     options = []
     for suite in Teaspoon.suites.all
-      options.push("""<option#{if Teaspoon.suites.active == suite then " selected='selected'" else ""} value="#{suite}">#{suite}</option>""")
+      path = [Teaspoon.root, suite].join("/")
+      selected = if Teaspoon.suites.active == suite then " selected" else ""
+      options.push("""<option#{selected} value="#{path}#{filename}">#{suite}</option>""")
     """<select id="teaspoon-suite-select">#{options.join("")}</select>"""
 
 
@@ -135,13 +137,12 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
 
 
   setFilters: ->
-    link = [Teaspoon.root, Teaspoon.suites.active].join('/')
-    @filters.push("by file: #{Teaspoon.params["file"]} <a href='#{link}'>remove</a>") if Teaspoon.params["file"]
-    @filters.push("by match: #{Teaspoon.params["grep"]} <a href='#{link}'>remove</a>") if Teaspoon.params["grep"]
+    @filters.push("by file: #{Teaspoon.params["file"]}") if Teaspoon.params["file"]
+    @filters.push("by match: #{Teaspoon.params["grep"]}") if Teaspoon.params["grep"]
 
 
   readConfig: ->
-    @config = config if config = @cookie("teaspoon")
+    @config = config if config = @store("teaspoon")
 
 
   toggleConfig: (e) =>
@@ -149,16 +150,20 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
     return unless button.tagName.toLowerCase() == "button"
     name = button.getAttribute("id").replace(/^teaspoon-/, "")
     @config[name] = !@config[name]
-    @cookie("teaspoon", @config)
-    @refresh()
+    @store("teaspoon", @config)
+    Teaspoon.reload()
 
 
-  changeSuite: ->
-    window.location.href = [Teaspoon.root, @options[@options.selectedIndex].value].join('/')
+  changeSuite: (e) =>
+    options = e.target.options
+    window.location.href = options[options.selectedIndex].value
 
 
-  refresh: ->
-    window.location.href = window.location.href
+  store: (name, value) ->
+    if window.localStorage?.setItem?
+      @localstore(name, value)
+    else
+      @cookie(name, value)
 
 
   cookie: (name, value = undefined) ->
@@ -170,3 +175,10 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
       date = new Teaspoon.Date()
       date.setDate(date.getDate() + 365)
       document.cookie = "#{name}=#{escape(JSON.stringify(value))}; expires=#{date.toUTCString()}; path=/;"
+
+
+  localstore: (name, value = undefined) ->
+    if value == undefined
+      JSON.parse(unescape(localStorage.getItem(name)))
+    else
+      localStorage.setItem(name, escape(JSON.stringify(value)))

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

@@ -9,7 +9,7 @@ class Teaspoon.Reporters.HTML.ProgressView extends Teaspoon.Reporters.BaseView
 
 
   build: ->
-    @el = @createEl("div", "teaspoon-indicator modeset-logo")
+    @el = @createEl("div", "teaspoon-indicator teaspoon-logo")
 
 
   update: ->

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

@@ -1,7 +1,7 @@
-Teaspoon.Reporters.HTML.template = """
+Teaspoon.Reporters.HTML.template = -> """
 <div class="teaspoon-clearfix">
   <div id="teaspoon-title">
-    <h1><a href="" id="teaspoon-root-link">Teaspoon</a></h1>
+    <h1><a href="#{Teaspoon.root}" id="teaspoon-root-link">Teaspoon</a></h1>
     <ul>
       <li>version: <b id="teaspoon-version"></b></li>
       <li id="teaspoon-env-info"></li>
@@ -28,7 +28,7 @@ Teaspoon.Reporters.HTML.template = """
 <hr/>
 
 <div id="teaspoon-filter">
-  <h1>Filtering</h1>
+  <h1>Applied Filters [<a href="#{window.location.pathname}" id="teaspoon-filter-clear">remove</a>]</h1>
   <ul id="teaspoon-filter-list"></ul>
 </div>
 

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

@@ -1,13 +1,14 @@
 #= require_self
 #= require teaspoon/base/runner
 #= require teaspoon/base/fixture
+#= require teaspoon/base/hook
 #= require teaspoon/base/reporters/html
 #= require teaspoon/base/reporters/console
 
 class @Teaspoon
   @defer:     false
   @slow:      75
-  @root:      null
+  @root:      window.location.pathname.replace(/\/+(index\.html)?$/, "").replace(/\/[^\/]*$/, "")
   @started:   false
   @finished:  false
   @Reporters: {}
@@ -58,3 +59,11 @@ class @Teaspoon
     messages = Teaspoon.messages
     Teaspoon.messages = []
     messages
+
+
+
+class Teaspoon.Error extends Error
+
+  constructor: (message) ->
+    @name = "TeaspoonError"
+    @message = (message || "")

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

@@ -1,7 +1,9 @@
-#= require jasmine-1.3.1
 #= require teaspoon/base/teaspoon
 #= require teaspoon/jasmine/reporters/html
 
+unless jasmine?
+  throw new Teaspoon.Error('Jasmine not found -- use `suite.use_framework :jasmine` and adjust or remove the `suite.javascripts` directive.')
+
 class Teaspoon.Runner extends Teaspoon.Runner
 
   constructor: ->

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

@@ -1,8 +1,10 @@
-#= require mocha-1.10.0
 #= require teaspoon/base/teaspoon
 #= require teaspoon/mocha/reporters/console
 #= require teaspoon/mocha/reporters/html
 
+unless mocha?
+  throw new Teaspoon.Error('Mocha not found -- use `suite.use_framework :mocha` and adjust or remove the `suite.javascripts` directive.')
+
 class Teaspoon.Runner extends Teaspoon.Runner
 
   constructor: ->

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

@@ -18,7 +18,7 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.HTML
 
 
   envInfo: ->
-    "mocha 1.9.1"
+    "mocha #{_mocha_version || "[unknown version]"}"
 
 
 class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.HTML.SpecView

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

@@ -1,8 +1,10 @@
-#= require qunit-1.12.0
 #= require teaspoon/base/teaspoon
 #= require teaspoon/qunit/reporters/console
 #= require teaspoon/qunit/reporters/html
 
+unless QUnit?
+  throw new Teaspoon.Error('QUnit not found -- use `suite.use_framework :qunit` and adjust or remove the `suite.javascripts` directive.')
+
 class Teaspoon.Runner extends Teaspoon.Runner
 
   constructor: ->

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

@@ -35,7 +35,7 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.HTML
 
 
   envInfo: ->
-    "qunit 1.11.0"
+    "qunit #{_qunit_version || "[unknown version]"}"
 
 
 

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

@@ -5,7 +5,6 @@ class TeaspoonInterface
     @input = $u("#teaspoon-filter-input")[0]
     @input.value = ""
     @input.onkeyup = @filter
-    @input.focus()
 
 
   filter: =>

data/app/assets/stylesheets/teaspoon.css

@@ -78,7 +78,7 @@ html[xmlns] #teaspoon-interface .teaspoon-clearfix {
   background-color: #18c2e8;
 }
 
-#teaspoon-progress .modeset-logo {
+#teaspoon-progress .teaspoon-logo {
   width: 86px;
   height: 86px;
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAGFBMVEUAAADw7urz8u3y8ezz8u3z8u3z8u308+5JPTlvAAAAB3RSTlMAHt9DlG6+wwFeZgAAAtRJREFUeNrt2etyozAMBWAdHUl5/zfeZXMRjgV2TPNnp2c6HQqer4rAxAly+0p+2RlW9RtswL/BQvgF1kXw86zK38Rsw00n2dhYb0BzAgKA9m5TfI512aJZD2UfWtcxnWfxRCHvwR62HDvDCrb2KqUKo2vZkLV8uQY5iDWs6JhVmYk3RdiODa1dzLrZMr5YpYifNXfsZg14sRQ5cBVzrt1LSDb/1vqkzSW2kTs2G8grbYBLy2ZBg4tsMnywzAZViQ9Zf7DIHVXwiZnTQbP8C71tkJbF8jzLQCt2XCzMOLiAx6yW1dxdFKrnbfyst15WE/ctZa2OL7CuIn3uZvFacEs2Z91oKuQYPmpg2dn2nhA9y2M2quNM9uGiUFUG1VY9SnY77HNTIZ7jUfQoFcn/PjVv+Wo5zevDybpITM4wO7/56Jh1qQLISWzMUj4PdyzLuaCyEn2xWs8xW2LtxUbNcollNgHlfQZLLJI1FGzIWqKZDt2l4IustSwvtTbDlhW93tpcfiTBk9ZCu9hrH1tXW7btrr2V0Idatyv27PZzcsa0Zz1q1p+siggp4scr0OhZxmuwl2xs7PYrTt9x2wQPWsaNzU8+FIEefVLys2LbRmD/XnZfh6BEq7ntzEq9LVcfLHM9DUe5ZEFXbG4JWjb2rO1eCcyq+2hGCc95w5a13R1MPBdXrjmsvhSY7dZ/x7xnNU+Ki9C0uodbU+zuP4XY21T3PcvmmwI/vRRstyvifbi3TcgULCu2Hs0HGwR8tFw+ZpVSslPrpOhY3pvgIhdY6+6azM0FtmxuRGgOnGZNii5UwVUWoc9zlBuUj9iQIugiVfyYVVmPJdsF62ycsFxnbyesLaus2OvNtWSL8Oqqpo7i6tKuTiyp4+8YA2tqsnWUH6KIue/GDZ+gPv/cwTiN6kdPScIxNmkLD1/UiBPSY/2ZjoY5CSQH0M30Zx4V6TO/z8v+K/YPUO9s8Zs6f9sAAAAASUVORK5CYII=");
@@ -250,14 +250,21 @@ html[xmlns] #teaspoon-interface .teaspoon-clearfix {
 #teaspoon-filter h1 {
   float: left;
   height: 15px;
-  margin: -11px 15px 0 0;
-  padding: 0 4px;
+  margin: -11px 15px 0 10px;
+  padding: 0 4px 5px;
   background: #f4f3ee;
   text-align: right;
   font-size: 17px;
   font-weight: 200;
   color: #7b4f49;
 }
+#teaspoon-filter h1 a {
+  text-decoration: none;
+  color: #000;
+}
+#teaspoon-filter h1 a:hover {
+  text-decoration: underline;
+}
 #teaspoon-filter ul {
   margin: 0;
   padding: 3px 10px 6px;
@@ -399,7 +406,8 @@ body.teaspoon-passed #teaspoon-progress .teaspoon-indicator {
 #teaspoon-suite-list ul {
   margin: 0 0 20px 0;
   padding: 0 0 0 20px;
-  /*background: rgba(200, 184, 161, 0.1);*/
+  list-style: none;
+  font-weight: 200;
 }
 #teaspoon-suite-list a {
   text-decoration: none;
@@ -414,10 +422,6 @@ body.teaspoon-passed #teaspoon-progress .teaspoon-indicator {
   font-size: 20px;
   border-bottom: 1px dotted #cfc8c4;
 }
-#teaspoon-suite-list h4 {
-  margin: 0;
-  font-weight: 200;
-}
 
 /* Responsive
  *---------------------------------------------------------------------------*/

data/app/controllers/teaspoon/suite_controller.rb

@@ -0,0 +1,32 @@
+class Teaspoon::SuiteController < ActionController::Base
+  helper Teaspoon::SuiteHelper rescue nil
+
+  before_filter :prepend_fixture_paths
+
+  layout false
+
+  def index
+    @suites = Teaspoon::Suite.all
+  end
+
+  def show
+    @suite = Teaspoon::Suite.new(params)
+  end
+
+  def hook
+    Teaspoon::Suite.new(params).hooks[params[:hook].to_s].each { |hook| hook.call }
+    render nothing: true
+  end
+
+  def fixtures
+    render "/#{params[:filename]}"
+  end
+
+  private
+
+  def prepend_fixture_paths
+    Teaspoon.configuration.fixture_paths.each do |path|
+      prepend_view_path Teaspoon.configuration.root.join(path)
+    end
+  end
+end

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

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

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

@@ -0,0 +1,19 @@
+<%
+rails_config = Rails.application.config
+require_options = {baseUrl: rails_config.assets.prefix}
+require_options.merge!(rails_config.requirejs.user_config) if rails_config.respond_to?(:requirejs)
+specs = @suite.spec_assets(false).map{ |s| "#{s.gsub(/\.js.*$/, "")}" }
+%>
+
+<%= javascript_include_tag @suite.helper %>
+<script type="text/javascript">
+  Teaspoon.onWindowLoad(function () {
+    // setup the Teaspoon path prefix to load /assets
+    require.config(<%= require_options.to_json.html_safe %>);
+
+    // require specs by striping off the .js file extension
+    require(<%= specs.to_json.html_safe %>, function() {
+      Teaspoon.execute();
+    });
+  });
+</script>

data/app/views/teaspoon/{spec/suites.html.erb → suite/index.html.erb}

@@ -3,9 +3,8 @@
   <head>
     <title>Teaspoon :: Suites</title>
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <%= csrf_meta_tags %>
-    <%= stylesheet_link_tag_for_teaspoon *(@suites.first.present? ? @suites.first.stylesheets : "teaspoon") %>
-    <%= javascript_include_tag_for_teaspoon "teaspoon-teaspoon" %>
+    <%= stylesheet_link_tag "teaspoon" %>
+    <%= javascript_include_tag "teaspoon-teaspoon" %>
   </head>
   <body>
     <div id="teaspoon-interface">
@@ -17,19 +16,19 @@
             <li><a href="http://github.com/modeset/teaspoon" target="blank">http://github.com/modeset/teaspoon</a></li>
           </ul>
         </div>
-        <div id="teaspoon-progress"><div class="teaspoon-indicator modeset-logo"></div></div>
+        <div id="teaspoon-progress"><div class="teaspoon-indicator teaspoon-logo"></div></div>
       </div>
       <div id="teaspoon-controls" class="teaspoon-clearfix">
-        <input type="text" id="teaspoon-filter-input" placeholder="filter files"/>
+        <input type="text" id="teaspoon-filter-input" placeholder="filter list" autofocus/>
       </div>
       <hr/>
       <ul id="teaspoon-suite-list">
         <% for suite in @suites %>
           <li class="suite">
-            <h1><%= link_to suite.name, suite.link %></h1>
+            <h1><%= link_to suite.name, teaspoon.suite_path(suite.name) %></h1>
             <ul class="file">
               <% for file in suite.spec_files %>
-                <h4><%= link_to file[:name], suite.link(file: file[:path]) %></h4>
+                <li><%= link_to file[:name], teaspoon.suite_path(suite.name, file: file[:path]) %></li>
               <% end %>
             </ul>
           </li>

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

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Teaspoon :: Javascript Test Runner</title>
+    <meta name="viewport" content="width=device-width, user-scalable=no">
+    <%= csrf_meta_tags %>
+
+    <%= stylesheet_link_tag *@suite.stylesheets %>
+    <%= javascript_include_tag *@suite.javascripts %>
+    <script type="text/javascript">
+      Teaspoon.version = <%= Teaspoon::VERSION.to_json.html_safe %>;
+      Teaspoon.suites  = <%= {all: Teaspoon.configuration.suite_configs.keys, active: @suite.name}.to_json.html_safe %>;
+    </script>
+    <%= render @suite.boot_partial %>
+  </head>
+  <body data-no-turbolink>
+    <%= render @suite.body_partial %>
+  </body>
+</html>

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,6 +1,16 @@
 Teaspoon::Engine.routes.draw do
-  get "/fixtures/*filename", to: "spec#fixtures"
-  get "/:suite", to: "spec#runner", defaults: { suite: "default" }
-  post "/:suite/hooks(/:group)", to: "spec#hooks", defaults: { suite: "default", group: "default" }
-  root to: "spec#suites"
+
+  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" }
+
 end