teaspoon 0.7.8 → 0.7.9

data/lib/teaspoon/formatters/dot_formatter.rb

@@ -9,8 +9,9 @@ module Teaspoon
       YELLOW = 33
       CYAN = 36
 
-      def spec(result)
-        super
+      def spec(result, logged = false)
+        super(result)
+        return if logged
         if result.passing?
           log ".", GREEN
         elsif result.pending?

data/lib/teaspoon/formatters/pride_formatter.rb

@@ -0,0 +1,48 @@
+require 'teaspoon/formatters/dot_formatter'
+
+module Teaspoon
+  module Formatters
+    class PrideFormatter < DotFormatter
+      PI_3 = Math::PI / 3
+
+      def initialize(*args)
+        @colors = (0...(6 * 7)).map { |n|
+          n *= 1.0 / 6
+          r  = (3 * Math.sin(n           ) + 3).to_i
+          g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
+          b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
+          36 * r + 6 * g + b + 16
+        }
+        @size = @colors.size
+        @index = 0
+
+        super
+      end
+
+      def spec(result)
+        super(result, true)
+        if result.passing?
+          log_pride ".", next_color
+        elsif result.pending?
+          log "*", YELLOW
+        else
+          log "F", RED
+        end
+      end
+
+      private
+
+      def next_color
+        c = @colors[@index % @size]
+        @index += 1
+        c
+      end
+
+
+      def log_pride(str, color_code)
+        STDOUT.print("\e[38;5;#{color_code}m#{str}\e[0m")
+      end
+
+    end
+  end
+end

data/lib/teaspoon/formatters/snowday_formatter.rb

@@ -0,0 +1,20 @@
+require 'teaspoon/formatters/dot_formatter'
+
+module Teaspoon
+  module Formatters
+    class SnowdayFormatter < DotFormatter
+
+      def spec(result)
+        super(result, true)
+        if result.passing?
+          log "☃", GREEN
+        elsif result.pending?
+          log "☹", YELLOW
+        else
+          log "☠", RED
+        end
+      end
+
+    end
+  end
+end

data/lib/teaspoon/server.rb

@@ -7,7 +7,13 @@ module Teaspoon
 
     def initialize
       @port = find_available_port
-      Thin::Logging.silent = true if defined?(Thin)
+      if defined?(Thin)
+        if Teaspoon.configuration.suppress_log
+          Thin::Logging.silent = true
+        else
+          Thin::Logging.trace = false
+        end
+      end
     end
 
     def start
@@ -22,7 +28,7 @@ module Teaspoon
     end
 
     def wait_until_started
-      Timeout.timeout(Teaspoon.configuration.server_timeout) { @thread.join(0.1) until responsive? }
+      Timeout.timeout(Teaspoon.configuration.server_timeout.to_i) { @thread.join(0.1) until responsive? }
     rescue Timeout::Error
       raise "Server failed to start. You may need to increase the timeout configuration."
     end
@@ -51,7 +57,7 @@ module Teaspoon
         Port: port,
         environment: "test",
         AccessLog: [],
-        Logger: WEBrick::Log::new(nil, 0),
+        Logger: Rails.logger,
         server: Teaspoon.configuration.server
       }
     end

data/lib/teaspoon/suite.rb

@@ -66,8 +66,8 @@ module Teaspoon
     end
 
     def link(params = {})
-      query = "?#{params.to_query}" if params.present?
-      [Teaspoon.configuration.mount_at, name, query].compact.join('/')
+      query = "/?#{params.to_query}" if params.present?
+      "#{Teaspoon.configuration.context}#{Teaspoon.configuration.mount_at}/#{name}#{query}"
     end
 
     def instrument_file?(file)
@@ -130,7 +130,7 @@ module Teaspoon
         filename = filename.gsub(%r(^#{Regexp.escape(path)}[\/|\\]), "")
       end
       raise Teaspoon::AssetNotServable, "#{filename} is not within an asset path" if filename == original
-      filename.gsub(/(\.js\.coffee|\.coffee)$/, ".js")
+      filename.gsub('.erb', '').gsub(/(\.js\.coffee|\.coffee)$/, ".js")
     end
   end
 end

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

data/spec/dummy/config/initializers/teaspoon.rb

@@ -4,7 +4,7 @@ Teaspoon.setup do |config|
   config.asset_paths << Teaspoon::Engine.root.join('lib/teaspoon')
 
   config.suite do |suite|
-    suite.matcher = "{spec/javascripts,spec/dummy/app/assets/javascripts/specs}/**/*_spec.{js,js.coffee,coffee}"
+    suite.matcher = "{spec/javascripts,spec/dummy/app/assets/javascripts/specs}/**/*_spec.{js,js.coffee,coffee,js.coffee.erb}"
     suite.javascripts = ["teaspoon/jasmine"]
   end
 

data/spec/javascripts/teaspoon/base/teaspoon_spec.coffee

@@ -21,14 +21,14 @@ describe "Teaspoon", ->
 
     beforeEach ->
       Teaspoon.defer = false
+      spyOn(Teaspoon, 'reload')
+      @spy = spyOn(Teaspoon, "Runner")
 
     it "allows defering (thus not instantiating the runner)", ->
       Teaspoon.defer = true
-      spy = spyOn(Teaspoon, "Runner")
       Teaspoon.execute()
-      expect(spy).wasNotCalled()
+      expect(@spy).wasNotCalled()
 
     it "will execute if it should", ->
-      spy = spyOn(Teaspoon, "Runner")
       Teaspoon.execute()
-      expect(spy).toHaveBeenCalled()
+      expect(@spy).toHaveBeenCalled()

data/spec/javascripts/teaspoon/other/erb_spec.js.coffee.erb

@@ -0,0 +1,4 @@
+describe "erb", ->
+
+  it "tests", ->
+    expect(true).toBe(true)

data/spec/javascripts/teaspoon/phantomjs/runner_spec.coffee

@@ -5,7 +5,7 @@
 window.phantom = {exit: ->}
 window.require = (file) ->
   switch file
-    when "system" then {args: ["runner.coffee", "http://host:port/path", "200"]}
+    when "system" then {args: ["runner.js", "http://host:port/path", "200"]}
     when "webpage" then create: -> {
       open: -> {}
       evaluate: -> {}

data/spec/teaspoon/configuration_spec.rb

@@ -51,6 +51,7 @@ describe Teaspoon::Configuration do
 
   it "has the default configuration" do
     expect(subject.mount_at).to eq("/teaspoon")
+    expect(subject.context).to eq(nil)
     expect(subject.asset_paths).to include("spec/javascripts")
     expect(subject.asset_paths).to include("spec/javascripts/stylesheets")
     expect(subject.fixture_path).to eq("spec/javascripts/fixtures")
@@ -87,7 +88,7 @@ describe Teaspoon::Configuration::Suite do
 
   it "has the default configuration" do
     subject = Teaspoon::Configuration::Suite.new
-    expect(subject.matcher).to eq("{spec/javascripts,spec/dummy/app/assets/javascripts/specs}/**/*_spec.{js,js.coffee,coffee}")
+    expect(subject.matcher).to eq("{spec/javascripts,spec/dummy/app/assets/javascripts/specs}/**/*_spec.{js,js.coffee,coffee,js.coffee.erb}")
     expect(subject.helper).to eq("spec_helper")
     expect(subject.javascripts).to eq(["teaspoon/jasmine"])
     expect(subject.stylesheets).to eq(["teaspoon"])

data/spec/teaspoon/coverage_spec.rb

@@ -3,7 +3,7 @@ require "teaspoon/coverage"
 
 describe Teaspoon::Coverage do
 
-  subject { Teaspoon::Coverage.new({"foo" => "bar"}) }
+  subject { Teaspoon::Coverage.new({"foo" => "bar"}, "default") }
 
   describe "#reports" do
 

data/spec/teaspoon/drivers/phantomjs_driver_spec.rb

@@ -5,23 +5,37 @@ describe Teaspoon::Drivers::PhantomjsDriver do
 
   describe "#run_specs" do
 
-    before do
-      Phantomjs.stub(:run)
-    end
+    context "with phantomjs" do
+
+      before do
+        subject.stub(:run)
+      end
+
+      it "instantiates the runner" do
+        runner = double(failure_count: nil)
+        Teaspoon::Runner.should_receive(:new).and_return(runner)
+        subject.run_specs(:default, "_url_")
+      end
+
+      it "calls run and logs the results of each line using the formatter" do
+        args = [Teaspoon::Engine.root.join("lib/teaspoon/drivers/phantomjs/runner.js").to_s, "_url_"]
+        Teaspoon::Runner.any_instance.should_receive(:process).with("_line_")
+        @block = nil
+        subject.should_receive(:run).with(*args) { |&b| @block = b }
+        subject.run_specs(:default, "_url_")
+        @block.call("_line_")
+      end
 
-    it "instantiates the formatter" do
-      runner = double(failure_count: nil)
-      Teaspoon::Runner.should_receive(:new).and_return(runner)
-      subject.run_specs(:default, "_url_")
     end
 
-    it "calls phantomjs.run and logs the results of each line using the formatter" do
-      args = [Teaspoon::Engine.root.join("lib/teaspoon/drivers/phantomjs/runner.coffee").to_s, "_url_"]
-      Teaspoon::Runner.any_instance.should_receive(:process).with("_line_")
-      @block = nil
-      Phantomjs.should_receive(:run).with(*args) { |&b| @block = b }
-      subject.run_specs(:default, "_url_")
-      @block.call("_line_")
+    context "without phantomjs" do
+
+      it "tells you that it couldn't find phantomjs and exits" do
+        subject.should_receive(:which).and_return(nil)
+        STDOUT.should_receive(:print).with("Could not find PhantomJS. Install phantomjs or try the phantomjs gem.")
+        expect { subject.run_specs(:default, "_url_") }.to raise_error SystemExit
+      end
+
     end
 
   end

data/spec/teaspoon/environment_spec.rb

@@ -7,16 +7,15 @@ describe Teaspoon::Environment do
 
   describe ".load" do
 
-    it "calls require_environment if Rails isn't available" do
-      subject.should_receive(:rails_loaded?).and_return(false)
+    it "calls require_environment" do
       subject.should_receive(:require_environment)
       subject.should_receive(:rails_loaded?).and_return(true)
       Teaspoon::Environment.load
     end
 
     it "raises if Rails can't be found" do
-      subject.should_receive(:rails_loaded?).twice.and_return(false)
       subject.should_receive(:require_environment)
+      subject.should_receive(:rails_loaded?).and_return(false)
       expect{ Teaspoon::Environment.load }.to raise_error("Rails environment not found.")
     end
 

data/spec/teaspoon/formatters/base_formatter_spec.rb

@@ -22,7 +22,7 @@ describe Teaspoon::Formatters::BaseFormatter do
 
     it "logs the coverage information" do
       double = double(reports: nil)
-      Teaspoon::Coverage.should_receive(:new).with("_data_").and_return(double)
+      Teaspoon::Coverage.should_receive(:new).with("_data_", "default").and_return(double)
       double.should_receive(:reports).and_return("_reports_")
       STDOUT.should_receive(:print).with("_reports_")
       subject.send(:log_coverage, "_data_")
@@ -35,7 +35,8 @@ describe Teaspoon::Formatters::BaseFormatter do
 
     it "doesn't log when suppressing logs" do
       subject.should_receive(:suppress_logs?).and_return(true)
-      Teaspoon::Coverage.should_not_receive(:new)
+      Teaspoon::Coverage.should_receive(:new).and_return(double(reports: nil))
+      STDOUT.should_not_receive(:print)
       subject.send(:log_coverage, "_data_")
     end
 

data/spec/teaspoon/suite_spec.rb

@@ -151,6 +151,11 @@ describe Teaspoon::Suite do
       expect(subject.link(file: ["file1", "file2"], grep: "foo")).to eql("/teaspoon/default/?file%5B%5D=file1&file%5B%5D=file2&grep=foo")
     end
 
+    it "returns a link prefixed by app context if given" do
+      Teaspoon.configuration.stub(:context).and_return('/foo')
+      expect(subject.link).to eql("/foo/teaspoon/default")
+    end
+
   end
 
   describe "#instrument_file?" do

data/vendor/assets/javascripts/support/bind-poly.js

@@ -0,0 +1,23 @@
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      // closest thing possible to the ECMAScript 5 internal IsCallable function
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+    }
+
+    var aArgs = Array.prototype.slice.call(arguments, 1),
+        fToBind = this,
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(this instanceof fNOP && oThis
+              ? this
+              : oThis,
+              aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - jejacks0n
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -32,20 +32,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: phantomjs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.1.1
 description: Run Javascript tests using Jasmine, Mocha or QUnit in the browser or
   headlessly using PhantomJS or with Selenium Webdriver
 email:
@@ -110,7 +96,7 @@ files:
 - lib/teaspoon/console.rb
 - lib/teaspoon/coverage.rb
 - lib/teaspoon/drivers/base_driver.rb
-- lib/teaspoon/drivers/phantomjs/runner.coffee
+- lib/teaspoon/drivers/phantomjs/runner.js
 - lib/teaspoon/drivers/phantomjs_driver.rb
 - lib/teaspoon/drivers/selenium_driver.rb
 - lib/teaspoon/engine.rb
@@ -121,6 +107,8 @@ files:
 - lib/teaspoon/formatters/clean_formatter.rb
 - lib/teaspoon/formatters/dot_formatter.rb
 - lib/teaspoon/formatters/junit_formatter.rb
+- lib/teaspoon/formatters/pride_formatter.rb
+- lib/teaspoon/formatters/snowday_formatter.rb
 - lib/teaspoon/formatters/swayze_or_oprah_formatter.rb
 - lib/teaspoon/formatters/tap_formatter.rb
 - lib/teaspoon/formatters/tap_y_formatter.rb
@@ -141,6 +129,7 @@ files:
 - vendor/assets/javascripts/mocha-1.10.1.MIT.LICENSE
 - vendor/assets/javascripts/qunit-1.12.0.js
 - vendor/assets/javascripts/qunit-1.12.0.MIT.LICENSE
+- vendor/assets/javascripts/support/bind-poly.js
 - vendor/assets/javascripts/support/chai.js
 - vendor/assets/javascripts/support/chai.MIT.LICENSE
 - vendor/assets/javascripts/support/expect.js
@@ -209,6 +198,7 @@ files:
 - spec/javascripts/teaspoon/mocha/reporters/html_mspec.coffee
 - spec/javascripts/teaspoon/mocha/runner_mspec.coffee
 - spec/javascripts/teaspoon/mocha/spec_mspec.coffee
+- spec/javascripts/teaspoon/other/erb_spec.js.coffee.erb
 - spec/javascripts/teaspoon/phantomjs/runner_spec.coffee
 - spec/javascripts/turbolinks_helper.coffee
 - spec/spec_helper.rb
@@ -225,6 +215,7 @@ files:
 - spec/teaspoon/formatters/base_formatter_spec.rb
 - spec/teaspoon/formatters/dot_formatter_spec.rb
 - spec/teaspoon/formatters/junit_formatter_spec.rb
+- spec/teaspoon/formatters/pride_formatter_spec.rb
 - spec/teaspoon/formatters/tap_formatter_spec.rb
 - spec/teaspoon/formatters/tap_y_formatter_spec.rb
 - spec/teaspoon/formatters/teamcity_formatter_spec.rb
@@ -323,6 +314,7 @@ test_files:
 - spec/javascripts/teaspoon/mocha/reporters/html_mspec.coffee
 - spec/javascripts/teaspoon/mocha/runner_mspec.coffee
 - spec/javascripts/teaspoon/mocha/spec_mspec.coffee
+- spec/javascripts/teaspoon/other/erb_spec.js.coffee.erb
 - spec/javascripts/teaspoon/phantomjs/runner_spec.coffee
 - spec/javascripts/turbolinks_helper.coffee
 - spec/spec_helper.rb
@@ -339,6 +331,7 @@ test_files:
 - spec/teaspoon/formatters/base_formatter_spec.rb
 - spec/teaspoon/formatters/dot_formatter_spec.rb
 - spec/teaspoon/formatters/junit_formatter_spec.rb
+- spec/teaspoon/formatters/pride_formatter_spec.rb
 - spec/teaspoon/formatters/tap_formatter_spec.rb
 - spec/teaspoon/formatters/tap_y_formatter_spec.rb
 - spec/teaspoon/formatters/teamcity_formatter_spec.rb

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

@@ -1,68 +0,0 @@
-system  = require "system"
-webpage = require "webpage"
-
-class @Runner
-
-  constructor: ->
-    @url = system.args[1]
-    @timeout = parseInt(system.args[2] || 180) * 1000 # todo: add configuration -- default timeout is 3 minutes
-
-
-  run: ->
-    @initPage()
-    @loadPage()
-
-
-  initPage: ->
-    @page = webpage.create()
-    @page.viewportSize = {width: 800, height: 800}
-
-
-  loadPage: ->
-    @page.open(@url)
-    @page[name] = method for name, method of @pageCallbacks()
-
-
-  waitForResults: =>
-    @fail("Timed out") if (new Date().getTime() - @start) >= @timeout
-    finished = @page.evaluate(-> window.Teaspoon && window.Teaspoon.finished)
-    if finished then @finish() else setTimeout(@waitForResults, 200)
-
-
-  fail: (msg = null, errno = 1) ->
-    console.log("Error: #{msg}") if msg
-    console.log(JSON.stringify(_teaspoon: true, type: "exception"))
-    phantom.exit(errno)
-
-
-  finish: ->
-    console.log(" ")
-    phantom.exit(0)
-
-
-  pageCallbacks: ->
-    onError: (message, trace) =>
-      console.log(JSON.stringify(_teaspoon: true, type: "error", message: message, trace: trace))
-      @errored = true
-
-
-    onConsoleMessage: (msg) =>
-      console.log(msg)
-      clearTimeout(@errorTimeout) if @errorTimeout
-      if @errored
-        @errorTimeout = setTimeout((=> @fail('Javascript error has cause a timeout.')), 1000)
-        @errored = false
-
-
-    onLoadFinished: (status) =>
-      return if @start
-      @start = new Date().getTime()
-      defined = @page.evaluate(-> window.Teaspoon)
-      unless status == "success" && defined
-        @fail("Failed to load: #{@url}")
-        return
-
-      @waitForResults()
-
-
-new Runner().run()