teaspoon 0.8.0 → 0.9.0

data/lib/teaspoon/console.rb

@@ -2,17 +2,22 @@ require "teaspoon/environment"
 
 module Teaspoon
   class Console
-
     def initialize(options = {})
-      @options = options
+      @default_options = options
       @suites = {}
-      Teaspoon::Environment.load(@options)
+      Teaspoon::Environment.load(options)
 
       @server = start_server
     rescue Teaspoon::ServerException => e
       abort(e.message)
     end
 
+    def options
+      @execute_options ||= {}
+      @default_options ||= {}
+      @default_options.merge(@execute_options)
+    end
+
     def failures?
       !execute
     end
@@ -21,17 +26,20 @@ module Teaspoon
       execute_without_handling(options)
     rescue Teaspoon::Failure
       false
+    rescue Teaspoon::RunnerException => e
+      log(e.message)
+      false
     rescue Teaspoon::Error => e
       abort(e.message)
     end
 
-    def execute_without_handling(options = {})
-      @options.merge!(options)
+    def execute_without_handling(execute_options = {})
+      @execute_options = execute_options
       @suites = {}
-      resolve(@options[:files])
+      resolve(options[:files])
 
       0 == suites.inject(0) do |failures, suite|
-        export(suite) if @options.include?(:export)
+        export(suite) if options.include?(:export)
         failures += run_specs(suite)
         log("") # empty line for space
         failures
@@ -39,7 +47,10 @@ module Teaspoon
     end
 
     def run_specs(suite)
-      raise Teaspoon::UnknownSuite, "Unknown suite: \"#{suite}\"" unless Teaspoon.configuration.suite_configs[suite.to_s]
+      unless Teaspoon.configuration.suite_configs[suite.to_s]
+        raise Teaspoon::UnknownSuite, "Unknown suite: \"#{suite}\""
+      end
+
       log("Teaspoon running #{suite} suite at #{base_url_for(suite)}")
       runner = Teaspoon::Runner.new(suite)
       driver.run_specs(runner, url_for(suite))
@@ -48,9 +59,12 @@ module Teaspoon
     end
 
     def export(suite)
-      raise Teaspoon::UnknownSuite, "Unknown suite: \"#{suite}\"" unless Teaspoon.configuration.suite_configs[suite.to_s]
+      unless Teaspoon.configuration.suite_configs[suite.to_s]
+        raise Teaspoon::UnknownSuite, "Unknown suite: \"#{suite}\""
+      end
+
       log("Teaspoon exporting #{suite} suite at #{base_url_for(suite)}")
-      Teaspoon::Exporter.new(suite, url_for(suite, false), @options[:export]).export
+      Teaspoon::Exporter.new(suite, url_for(suite, false), options[:export]).export
     end
 
     protected
@@ -66,14 +80,14 @@ module Teaspoon
     end
 
     def start_server
-      log("Starting the Teaspoon server...")
       server = Teaspoon::Server.new
+      log("Starting the Teaspoon server...") unless server.responsive?
       server.start
       server
     end
 
     def suites
-      return [@options[:suite]] if @options[:suite].present?
+      return [options[:suite]] if options[:suite].present?
       return @suites.keys if @suites.present?
       Teaspoon.configuration.suite_configs.keys
     end
@@ -87,19 +101,19 @@ module Teaspoon
     end
 
     def base_url_for(suite)
-      ["#{@server.url}#{Teaspoon.configuration.mount_at}", suite].join('/')
+      ["#{@server.url}#{Teaspoon.configuration.mount_at}", suite].join("/")
     end
 
     def url_for(suite, console = true)
-      url = [base_url_for(suite), filter(suite)].compact.join('?')
-      url += "#{(url.include?("?") ? "&" : "?")}reporter=Console" if console
+      url = [base_url_for(suite), filter(suite)].compact.join("?")
+      url += "#{(url.include?('?') ? '&' : '?')}reporter=Console" if console
       url
     end
 
     def filter(suite)
       parts = []
-      parts << "grep=#{URI::encode(@options[:filter])}" if @options[:filter].present?
-      (@suites[suite] || @options[:files] || []).flatten.each { |file| parts << "file[]=#{URI::encode(file)}" }
+      parts << "grep=#{URI::encode(options[:filter])}" if options[:filter].present?
+      (@suites[suite] || options[:files] || []).flatten.each { |file| parts << "file[]=#{URI::encode(file)}" }
       "#{parts.join('&')}" if parts.present?
     end
 

data/lib/teaspoon/coverage.rb

@@ -1,6 +1,5 @@
 module Teaspoon
   class Coverage
-
     def initialize(suite_name, config_name, data)
       @suite_name = suite_name
       @data = data
@@ -11,7 +10,7 @@ module Teaspoon
     def generate_reports(&block)
       input_path do |input|
         results = []
-        for format in @config.reports
+        @config.reports.each do |format|
           result = generate_report(input, format)
           results << result if ["text", "text-summary"].include?(format.to_s)
         end
@@ -48,7 +47,7 @@ module Teaspoon
 
     def generate_report(input, format)
       output_path = File.join(@config.output_path, @suite_name)
-      result = %x{#{@executable} report #{format} #{input.shellescape} --dir #{output_path} 2>&1}
+      result = %x{#{@executable} report --include=#{input.shellescape} --dir #{output_path} #{format} 2>&1}
       return result.gsub("Done", "").gsub("Using reporter [#{format}]", "").strip if $?.exitstatus == 0
       raise Teaspoon::DependencyFailure, "Could not generate coverage report for #{format}"
     end

data/lib/teaspoon/deprecated.rb

@@ -1,5 +1,4 @@
 module Teaspoon
-
   def self.setup(&block)
     Teaspoon.dep("Teaspoon.setup is deprecated, use Teaspoon.configure instead. The /initializer/teaspoon.rb file should be removed, and a new teaspoon_env.rb file should be created by running the install generator.")
     configure(&block)
@@ -16,8 +15,7 @@ module Teaspoon
   end
 
   class Configuration
-
-    def self.context=(*args)
+    def self.context=(*_args)
       Teaspoon.dep("the teaspoon context directive is no longer used, remove it from your configuration.")
     end
 
@@ -45,19 +43,26 @@ teaspoon coverage directive has changed and is now more flexible, define coverag
   > set: config.use_coverage = "CI"
     MESSAGE
 
-    for method in %w{coverage coverage_reports coverage_output_dir statements_coverage_threshold functions_coverage_threshold branches_coverage_threshold lines_coverage_threshold}
-      define_singleton_method("#{method}=") do |val|
+    [
+      "coverage",
+      "coverage_reports",
+      "coverage_output_dir",
+      "statements_coverage_threshold",
+      "functions_coverage_threshold",
+      "branches_coverage_threshold",
+      "lines_coverage_threshold"
+    ].each do |method|
+      define_singleton_method("#{method}=") do |*_args|
         Teaspoon.dep(@coverage_dep_message, :coverage)
       end
     end
 
     class Suite
-
-      def js_config=(*args)
+      def js_config=(*_args)
         Teaspoon.dep("the teaspoon suite js_config directive is no longer used, use the install generator to install the boot partial and customize it instead.", :js_config)
       end
 
-      def normalize_asset_path=(*args)
+      def normalize_asset_path=(*_args)
         Teaspoon.dep("the teaspoon suite normalize_asset_path directive is no longer used, reopen Teaspoon::Suite and define a normalize_js_extension method instead.", :normalize_asset_path)
       end
     end

data/lib/teaspoon/drivers/base.rb

@@ -1,8 +1,8 @@
 module Teaspoon
   module Drivers
-
     autoload :PhantomjsDriver, "teaspoon/drivers/phantomjs_driver"
-    autoload :SeleniumDriver,  "teaspoon/drivers/selenium_driver"
+    autoload :SeleniumDriver, "teaspoon/drivers/selenium_driver"
+    autoload :CapybaraWebkitDriver, "teaspoon/drivers/capybara_webkit_driver"
 
     class Base
     end

data/lib/teaspoon/drivers/capybara_webkit_driver.rb

@@ -0,0 +1,33 @@
+begin
+  require "capybara-webkit"
+rescue LoadError
+  STDOUT.print("Could not find Capybara Webkit. Install the capybara-webkit gem.\n")
+  exit(1)
+end
+
+module Teaspoon
+  module Drivers
+    class CapybaraWebkitDriver < Base
+      def initialize(_ = nil)
+      end
+
+      def run_specs(runner, url)
+        session.visit(url)
+
+        session.document.synchronize(Teaspoon.configuration.driver_timeout.to_i) do
+          done = session.evaluate_script("window.Teaspoon && window.Teaspoon.finished")
+          (session.evaluate_script("window.Teaspoon && window.Teaspoon.getMessages()") || []).each do |line|
+            runner.process("#{line}\n")
+          end
+          done
+        end
+      end
+
+      private
+
+      def session
+        @session ||= Capybara::Session.new(:webkit)
+      end
+    end
+  end
+end

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

@@ -76,8 +76,8 @@
           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.fail("Javascript error has caused a timeout.");
+            }), _this.timeout);
             return _this.errored = false;
           }
         },

data/lib/teaspoon/drivers/phantomjs_driver.rb

@@ -12,9 +12,9 @@ module Teaspoon
       def initialize(options = nil)
         options ||= []
         case options
-        when Array  then @options = options
+        when Array then @options = options
         when String then @options = options.split(" ")
-        when Hash   then @options = options.map { |k, v| "--#{k}=#{v}" }
+        when Hash then @options = options.map { |k, v| "--#{k}=#{v}" }
         else raise Teaspoon::UnknownDriverOptions, "Unknown driver options -- supply a string, array or hash"
         end
       end
@@ -28,11 +28,20 @@ module Teaspoon
       protected
 
       def run(*args, &block)
-        IO.popen([executable, *args].join(' ')) { |io| io.each(&block) }
+        IO.popen([executable, *args].join(" ")) { |io| io.each(&block) }
       end
 
       def driver_options(url)
-        [@options, script, url.shellescape, Teaspoon.configuration.driver_timeout].flatten.compact
+        [
+          @options,
+          escape_quotes(script),
+          escape_quotes(url),
+          Teaspoon.configuration.driver_timeout
+        ].flatten.compact
+      end
+
+      def escape_quotes(string)
+        %{"#{string.gsub('"', '\"')}"}
       end
 
       def executable

data/lib/teaspoon/drivers/selenium_driver.rb

@@ -8,11 +8,10 @@ end
 module Teaspoon
   module Drivers
     class SeleniumDriver < Base
-
       def initialize(options = nil)
         options ||= {}
         case options
-        when Hash   then @options = options
+        when Hash then @options = options
         when String then @options = JSON.parse(options)
         else raise Teaspoon::UnknownDriverOptions, "Unknown driver options -- supply a hash or json string"
         end
@@ -39,14 +38,13 @@ module Teaspoon
       protected
 
       def driver_options
-        @driver_options ||= HashWithIndifferentAccess.new({
+        @driver_options ||= HashWithIndifferentAccess.new(
           client_driver: :firefox,
           timeout: Teaspoon.configuration.driver_timeout.to_i,
           interval: 0.01,
           message: "Timed out"
-        }).merge(@options)
+        ).merge(@options)
       end
     end
   end
 end
-

data/lib/teaspoon/engine.rb

@@ -4,9 +4,31 @@ require "teaspoon/instrumentation"
 
 module Teaspoon
   class Engine < ::Rails::Engine
-
     isolate_namespace Teaspoon
 
+    ASSET_MANIFEST = [
+      # core library
+      'teaspoon.css',
+      'teaspoon-teaspoon.js',
+
+      # framework ties
+      'teaspoon/*.js',
+      'teaspoon-jasmine.js',
+      'teaspoon-mocha.js',
+      'teaspoon-qunit.js',
+
+      # frameworks
+      'jasmine/1.3.1.js',
+      'jasmine/2.0.0.js',
+      'mocha/1.10.0.js',
+      'mocha/1.17.1.js',
+      'qunit/1.12.0.js',
+      'qunit/1.14.0.js',
+
+      # all support libraries
+      'support/*.js'
+    ]
+
     initializer :assets, group: :all do |app|
       begin
         Teaspoon::Environment.require_environment
@@ -16,6 +38,7 @@ module Teaspoon
 
       Teaspoon::Engine.default_root_path(app.root)           # default the root if it's not set
       Teaspoon::Engine.append_asset_paths(app.config.assets) # append the asset paths from the configuration
+      Teaspoon::Engine.add_precompiled_assets(app.config.assets)
     end
 
     config.after_initialize do |app|
@@ -23,8 +46,6 @@ module Teaspoon
       Teaspoon::Engine.prepend_routes(app)                   # prepend routes so a catchall doesn't get in the way
     end
 
-    private
-
     def self.default_root_path(root)
       Teaspoon.configuration.root ||= root
     end
@@ -35,16 +56,23 @@ module Teaspoon
       end
     end
 
+    def self.add_precompiled_assets(assets)
+      assets.precompile += ASSET_MANIFEST
+    end
+
     def self.inject_instrumentation
       Sprockets::Environment.send(:include, Teaspoon::SprocketsInstrumentation)
+      Sprockets::Index.send(:include, Teaspoon::SprocketsInstrumentation)
     end
 
     def self.prepend_routes(app)
-      return if Teaspoon::Engine.routes.recognize_path('/') rescue nil
+      mount_at = Teaspoon.configuration.mount_at
+
+      return if app.routes.recognize_path(mount_at)[:action] != "routing_error" rescue nil
       require Teaspoon::Engine.root.join("app/controllers/teaspoon/suite_controller")
 
       app.routes.prepend do
-        mount Teaspoon::Engine => Teaspoon.configuration.mount_at, as: "teaspoon"
+        mount Teaspoon::Engine => mount_at, as: "teaspoon"
       end
     end
   end

data/lib/teaspoon/environment.rb

@@ -2,7 +2,6 @@ require "teaspoon/exceptions"
 
 module Teaspoon
   module Environment
-
     def self.load(options = {})
       require_environment(options[:environment])
       raise "Rails environment not found." unless rails_loaded?
@@ -28,11 +27,10 @@ module Teaspoon
       standard_environments.each do |filename|
         file = File.expand_path(filename, Dir.pwd)
         return require_env(file) if File.exists?(file)
-        #file = File.expand_path(filename, File.join(Dir.pwd, '../..'))
-        #return require_env(file) if File.exists?(file)
       end
 
-      raise Teaspoon::EnvironmentNotFound, "Unable to load Teaspoon environment in {#{standard_environments.join(', ')}}"
+      raise Teaspoon::EnvironmentNotFound,
+            "Unable to load Teaspoon environment in {#{standard_environments.join(', ')}}"
     end
 
     def self.standard_environments

data/lib/teaspoon/exceptions.rb

@@ -6,6 +6,7 @@ module Teaspoon
   class RunnerException < Teaspoon::Error; end
   class ExporterException < Teaspoon::Error; end
   class UnknownFramework < Teaspoon::Error; end
+  class UnknownCoverage < Teaspoon::Error; end
   class UnknownDriver < Teaspoon::Error; end
   class UnknownDriverOptions < Teaspoon::Error; end
   class UnknownFormatter < Teaspoon::Error; end
@@ -17,12 +18,14 @@ module Teaspoon
   class FileNotWritable < Teaspoon::Error; end
 
   module ExceptionHandling
-
     def self.add_rails_handling
       return unless Teaspoon.configuration.driver == "phantomjs"
 
-      #Rails.application.config.assets.debug = false # debugging should be off to display errors in the suite_controller
-      Rails.application.config.action_dispatch.show_exceptions = true # we want rails to display exceptions
+      # debugging should be off to display errors in the suite_controller
+      # Rails.application.config.assets.debug = false
+
+      # we want rails to display exceptions
+      Rails.application.config.action_dispatch.show_exceptions = true
 
       # override the render exception method in ActionDispatch to raise a javascript exception
       render_exceptions_with_javascript
@@ -32,10 +35,10 @@ module Teaspoon
 
     def self.render_exceptions_with_javascript
       ActionDispatch::DebugExceptions.class_eval do
-        def render_exception(env, exception)
+        def render_exception(_env, exception)
           message = "#{exception.class.name}: #{exception.message}"
           body = "<script>throw Error(#{[message, exception.backtrace].join("\n").inspect})</script>"
-          [200, {'Content-Type' => "text/html;", 'Content-Length' => body.bytesize.to_s}, [body]]
+          [200, { "Content-Type" => "text/html;", "Content-Length" => body.bytesize.to_s }, [body]]
         end
       end
     end