teaspoon 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf9f6b71a048c4a8ca1490cc8ef46a05b993803
-  data.tar.gz: 2549ceb1312eb411c92f1592d5013263074093fc
+  metadata.gz: d22fe9ea7896df90ee38c2c3bae949dbd4d8713d
+  data.tar.gz: af5535a099b6b026c16b528fbfa12a8c0f23ec5b
 SHA512:
-  metadata.gz: a428ef8433d1bea881e3de18b3d1f87d6805c75fbd1e6ae604ed5da780ca14e447c26369a3887be8b7803768dffd6dfce99b5ad16048f84badf98c91062632db
-  data.tar.gz: e8bc26bd42a72786b80e461fce98fc254f587766049d59b602daa7ad05fccbd8b08a7d0ebf78f3b35eac03f87b6301e52a1dda1515ebc2ebcd3ac118a527aefc
+  metadata.gz: b9df3ef6379a9bf4870d17cba90ec170d2948e16b0f3ed5f10151c3bfce8a780964b727a281f269d014ffcd5d46ae1328aae58b0810d7f8793ebfa93ce9d9950
+  data.tar.gz: 3d3f0e703a8ba0a4eabe4de8a6e11ebfd8c96f658ca25e77b67cb20db07f79cd4e49b624903c247ada5d143df1552f740933820a94e27de81def11e44fd7c8d4

data/CHANGELOG.md

@@ -2,11 +2,16 @@
 
 #### Bug Fixes
 
-### 1.1.3
+### 1.1.4
 
 #### Bug Fixes
 
-* Fix for version check of ActionView, to expand the version checking for security/bug fix releases.
+* Fixes an ActionView version related issue.
+
+
+### 1.1.3
+
+This was an erroneous release, of the rails_5 branch. oops. 
 
 
 ### 1.1.2

data/README.md

@@ -17,12 +17,22 @@ Feedback, ideas and pull requests are always welcome, or you can hit us up on Tw
 
 [![Join the chat at https://gitter.im/modeset/teaspoon](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/modeset/teaspoon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The goal of Teaspoon is to stay simple while also providing the most complete Javascript testing solution for Rails.
+The goal of Teaspoon is to be simple to use while also providing the most complete Javascript testing solution for Rails.
 
 Teaspoon takes advantage of the Rails asset pipeline, and ships with support for Jasmine, Mocha, and QUnit.
 
 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
@@ -437,11 +447,11 @@ We encourage you to experiment and let us know. Feel free to create a wiki artic
 
 ## Alternative Projects
 
-[Konacha](https://github.com/jfirebaugh/konacha)
-[Jasminerice](https://github.com/bradphelan/jasminerice)
-[Evergreen](https://github.com/abepetrillo/evergreen)
-[jasmine-rails](https://github.com/searls/jasmine-rails)
-[guard-jasmine](https://github.com/netzpirat/guard-jasmine)
+- [Konacha](https://github.com/jfirebaugh/konacha)
+- [Jasminerice](https://github.com/bradphelan/jasminerice)
+- [Evergreen](https://github.com/abepetrillo/evergreen)
+- [jasmine-rails](https://github.com/searls/jasmine-rails)
+- [guard-jasmine](https://github.com/netzpirat/guard-jasmine)
 
 
 ## License

data/app/controllers/teaspoon/suite_controller.rb

@@ -1,10 +1,6 @@
 class Teaspoon::SuiteController < ActionController::Base
-  def self.before(*args)
-    respond_to?(:before_action) ? before_action(*args) : before_filter(*args)
-  end
-
-  before :check_env
-  before :prepend_fixture_paths
+  before_filter :check_env
+  before_filter :prepend_fixture_paths
 
   layout false
 
@@ -18,8 +14,8 @@ class Teaspoon::SuiteController < ActionController::Base
 
   def hook
     hooks = Teaspoon::Suite.new(params).hooks[params[:hook].to_s]
-    hooks.each { |hook| hook.call(hook_params(params[:args])) }
-    head(:success)
+    hooks.each { |hook| hook.call(params[:args]) }
+    render nothing: true
   end
 
   def fixtures
@@ -37,9 +33,4 @@ 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/teaspoon/driver/phantomjs.rb

@@ -34,7 +34,7 @@ module Teaspoon
       def run(*args, &block)
         IO.popen([executable, *args].join(" ")) { |io| io.each(&block) }
 
-        unless $?.success?
+        unless $?.nil? || $?.success?
           raise Teaspoon::DependencyError.new("Failed to use phantomjs, which exited with status code: #{$?.exitstatus}")
         end
       end

data/lib/teaspoon/engine.rb

@@ -98,12 +98,12 @@ end
 
 begin
   require 'action_view'
-  if ActionView::VERSION::STRING == "4.2.5" || ActionView::VERSION::MAJOR >= 5
+  if ActionView::VERSION::STRING.start_with?('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', 'host').symbolize_keys
+        path_options = options.extract!('protocol', 'extname').symbolize_keys
         path_options[:debug] = options['allow_non_precompiled']
         sources.uniq.map { |source|
           tag_options = {

data/lib/teaspoon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-27 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: '6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 3.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
 description: Run Javascript tests using Jasmine, Mocha or QUnit in the browser or
   headless using PhantomJS, Selenium Webdriver, or Capybara Webkit
 email: