teaspoon 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22fe9ea7896df90ee38c2c3bae949dbd4d8713d
-  data.tar.gz: af5535a099b6b026c16b528fbfa12a8c0f23ec5b
+  metadata.gz: b1fe7da8e50927f48254e402db1b3cdb677e6ca0
+  data.tar.gz: d4fdb5d2b377e7bbb58be0ecbe73bd26c4bdc951
 SHA512:
-  metadata.gz: b9df3ef6379a9bf4870d17cba90ec170d2948e16b0f3ed5f10151c3bfce8a780964b727a281f269d014ffcd5d46ae1328aae58b0810d7f8793ebfa93ce9d9950
-  data.tar.gz: 3d3f0e703a8ba0a4eabe4de8a6e11ebfd8c96f658ca25e77b67cb20db07f79cd4e49b624903c247ada5d143df1552f740933820a94e27de81def11e44fd7c8d4
+  metadata.gz: db2aeba73939e1ce0cc4e0155c28cd245962f2fb04d949290eaa134e45dd3e64e46883d0ef542e4cc667a896f453fb994ff833983e11f343de8c47d14ae47b70
+  data.tar.gz: bce476ec63fb6b634411237329c3d6bb7ce4711895b0fe96ccfc6ce700b7fc213aaf41474420bfcb78af569362715f7f9b4409ac38924e834d9721f8335461cc

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 #### Bug Fixes
 
+### 1.1.5
+
+#### Enhancements
+
+* Adds support for Rails 5
+
+#### Bug Fixes
+
+* Fixes an ActionView version related issue.
+* Changes before_filter to before_action where possible (Rails 3 vs. Rails 5)
+
+
 ### 1.1.4
 
 #### Bug Fixes
@@ -13,6 +25,10 @@
 
 This was an erroneous release, of the rails_5 branch. oops. 
 
+#### Bug Fixes
+
+* Fix for version check of ActionView, to expand the version checking for security/bug fix releases.
+
 
 ### 1.1.2
 

data/README.md

@@ -11,7 +11,7 @@ Teaspoon
 <img src="https://raw.github.com/modeset/teaspoon/master/screenshots/logo_big.png" alt="Logo by Morgan Keys" align="right" />
 <sup>Logo by [Morgan Keys](http://www.morganrkeys.com/)</sup>
 
-Teaspoon is a Javascript test runner built for Rails. It can run tests in the browser and headless using PhantomJS, Selenium WebDriver, or Capybara Webkit.
+Teaspoon is a Javascript test runner built for Rails. It can run tests in the browser and headless using PhantomJS, Selenium WebDriver, or Capybara Webkit. It can also run your tests on selenium-webgrid providers such as [BrowserStack](https://www.browserstack.com).
 
 Feedback, ideas and pull requests are always welcome, or you can hit us up on Twitter @modeset_.
 
@@ -24,15 +24,6 @@ Teaspoon takes advantage of the Rails asset pipeline, and ships with support for
 If you'd like to use Teaspoon with [Guard](https://github.com/guard/guard), check out the [guard-teaspoon](https://github.com/modeset/guard-teaspoon) project. Or, if you want to use the [Spring](https://github.com/rails/spring) preloader, try the unofficial [spring-commands-teaspoon](https://github.com/alejandrobabio/spring-commands-teaspoon).
 
 
-## Developer Note
-
-We've added experimental Rails 5 support. If you're looking to use Teaspoon with Rails 5, please try out the rails_5 branch.
-
-```
-gem "teaspoon-mocha", github: "modeset/teaspoon", branch: "rails_5" 
-```
-
-
 ## Screenshots
 
 ### Running in the console
@@ -57,7 +48,7 @@ gem "teaspoon-mocha", github: "modeset/teaspoon", branch: "rails_5"
 8. [Test Frameworks](#test-frameworks)
 9. [Support Libraries](#support-libraries)
 10. [CI Support](#ci-support)
-
+11. [With BrowserStack](#with-browserstack)
 
 ## Installation
 
@@ -133,7 +124,7 @@ bundle exec teaspoon --help
 
 Depending on which framework you use this can differ, and there's an expectation that you have a certain level of familiarity with your chosen test framework.
 
-Teaspoon supports [Jasmine](http://pivotal.github.com/jasmine), [Mocha](https://github.com/mochajs/mocha) and [QUnit](http://qunitjs.com). And since it's possible to use the asset pipeline, feel free to use the `= require` directive throughout your specs and spec helpers.
+Teaspoon supports [Jasmine](http://jasmine.github.io/2.0/introduction.html), [Mocha](https://github.com/mochajs/mocha) and [QUnit](http://qunitjs.com). And since it's possible to use the asset pipeline, feel free to use the `= require` directive throughout your specs and spec helpers.
 
 Here's a basic spec written in Javascript using Jasmine:
 
@@ -445,6 +436,17 @@ If you want to generate reports that CI can use you can install Istanbul for cov
 We encourage you to experiment and let us know. Feel free to create a wiki article about what you did to get it working on your CI setup.
 
 
+## With [BrowserStack](https://www.browserstack.com)
+
+Running your javascript tests on the BrowserStack infrastructure is easy with the included `browserstack` driver.
+
+In `teaspoon_env.rb` configure your driver to `config.driver = :browserstack`. You must add the browsers you'd like to test on as an array of hashes with key `capabilities` in `config.driver_options`. More details about the driver configurations are available on the [Using BrowserStack WebDriver](https://github.com/modeset/teaspoon/wiki/Using-BrowserStack-WebDriver) wiki article.
+
+By default you can run 10 tests in parallel by default, and the number of tests running in parallel can be specified using the `max_parallel` driver option.
+
+Now you can run Teaspoon locally and can see your tests running on the [BrowserStack Automate Dashboard](https://browserstack.com/automate).
+
+
 ## Alternative Projects
 
 - [Konacha](https://github.com/jfirebaugh/konacha)

data/app/controllers/teaspoon/suite_controller.rb

@@ -1,6 +1,10 @@
 class Teaspoon::SuiteController < ActionController::Base
-  before_filter :check_env
-  before_filter :prepend_fixture_paths
+  def self.before(*args)
+    respond_to?(:before_action) ? before_action(*args) : before_filter(*args)
+  end
+
+  before :check_env
+  before :prepend_fixture_paths
 
   layout false
 
@@ -14,8 +18,8 @@ class Teaspoon::SuiteController < ActionController::Base
 
   def hook
     hooks = Teaspoon::Suite.new(params).hooks[params[:hook].to_s]
-    hooks.each { |hook| hook.call(params[:args]) }
-    render nothing: true
+    hooks.each { |hook| hook.call(hook_params(params[:args])) }
+    head(:success)
   end
 
   def fixtures
@@ -33,4 +37,9 @@ class Teaspoon::SuiteController < ActionController::Base
       prepend_view_path Teaspoon.configuration.root.join(path)
     end
   end
+
+  def hook_params(params)
+    return params.permit!.to_h if params.respond_to?(:permit!)
+    params
+  end
 end

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

@@ -91,11 +91,12 @@ 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
+  # BrowserStack Webdriver: https://github.com/modeset/teaspoon/wiki/Using-BrowserStack-WebDriver
   # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
   #config.driver = :<%= Teaspoon::Driver.default %>
 
@@ -103,6 +104,7 @@ Teaspoon.configure do |config|
   #
   # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
   # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
+  # BrowserStack Webdriver: https://github.com/modeset/teaspoon/wiki/Using-BrowserStack-WebDriver
   # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
   #config.driver_options = nil
 

data/lib/teaspoon/driver.rb

@@ -12,4 +12,5 @@ end
 
 Teaspoon::Driver.register(:phantomjs, "Teaspoon::Driver::Phantomjs", "teaspoon/driver/phantomjs", default: true)
 Teaspoon::Driver.register(:selenium, "Teaspoon::Driver::Selenium", "teaspoon/driver/selenium")
+Teaspoon::Driver.register(:browserstack, "Teaspoon::Driver::BrowserStack", "teaspoon/driver/browserstack")
 Teaspoon::Driver.register(:capybara_webkit, "Teaspoon::Driver::CapybaraWebkit", "teaspoon/driver/capybara_webkit")

data/lib/teaspoon/driver/browserstack.rb

@@ -0,0 +1,114 @@
+# :nocov:
+begin
+  require "selenium-webdriver"
+rescue LoadError
+  Teaspoon.abort("Could not find Selenium Webdriver. Install the selenium-webdriver gem.")
+end
+# :nocov:
+
+require "teaspoon/driver/base"
+
+# The driver creates individual thread for each test.
+# This limit is here to disallow too many threads
+# Override via max_parallel key in options.
+MAX_PARALLEL = 10
+
+# Need to have BrowserStackLocal binary (https://www.browserstack.com/local-testing#command-line)
+# running in the background to use this driver.
+module Teaspoon
+  module Driver
+    class BrowserStack < Base
+      def initialize(options = nil)
+        options ||= {}
+        case options
+        when Hash then @options = options.symbolize_keys
+        when String then @options = JSON.parse(options).symbolize_keys
+        else raise Teaspoon::DriverOptionsError.new(types: "hash or json string")
+        end
+
+        unless @options[:capabilities] && @options[:capabilities].is_a?(Array)
+          raise Teaspoon::DriverOptionsError.new(types: "capabilities array." \
+                                                 "Options must have a key 'capabilities' of type array")
+        end
+        @options[:capabilities].each(&:symbolize_keys!)
+      rescue JSON::ParserError
+        raise Teaspoon::DriverOptionsError.new(types: "hash or json string")
+      end
+
+      def run_specs(runner, url)
+        parallelize do
+          driver = Thread.current[:driver]
+          driver.navigate.to(url)
+          ::Selenium::WebDriver::Wait.new(driver_options).until do
+            done = driver.execute_script("return window.Teaspoon && window.Teaspoon.finished")
+            driver.execute_script("return window.Teaspoon && window.Teaspoon.getMessages() || []").each do |line|
+              runner.process("#{line}\n")
+            end
+            done
+          end
+        end
+      end
+
+      protected
+
+      def parallelize
+        threads = []
+        left_capabilities = capabilities
+        until left_capabilities.empty?
+          left_capabilities.pop(max_parallel).each do |desired_capability|
+            desired_capability[:"browserstack.local"] = true
+            desired_capability[:project] = driver_options[:project] if driver_options[:project]
+            desired_capability[:build] = driver_options[:build] if driver_options[:build]
+            threads << Thread.new do
+              driver = ::Selenium::WebDriver.for(:remote, url: hub_url, desired_capabilities: desired_capability)
+              Thread.current[:driver] = driver
+              capability = driver.capabilities
+
+              Thread.current[:name] = "Session on #{capability[:platform].to_s.strip}," \
+                "#{capability[:browser_name].to_s.strip} #{capability[:version].to_s.strip}"
+
+              yield
+              Thread.current[:driver].quit
+              STDOUT.print("#{Thread.current[:name]} Completed\n") unless Teaspoon.configuration.suppress_log
+            end
+          end
+          threads.each(&:join)
+          threads = []
+        end
+      end
+
+      def capabilities
+        driver_options[:capabilities]
+      end
+
+      def hub_url
+        "https://#{username}:#{access_key}@hub.browserstack.com/wd/hub"
+      end
+
+      def username
+        driver_options[:username] || ENV["BROWSERSTACK_USERNAME"]
+      end
+
+      def access_key
+        driver_options[:access_key] || ENV["BROWSERSTACK_ACCESS_KEY"]
+      end
+
+      def max_parallel
+        parallel = MAX_PARALLEL
+        begin
+          parallel = driver_options[:max_parallel].to_i if driver_options[:max_parallel].to_i > 0
+        rescue
+        end
+        parallel
+      end
+
+      def driver_options
+        @driver_options ||= HashWithIndifferentAccess.new(
+          timeout: Teaspoon.configuration.driver_timeout.to_i,
+          interval: 0.01,
+          message: "Timed out"
+        ).merge(@options)
+      end
+    end
+  end
+end

data/lib/teaspoon/driver/phantomjs.rb

@@ -54,8 +54,7 @@ module Teaspoon
 
       def executable
         return @executable if @executable
-        @executable = which("phantomjs")
-        @executable = ::Phantomjs.path if @executable.blank? && defined?(::Phantomjs)
+        @executable = defined?(::Phantomjs) ? ::Phantomjs.path : which("phantomjs")
         return @executable unless @executable.blank?
         raise Teaspoon::MissingDependencyError.new("Unable to locate phantomjs. Install it or use the phantomjs gem.")
       end

data/lib/teaspoon/engine.rb

@@ -51,6 +51,9 @@ module Teaspoon
 
     def self.inject_instrumentation
       Sprockets::Environment.send(:include, Teaspoon::SprocketsInstrumentation)
+      Sprockets::CachedEnvironment.send(:include, Teaspoon::SprocketsInstrumentation)
+    rescue NameError
+      # Handle cached environment in Sprockets 2.x
       Sprockets::Index.send(:include, Teaspoon::SprocketsInstrumentation)
     end
 
@@ -80,7 +83,7 @@ module Teaspoon
       private
 
       def self.using_phantomjs?
-        Teaspoon::Driver.equal?(Teaspoon.configuration.driver, :phantomjs)
+        Teaspoon::Driver.matches?(Teaspoon.configuration.driver, :phantomjs)
       end
 
       def self.render_exceptions_with_javascript
@@ -98,12 +101,12 @@ end
 
 begin
   require 'action_view'
-  if ActionView::VERSION::STRING.start_with?('4.2.5')
+  if ActionView::VERSION::STRING >= '4.2.5'
     require 'action_view/helpers/asset_tag_helper'
     module ActionView::Helpers::AssetTagHelper
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!('protocol', 'extname').symbolize_keys
+        path_options = options.extract!('protocol', 'extname', 'host').symbolize_keys
         path_options[:debug] = options['allow_non_precompiled']
         sources.uniq.map { |source|
           tag_options = {

data/lib/teaspoon/formatter/junit.rb

@@ -9,7 +9,8 @@ module Teaspoon
       def log_runner(result)
         log_line(%{<?xml version="1.0" encoding="UTF-8"?>})
         log_line(%{<testsuites name="Teaspoon">})
-        log_line(%{<testsuite name="#{escape(@suite_name)}" tests="#{@total_count}" time="#{result.start}">})
+        start_time = Time.parse(result.start).iso8601
+        log_line(%{<testsuite name="#{escape(@suite_name)}" tests="#{@total_count}" timestamp="#{start_time}">})
       end
 
       def log_suite(result)

data/lib/teaspoon/registry.rb

@@ -26,7 +26,7 @@ module Teaspoon
       driver.call
     end
 
-    def equal?(one, two)
+    def matches?(one, two)
       normalize_name(one) == normalize_name(two)
     end
 

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -22,7 +22,7 @@ dependencies:
         version: 3.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 3.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: Run Javascript tests using Jasmine, Mocha or QUnit in the browser or
   headless using PhantomJS, Selenium Webdriver, or Capybara Webkit
 email:
@@ -95,6 +95,7 @@ files:
 - lib/teaspoon/deprecated.rb
 - lib/teaspoon/driver.rb
 - lib/teaspoon/driver/base.rb
+- lib/teaspoon/driver/browserstack.rb
 - lib/teaspoon/driver/capybara_webkit.rb
 - lib/teaspoon/driver/phantomjs.rb
 - lib/teaspoon/driver/phantomjs/runner.js
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Teaspoon: A Javascript test runner built on top of Rails'