teaspoon 1.1.3 → 1.2.2

data/lib/generators/teaspoon/install/templates/MISSING_FRAMEWORK

@@ -10,5 +10,5 @@ Add one or more of the following to your gemfile:
   gem "teaspoon-mocha"
   gem "teaspoon-qunit"
 
-More information can be found at: https://github.com/modeset/teaspoon
+More information can be found at: https://github.com/jejacks0n/teaspoon
 

data/lib/generators/teaspoon/install/templates/POST_INSTALL

@@ -1,4 +1,4 @@
 +============================================================================+
 Congratulations!  Teaspoon was successfully installed.  Documentation and more
-can be found at: https://github.com/modeset/teaspoon
+can be found at: https://github.com/jejacks0n/teaspoon
 

data/lib/generators/teaspoon/install/templates/env_comments.rb.tt

@@ -91,19 +91,21 @@ Teaspoon.configure do |config|
   # Rake:
   # teaspoon DRIVER=phantomjs SERVER_PORT=31337 FAIL_FAST=true FORMATTERS=junit suite=my_suite
 
-  # Specify which headless driver to use. Supports PhantomJS and Selenium Webdriver.
+  # Specify which headless driver to use. Supports PhantomJS, Selenium Webdriver and BrowserStack Webdriver.
   #
   # Available: <%= Teaspoon::Driver.available.keys.map{|f| ":#{f}"}.join(", ") %>
-  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
-  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
-  # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
+  # PhantomJS: https://github.com/jejacks0n/teaspoon/wiki/Using-PhantomJS
+  # Selenium Webdriver: https://github.com/jejacks0n/teaspoon/wiki/Using-Selenium-WebDriver
+  # BrowserStack Webdriver: https://github.com/jejacks0n/teaspoon/wiki/Using-BrowserStack-WebDriver
+  # Capybara Webkit: https://github.com/jejacks0n/teaspoon/wiki/Using-Capybara-Webkit
   #config.driver = :<%= Teaspoon::Driver.default %>
 
   # Specify additional options for the driver.
   #
-  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
-  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
-  # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
+  # PhantomJS: https://github.com/jejacks0n/teaspoon/wiki/Using-PhantomJS
+  # Selenium Webdriver: https://github.com/jejacks0n/teaspoon/wiki/Using-Selenium-WebDriver
+  # BrowserStack Webdriver: https://github.com/jejacks0n/teaspoon/wiki/Using-BrowserStack-WebDriver
+  # Capybara Webkit: https://github.com/jejacks0n/teaspoon/wiki/Using-Capybara-Webkit
   #config.driver_options = nil
 
   # Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be

data/lib/tasks/teaspoon/info.rake

@@ -14,4 +14,4 @@ namespace :teaspoon do
       STDOUT.print("\n")
     end
   end
-end
+end

data/lib/teaspoon/command_line.rb

@@ -32,113 +32,113 @@ module Teaspoon
 
     protected
 
-    def opts_for_general
-      opt :environment, "-r", "--require FILE",
-          "Require Teaspoon environment file."
+      def opts_for_general
+        opt :environment, "-r", "--require FILE",
+            "Require Teaspoon environment file."
 
-      # opt :custom_options_file,
-      #     "-O", "--options PATH",
-      #     "Specify the path to a custom options file."
+        # opt :custom_options_file,
+        #     "-O", "--options PATH",
+        #     "Specify the path to a custom options file."
 
-      opt :driver, "-d", "--driver DRIVER",
-          "Specify driver:",
-          *driver_details
+        opt :driver, "-d", "--driver DRIVER",
+            "Specify driver:",
+            *driver_details
 
-      opt :driver_options, "--driver-options OPTIONS",
-          "Specify driver-specific options to pass into the driver.",
-          "  e.g. \"--ssl-protocol=any --ssl-certificates-path=/path/to/certs\".",
-          "  Driver options are only supported with phantomjs."
+        opt :driver_options, "--driver-options OPTIONS",
+            "Specify driver-specific options to pass into the driver.",
+            "  e.g. \"--ssl-protocol=any --ssl-certificates-path=/path/to/certs\".",
+            "  Driver options are only supported with phantomjs."
 
-      opt :driver_timeout, "--driver-timeout SECONDS",
-          "Sets the timeout for the driver to wait before exiting."
+        opt :driver_timeout, "--driver-timeout SECONDS",
+            "Sets the timeout for the driver to wait before exiting."
 
-      opt :server, "--server SERVER",
-          "Sets server to use with Rack.",
-          "  e.g. webrick, thin"
+        opt :server, "--server SERVER",
+            "Sets server to use with Rack.",
+            "  e.g. webrick, thin"
 
-      opt :server_host, "--server-host HOST",
-          "Sets the server to use a specific host."
+        opt :server_host, "--server-host HOST",
+            "Sets the server to use a specific host."
 
-      opt :server_port, "--server-port PORT",
-          "Sets the server to use a specific port."
+        opt :server_port, "--server-port PORT",
+            "Sets the server to use a specific port."
 
-      opt :server_timeout, "--server-timeout SECONDS",
-          "Sets the timeout that the server must start within."
+        opt :server_timeout, "--server-timeout SECONDS",
+            "Sets the timeout that the server must start within."
 
-      opt :fail_fast, "-F", "--[no-]fail-fast",
-          "Abort after the first failing suite."
-    end
+        opt :fail_fast, "-F", "--[no-]fail-fast",
+            "Abort after the first failing suite."
+      end
 
-    def opts_for_filtering
-      separator("Filtering")
+      def opts_for_filtering
+        separator("Filtering")
 
-      opt :suite, "-s", "--suite SUITE",
-          "Focus to a specific suite."
+        opt :suite, "-s", "--suite SUITE",
+            "Focus to a specific suite."
 
-      opt :filter, "-g", "--filter FILTER",
-          "Filter tests matching a specific filter."
-    end
+        opt :filter, "-g", "--filter FILTER",
+            "Filter tests matching a specific filter."
+      end
 
-    def opts_for_output
-      separator("Output")
+      def opts_for_output
+        separator("Output")
 
-      opt :suppress_log, "-q", "--[no-]suppress-log",
-          "Suppress logs coming from console[log/debug/error]."
+        opt :suppress_log, "-q", "--[no-]suppress-log",
+            "Suppress logs coming from console[log/debug/error]."
 
-      opt :color, "-c", "--[no-]color",
-          "Enable/Disable color output."
+        opt :color, "-c", "--[no-]color",
+            "Enable/Disable color output."
 
-      opt :export, "-e", "--export [OUTPUT_PATH]",
-          "Exports the test suite as the full HTML (requires wget)."
+        opt :export, "-e", "--export [OUTPUT_PATH]",
+            "Exports the test suite as the full HTML (requires wget)."
 
-      opt :formatters, "-f", "--format FORMATTERS",
-          "Specify formatters (comma separated)",
-          *formatter_details
-    end
+        opt :formatters, "-f", "--format FORMATTERS",
+            "Specify formatters (comma separated)",
+            *formatter_details
+      end
 
-    def opts_for_coverage
-      separator("Coverage")
+      def opts_for_coverage
+        separator("Coverage")
 
-      opt :use_coverage, "-C", "--coverage CONFIG_NAME",
-          "Generate coverage reports using a pre-defined coverage configuration."
-    end
+        opt :use_coverage, "-C", "--coverage CONFIG_NAME",
+            "Generate coverage reports using a pre-defined coverage configuration."
+      end
 
-    def opts_for_utility
-      separator("Utility")
+      def opts_for_utility
+        separator("Utility")
 
-      @parser.on "-v", "--version", "Display the version." do
-        Teaspoon.abort(Teaspoon::VERSION, 0)
-      end
+        @parser.on "-v", "--version", "Display the version." do
+          Teaspoon.abort(Teaspoon::VERSION, 0)
+        end
 
-      @parser.on "-h", "--help", "You're looking at it." do
-        Teaspoon.abort(@parser, 0)
+        @parser.on "-h", "--help", "You're looking at it." do
+          Teaspoon.abort(@parser, 0)
+        end
       end
-    end
 
     private
 
-    def separator(message)
-      @parser.separator("\n  **** #{message} ****\n\n")
-    end
+      def separator(message)
+        @parser.separator("\n  **** #{message} ****\n\n")
+      end
 
-    def opt(config, *args)
-      @parser.on(*args, proc { |value| @options[config] = value })
-    end
+      def opt(config, *args)
+        @parser.on(*args, proc { |value| @options[config] = value })
+      end
 
-    def require_console
-      require "teaspoon/console"
-    end
+      def require_console
+        require "teaspoon/console"
+      end
 
-    def formatter_details
-      Teaspoon::Formatter.available.map do |name, options|
-        "  #{name}#{' (default)' if options[:default]} - #{options[:description]}"
+      def formatter_details
+        Teaspoon::Formatter.available.map do |name, options|
+          "  #{name}#{' (default)' if options[:default]} - #{options[:description]}"
+        end
       end
-    end
 
-    def driver_details
-      Teaspoon::Driver.available.map do |name, options|
-        "  #{name}#{' (default)' if options[:default]}"
+      def driver_details
+        Teaspoon::Driver.available.map do |name, options|
+          "  #{name}#{' (default)' if options[:default]}"
+        end
       end
-    end
   end
 end

data/lib/teaspoon/configuration.rb

@@ -21,7 +21,7 @@ module Teaspoon
     @@asset_paths    = ["spec/javascripts", "spec/javascripts/stylesheets",
                         "test/javascripts", "test/javascripts/stylesheets"]
     @@fixture_paths  = ["spec/javascripts/fixtures", "test/javascripts/fixtures"]
-    @@asset_manifest = ["teaspoon.css", "teaspoon-filterer.js", "teaspoon/*.js", "support/*.js"]
+    @@asset_manifest = ["teaspoon.css", "teaspoon-filterer.js", "support/*.js"]
 
     # console runner specific
 
@@ -54,7 +54,7 @@ module Teaspoon
     # suite configurations
 
     cattr_accessor :suite_configs
-    @@suite_configs = { "default" => { block: proc {} } }
+    @@suite_configs = { "default" => { block: proc { } } }
 
     def self.suite(name = :default, &block)
       @@suite_configs[name.to_s] = { block: block, instance: Suite.new(name, &block) }
@@ -66,7 +66,7 @@ module Teaspoon
                     :hooks, :expand_assets, :js_extensions
 
       def initialize(name = nil)
-        @matcher       = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
+        @matcher       = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee,es6,js.es6}"
         @helper        = "spec_helper"
         @javascripts   = []
         @stylesheets   = ["teaspoon"]
@@ -104,7 +104,7 @@ module Teaspoon
     # coverage configurations
 
     cattr_accessor :coverage_configs
-    @@coverage_configs = { "default" => { block: proc {} } }
+    @@coverage_configs = { "default" => { block: proc { } } }
 
     def self.coverage(name = :default, &block)
       @@coverage_configs[name.to_s] = { block: block, instance: Coverage.new(&block) }

data/lib/teaspoon/console.rb

@@ -1,4 +1,5 @@
 require "teaspoon/environment"
+require "teaspoon/utility"
 
 module Teaspoon
   class Console
@@ -66,54 +67,54 @@ module Teaspoon
 
     protected
 
-    def resolve(files = [])
-      return if files.blank?
-      files.uniq.each do |path|
-        if result = Teaspoon::Suite.resolve_spec_for(path)
-          suite = @suites[result[:suite]] ||= []
-          suite << result[:path]
+      def resolve(files = [])
+        return if files.blank?
+        files.uniq.each do |path|
+          if result = Teaspoon::Suite.resolve_spec_for(path)
+            suite = @suites[result[:suite]] ||= []
+            suite << result[:path]
+          end
         end
       end
-    end
 
-    def start_server
-      server = Teaspoon::Server.new
-      log("Starting the Teaspoon server...") unless server.responsive?
-      server.start
-      server
-    end
+      def start_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 @suites.keys if @suites.present?
-      Teaspoon.configuration.suite_configs.keys
-    end
+      def suites
+        return [options[:suite]] if options[:suite].present?
+        return @suites.keys if @suites.present?
+        Teaspoon.configuration.suite_configs.keys
+      end
 
-    def driver
-      return @driver if @driver
-      driver = Teaspoon::Driver.fetch(Teaspoon.configuration.driver)
-      @driver = driver.new(Teaspoon.configuration.driver_options)
-    end
+      def driver
+        return @driver if @driver
+        driver = Teaspoon::Driver.fetch(Teaspoon.configuration.driver)
+        @driver = driver.new(Teaspoon.configuration.driver_options)
+      end
 
-    def base_url_for(suite)
-      ["#{@server.url}#{Teaspoon.configuration.mount_at}", suite].join("/")
-    end
+      def base_url_for(suite)
+        ["#{@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
-    end
+      def url_for(suite, console = true)
+        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.join('&')}" if parts.present?
-    end
+      def filter(suite)
+        parts = []
+        parts << "grep=#{CGI.escape(options[:filter])}" if options[:filter].present?
+        (@suites[suite] || options[:files] || []).flatten.each { |file| parts << "file[]=#{CGI.escape(file)}" }
+        "#{parts.join('&')}" if parts.present?
+      end
 
-    def log(str)
-      STDOUT.print("#{str}\n") unless Teaspoon.configuration.suppress_log
-    end
+      def log(str)
+        STDOUT.print("#{str}\n") unless Teaspoon.configuration.suppress_log
+      end
   end
 end

data/lib/teaspoon/coverage.rb

@@ -1,3 +1,5 @@
+require "open3"
+
 module Teaspoon
   class Coverage
     def self.configuration(name = Teaspoon.configuration.use_coverage)
@@ -18,7 +20,6 @@ module Teaspoon
     end
 
     def generate_reports(&block)
-
       input_path do |input|
         results = []
         @config.reports.each do |format|
@@ -33,8 +34,8 @@ module Teaspoon
       args = threshold_args
       return if args.blank?
       input_path do |input|
-        result = %x{#{@executable} check-coverage #{args.join(" ")} #{input.shellescape} 2>&1}
-        return if $?.exitstatus == 0
+        result, st = Open3.capture2e(@executable, "check-coverage", *args, input.shellescape)
+        return if st.exitstatus.zero?
         result = result.scan(/ERROR: .*$/).join("\n").gsub("ERROR: ", "")
         block.call(result) unless result.blank?
       end
@@ -42,31 +43,34 @@ module Teaspoon
 
     private
 
-    def self.normalize_config_name(name)
-      return "default" if name == true
-      name.to_s
-    end
+      def self.normalize_config_name(name)
+        return "default" if name == true
+        name.to_s
+      end
 
-    def input_path(&block)
-      Dir.mktmpdir do |temp_path|
-        input_path = File.join(temp_path, "coverage.json")
-        File.open(input_path, "w") { |f| f.write(@data.to_json) }
-        block.call(input_path)
+      def input_path(&block)
+        Dir.mktmpdir do |temp_path|
+          input_path = File.join(temp_path, "coverage.json")
+          File.open(input_path, "w") { |f| f.write(@data.to_json) }
+          block.call(input_path)
+        end
       end
-    end
 
-    def generate_report(input, format)
-      output_path = File.join(@config.output_path, @suite_name)
-      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::DependencyError.new("Unable to generate #{format} coverage report:\n#{result}")
-    end
+      def generate_report(input, format)
+        output_path = File.join(@config.output_path, @suite_name)
+        result, st =
+          Open3.capture2e(
+            @executable, "report", "--include", input.shellescape, "--dir", output_path, format
+          )
+        return result.gsub("Done", "").gsub("Using reporter [#{format}]", "").strip if st.exitstatus.zero?
+        raise Teaspoon::DependencyError.new("Unable to generate #{format} coverage report:\n#{result}")
+      end
 
-    def threshold_args
-      %w{statements functions branches lines}.map do |assert|
-        threshold = @config.send(:"#{assert}")
-        "--#{assert}=#{threshold}" if threshold
-      end.compact
-    end
+      def threshold_args
+        %w{statements functions branches lines}.map do |assert|
+          threshold = @config.send(:"#{assert}")
+          "--#{assert}=#{threshold}" if threshold
+        end.compact
+      end
   end
 end