teaspoon 1.1.1 → 1.1.2

data/app/assets/javascripts/teaspoon/fixture.coffee

@@ -2,7 +2,7 @@ class Teaspoon.Fixture
 
   @cache: {}
   @el: null
-  @$el: null # will only be defined if window.$ is defined.
+  @$el: null # will only be defined if window.jQuery is defined.
   @json: []
 
   # Public API
@@ -70,7 +70,7 @@ class Teaspoon.Fixture
     create() unless window.fixture.el
 
     if jQueryAvailable()
-      parsed = $($.parseHTML(content, document, true))
+      parsed = jQuery(jQuery.parseHTML(content, document, true))
       window.fixture.el.appendChild(parsed[i]) for i in [0...parsed.length]
     else
       window.fixture.el.innerHTML += content
@@ -78,7 +78,7 @@ class Teaspoon.Fixture
 
   create = =>
     window.fixture.el = document.createElement("div")
-    window.fixture.$el = $(window.fixture.el) if jQueryAvailable()
+    window.fixture.$el = jQuery(window.fixture.el) if jQueryAvailable()
     window.fixture.el.id = "teaspoon-fixtures"
     document.body?.appendChild(window.fixture.el)
 
@@ -105,4 +105,4 @@ class Teaspoon.Fixture
 
 
   jQueryAvailable = ->
-    typeof(window.$) == 'function'
+    typeof(window.jQuery) == 'function'

data/app/views/teaspoon/suite/_boot.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag *@suite.spec_assets, debug: @suite.config.expand_assets %>
+<%= javascript_include_tag *@suite.spec_assets, debug: @suite.config.expand_assets, allow_non_precompiled: true %>
 <script type="text/javascript">
   Teaspoon.onWindowLoad(Teaspoon.execute);
 </script>

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

@@ -113,6 +113,9 @@ Teaspoon.configure do |config|
   # Specify a server to use with Rack (e.g. thin, mongrel). If nil is provided Rack::Server is used.
   #config.server = nil
 
+  # Specify a host to run on a specific host, otherwise Teaspoon will use 127.0.0.1.
+  #config.server_host = nil
+
   # Specify a port to run on a specific port, otherwise Teaspoon will use a random available port.
   #config.server_port = nil
 

data/lib/teaspoon-devkit.rb

@@ -69,6 +69,14 @@ module Teaspoon
       end
     end
 
+    if !loaded_from_teaspoon_root?
+      Rake::Task["release"].clear
+    end
+
+    desc "Build and push teaspoon-#{framework} to Rubygems\n"
+    task "release" => ["build", "release:guard_clean", "release:rubygem_push"] do
+    end
+
     if !loaded_from_teaspoon_root?
       Rake::Task["default"].prerequisites.clear
       Rake::Task["default"].clear

data/lib/teaspoon/command_line.rb

@@ -56,6 +56,9 @@ module Teaspoon
           "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_port, "--server-port PORT",
           "Sets the server to use a specific port."
 

data/lib/teaspoon/configuration.rb

@@ -25,13 +25,14 @@ module Teaspoon
 
     # console runner specific
 
-    cattr_accessor :driver, :driver_options, :driver_timeout, :server, :server_port, :server_timeout, :fail_fast,
+    cattr_accessor :driver, :driver_options, :driver_timeout, :server, :server_host, :server_port, :server_timeout, :fail_fast,
                    :formatters, :color, :suppress_log,
                    :use_coverage
     @@driver         = Teaspoon::Driver.default
     @@driver_options = nil
     @@driver_timeout = 180
     @@server         = nil
+    @@server_host    = nil
     @@server_port    = nil
     @@server_timeout = 20
     @@fail_fast      = true

data/lib/teaspoon/coverage.rb

@@ -13,9 +13,12 @@ module Teaspoon
       @data = data
       @executable = Teaspoon::Instrumentation.executable
       @config = self.class.configuration
+
+      raise Teaspoon::CoverageResultsNotFoundError unless @data
     end
 
     def generate_reports(&block)
+
       input_path do |input|
         results = []
         @config.reports.each do |format|

data/lib/teaspoon/engine.rb

@@ -95,3 +95,24 @@ module Teaspoon
     end
   end
 end
+
+begin
+  require 'action_view'
+  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[:debug] = options['allow_non_precompiled']
+        sources.uniq.map { |source|
+          tag_options = {
+            "src" => path_to_javascript(source, path_options)
+          }.merge!(options)
+          content_tag(:script, "", tag_options)
+        }.join("\n").html_safe
+      end
+    end
+  end
+rescue
+end

data/lib/teaspoon/exceptions.rb

@@ -151,4 +151,11 @@ module Teaspoon
       super(msg)
     end
   end
+
+  class CoverageResultsNotFoundError < Teaspoon::Error
+    def initialize(msg = nil)
+      msg ||= "You requested coverage reports, but no results were found. Are all files being ignored in your coverage config? If you have expand_assets set to false, you will need to remove spec_helper from the ignore list."
+      super(msg)
+    end
+  end
 end

data/lib/teaspoon/formatter/base.rb

@@ -145,7 +145,8 @@ module Teaspoon
 
       def filename(file)
         uri = URI(file)
-        params = uri.query.split("&").reject do |param|
+
+        params = String(uri.query).split("&").reject do |param|
           RESERVED_PARAMS.include?(param.split("=").first)
         end
 

data/lib/teaspoon/server.rb

@@ -4,9 +4,10 @@ require "webrick"
 
 module Teaspoon
   class Server
-    attr_accessor :port
+    attr_accessor :port, :host
 
     def initialize
+      @host = Teaspoon.configuration.server_host || "127.0.0.1"
       @port = Teaspoon.configuration.server_port || find_available_port
     end
 
@@ -24,14 +25,14 @@ module Teaspoon
     end
 
     def responsive?
-      TCPSocket.new("127.0.0.1", port).close
+      TCPSocket.new(host, port).close
       true
     rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
       false
     end
 
     def url
-      "http://127.0.0.1:#{port}"
+      "http://#{host}:#{port}"
     end
 
     protected
@@ -54,6 +55,7 @@ module Teaspoon
     def rack_options
       {
         app: Rails.application,
+        Host: host,
         Port: port,
         environment: "test",
         AccessLog: [],
@@ -63,7 +65,7 @@ module Teaspoon
     end
 
     def find_available_port
-      server = TCPServer.new("127.0.0.1", 0)
+      server = TCPServer.new(host, 0)
       server.addr[1]
     ensure
       server.close if server

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Teaspoon: A Javascript test runner built on top of Rails'