teaspoon 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6947cdfc11c4b82dfb1c0db440b2effbcaa2b69
-  data.tar.gz: 0d792be5439b2f8b55c458620556e0ee9030aca4
+  metadata.gz: d648d120a3291ff212bf062258587a21f1ac8108
+  data.tar.gz: 82a0bc09c853b64f7af62d41e83eab9f29bb9245
 SHA512:
-  metadata.gz: eb2cc7fb2e22d878e9f6a5877ddc71b8c21c7b004d17b1dfc76e3d6ea8e2fad666f9927cfe9b532fec219963ed27d21a0abb0dc3d712007b0057bf0a7a42a544
-  data.tar.gz: d7eab6abba8e2479aad8fe1551ea1e3c3358fe1b54b9cf8262acc7504f992e7df6ba392996b869f9458a6733eaf9d33160f6df4169695c713f65f5b20914280e
+  metadata.gz: 0d40d4cda9de76dd8c641af719e3c86b8c37b40b554c18415cbb583757552d6a6fda5fdb89a5e906638fab73c52aec66ff25677c43d78a120687bdbef51b4259
+  data.tar.gz: ed02beab78edf289befa77c321f46469dc1a777877c598b70def697dea0a033e782b21f88ce4fa5e25124293a41746506085b1127b5cca32fb4518371541b159

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 ### Unreleased
 
+#### Bug Fixes
+
+
+### 1.1.0
+
+#### Enhancements
+
+* Support invalid HTML in fixtures (#387)
+* Configurable JavaScript extensions via suite.js_extensions (#418)
+* Fail build when Phantomjs fails (b34c4)
+* Add new versions of test frameworks to the latest minor versions
+
+#### Bug Fixes
+
+* Retain file filter when navigating to specs (#327)
+* Provide details when Istanbul fails (#368)
+* Fix support for barebones Rails app (#372)
+* Fix pending count and nested styles (#373)
+* Fix total count in Jasmine 2 (#378)
+* Deprecate and fix suite.use_framework= (#394)
+* Fix capybara-webkit synchronization (#403)
+* Fix reporting in IE8 (97cf6)
+* Fix Jasmine's "fit" (f5e2a)
+
+
 ### 1.0.2 (5/5/15)
 
 #### Bug Fixes
@@ -20,8 +45,19 @@
 #### Upgrade Steps
 
 - **Update your Gemfile**<br>
-  Change your Gemfile to use "teaspoon-framework" instead of "teaspoon".<br>
-  eg: If you are using Mocha, this would be `gem 'teaspoon-mocha'`
+  Change your Gemfile to use `teaspoon-jasmine` instead of `teaspoon`, if you're using Jasmine. If you're using Mocha, this would be `teaspoon-mocha`. Use `teaspoon-qunit` for QUnit.<br>
+  eg: For Jasmine:
+  ```ruby
+  gem 'teaspoon-jasmine'
+  ```
+  For Mocha:
+  ```ruby
+  gem 'teaspoon-mocha'
+  ```
+  For QUnit:
+  ```ruby
+  gem 'teaspoon-qunit'
+  ```
 
   If you had Teaspoon locked at a specific version, kill the version. You'll now need to reference the version of the framework, instead of the version of Teaspoon.<br>
   eg: If your Gemfile has `gem 'teaspoon', '0.9.1'` and you're using Mocha, you'll want your Gemfile to reference the latest version of Mocha: `gem 'teaspoon-mocha', '2.2.4'`. The teaspoon-mocha gem contains previous versions of Mocha, so even if you're not using version 2.2.4 of Mocha in your `teaspoon_env.rb`, still reference the latest version in your Gemfile and the older version should still work.

data/README.md

@@ -329,6 +329,31 @@ All files           |     93.75 |        75 |     94.12 |     93.65 |
 --------------------+-----------+-----------+-----------+-----------+
 ```
 
+### Caveats
+
+In order to provide accurate coverage and best performance, it is recommended that you require the implementation file directly from the spec file. For example:
+
+```js
+//= require "my_class"
+describe("MyClass", function() { ... });
+```
+
+It is **not** recommended that you require the entirety of your assets from within your spec helper:
+
+***spec_helper.js***
+```js
+//= require "application"
+```
+
+If you must require `application` from your spec helper and you have `expand_assets` configuration set to `false`, you'll need to exclude the spec helper from ignored coverage files:
+
+***teaspoon_env.rb***
+```ruby
+config.coverage do |coverage|
+  coverage.ignore = coverage.ignore.reject { |matcher| matcher.match('/spec_helper.') }
+end
+```
+
 ### Thresholds
 
 Teaspoon allows defining coverage threshold requirements. If a threshold is not met, it will cause a test run failure.

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

@@ -63,18 +63,22 @@ class Teaspoon.Fixture
 
   putContent = (content) =>
     cleanup()
-    create()
-    window.fixture.el.innerHTML = content
+    addContent(content)
 
 
   addContent = (content) =>
     create() unless window.fixture.el
-    window.fixture.el.innerHTML += content
+
+    if jQueryAvailable()
+      parsed = $($.parseHTML(content, document, true))
+      window.fixture.el.appendChild(parsed[i]) for i in [0...parsed.length]
+    else
+      window.fixture.el.innerHTML += content
 
 
   create = =>
     window.fixture.el = document.createElement("div")
-    window.fixture.$el = $(window.fixture.el) if typeof(window.$) == 'function'
+    window.fixture.$el = $(window.fixture.el) if jQueryAvailable()
     window.fixture.el.id = "teaspoon-fixtures"
     document.body?.appendChild(window.fixture.el)
 
@@ -98,3 +102,7 @@ class Teaspoon.Fixture
     xhr.onreadystatechange = callback
     xhr.open("GET", "#{Teaspoon.root}/fixtures/#{url}", false)
     xhr.send()
+
+
+  jQueryAvailable = ->
+    typeof(window.$) == 'function'

data/app/assets/javascripts/teaspoon/mixins/_namespace.coffee

@@ -0,0 +1 @@
+Teaspoon.Mixins ||= {}

data/app/assets/javascripts/teaspoon/mixins/filter_url.coffee

@@ -0,0 +1,6 @@
+Teaspoon.Mixins.FilterUrl =
+  filterUrl: (grep) ->
+    params = []
+    params.push("grep=#{encodeURIComponent(grep)}")
+    params.push("file=#{Teaspoon.params.file}") if Teaspoon.params.file
+    "?#{params.join("&")}"

data/app/assets/javascripts/teaspoon/reporters/console.coffee

@@ -41,44 +41,57 @@ class Teaspoon.Reporters.Console
 
   reportSpecResults: (@spec) ->
     result = @spec.result()
-    return if result.skipped
+
+    if result.status == "pending"
+      @trackPending(@spec)
+    else if result.status == "failed"
+      @trackFailed(@spec)
+    else if result.skipped
+      @trackDisabled(@spec)
+    else
+      @trackPassed(@spec)
+
+
+  trackPending: (spec) ->
     @reportSuites()
-    switch result.status
-      when "pending" then @trackPending()
-      when "failed" then @trackFailure()
-      else
-        @log
-          type:    "spec"
-          suite:   @spec.suiteName
-          label:   @spec.description
-          status:  result.status
-          skipped: result.skipped
-
-
-  trackPending: ->
-    result = @spec.result()
+    result = spec.result()
     @log
       type:    "spec"
-      suite:   @spec.suiteName
-      label:   @spec.description
+      suite:   spec.suiteName
+      label:   spec.description
       status:  result.status
       skipped: result.skipped
 
 
-  trackFailure: ->
-    result = @spec.result()
-    for error in @spec.errors()
+  trackFailed: (spec) ->
+    @reportSuites()
+    result = spec.result()
+    for error in spec.errors()
       @log
         type:    "spec"
-        suite:   @spec.suiteName
-        label:   @spec.description
+        suite:   spec.suiteName
+        label:   spec.description
         status:  result.status
         skipped: result.skipped
-        link:    @spec.fullDescription
+        link:    spec.fullDescription
         message: error.message
         trace:   error.stack || error.message || "Stack Trace Unavailable"
 
 
+  trackDisabled: (spec) -> # noop
+
+
+  trackPassed: (spec, result) ->
+    @reportSuites()
+    result = spec.result()
+    @log
+      type:    "spec"
+      suite:   spec.suiteName
+      label:   spec.description
+      status:  result.status
+      skipped: result.skipped
+
+
   log: (obj = {}) ->
     obj["_teaspoon"] = true
     Teaspoon.log(JSON.stringify(obj))

data/app/assets/javascripts/teaspoon/reporters/html.coffee

@@ -43,8 +43,8 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
     @setStatus("passed") unless @total.failures
     @setText("stats-passes", @total.passes)
     @setText("stats-failures", @total.failures)
-    if @total.run < @total.exist
-      @total.skipped = @total.exist - @total.run
+    if @total.run < @total.exist # For frameworks that don't "run" skipped specs
+      @total.skipped = @total.exist - @total.run + @total.skipped
       @total.run = @total.exist
     @setText("stats-skipped", @total.skipped)
     @updateProgress()
@@ -65,6 +65,7 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
     @total.run += 1
     @updateProgress()
     @updateStatus(spec)
+    delete @reportView
 
 
   buildLayout: ->
@@ -106,25 +107,22 @@ class Teaspoon.Reporters.HTML extends Teaspoon.Reporters.BaseView
 
 
   updateStatus: (spec) ->
+    elapsed = new Teaspoon.Date().getTime() - @specStart
+    @reportView?.updateState(spec, elapsed)
+
     result = spec.result()
 
-    if result.skipped
+    if result.status == "pending"
       @updateStat("skipped", @total.skipped += 1)
-      return
-
-    elapsed = new Teaspoon.Date().getTime() - @specStart
-
-    if result.status == "passed"
-      @updateStat("passes", @total.passes += 1)
-      @reportView?.updateState("passed", elapsed)
-    else if result.status == "pending"
-      @reportView?.updateState("pending", elapsed)
-    else
+    else if result.status == "failed"
       @updateStat("failures", @total.failures += 1)
-      @reportView?.updateState("failed", elapsed)
       unless @config["build-full-report"]
         new (Teaspoon.resolveClass("Reporters.HTML.FailureView"))(spec).appendTo(@findEl("report-failures"))
       @setStatus("failed")
+    else if result.skipped
+      @updateStat("skipped", @total.skipped += 1)
+    else
+      @updateStat("passes", @total.passes += 1)
 
 
   updateProgress: ->

data/app/assets/javascripts/teaspoon/reporters/html/spec_view.coffee

@@ -22,6 +22,7 @@ class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
 
   buildParent: ->
     parent = @spec.parent
+    return @reporter unless parent
     if parent.viewId
       @views.suites[parent.viewId]
     else
@@ -38,11 +39,46 @@ class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
     @append(div)
 
 
-  updateState: (state, elapsed) ->
-    result = @spec.result()
-    classes = ["state-#{state}"]
-    classes.push("slow") if elapsed > Teaspoon.slow
-    @el.innerHTML += "<span>#{elapsed}ms</span>" if state == "passed"
-    @el.className = classes.join(" ")
-    @buildErrors() if result.status == "failed"
-    @parentView.updateState?(state)
+  updateState: (spec, elapsed) ->
+    result = spec.result()
+    @clearClasses()
+
+    if result.status == "pending"
+      @updatePending(spec, elapsed)
+    else if result.status == "failed"
+      @updateFailed(spec, elapsed)
+    else if result.skipped
+      @updateDisabled(spec, elapsed)
+    else
+      @updatePassed(spec, elapsed)
+
+
+  updatePassed: (spec, elapsed) ->
+    @addStatusClass("passed")
+    @addClass("slow") if elapsed > Teaspoon.slow
+    @el.innerHTML += "<span>#{elapsed}ms</span>"
+
+
+  updateFailed: (spec, elapsed) ->
+    @addStatusClass("failed")
+    @buildErrors()
+    @parentView.updateState?("failed")
+
+
+  updatePending: (spec, elapsed) ->
+    @addStatusClass("pending")
+
+
+  updateDisabled: (spec, elapsed) -> # noop
+
+
+  clearClasses: ->
+    @el.className = ""
+
+
+  addStatusClass: (status) ->
+    @addClass("state-#{status}")
+
+
+  addClass: (name) ->
+    @el.className += " #{name}"

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

@@ -0,0 +1,2 @@
+class Teaspoon.Spec
+  Teaspoon.Utility.include(@, Teaspoon.Mixins.FilterUrl)

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

@@ -0,0 +1,2 @@
+class Teaspoon.Suite
+  Teaspoon.Utility.include(@, Teaspoon.Mixins.FilterUrl)

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

@@ -1,7 +1,11 @@
 #= require_self
+#= require_tree ./mixins
+#= require teaspoon/utility
 #= require teaspoon/runner
 #= require teaspoon/fixture
 #= require teaspoon/hook
+#= require teaspoon/spec
+#= require teaspoon/suite
 #= require teaspoon/reporters/html
 #= require teaspoon/reporters/console
 
@@ -53,7 +57,7 @@ class @Teaspoon
 
   @log: ->
     Teaspoon.messages.push(arguments[0])
-    try console.log(arguments...)
+    try console?.log?(arguments...)
     catch e
       throw new Error("Unable to use console.log for logging")
 

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

@@ -0,0 +1,7 @@
+class Teaspoon.Utility
+  @extend: (obj, mixin) ->
+    obj[name] = method for name, method of mixin
+    obj
+
+  @include: (klass, mixin) ->
+    @extend(klass.prototype, mixin)

data/app/assets/stylesheets/teaspoon.css

@@ -117,13 +117,7 @@ html[xmlns] #teaspoon-interface .teaspoon-clearfix {
   width: 87px;
   height: 34px;
   -webkit-transform: rotate(-18deg);
-  -moz-transform: rotate(-18deg);
   transform: rotate(-18deg);
-  background: -moz-linear-gradient(top, rgba(255, 255, 255,0) 0%, rgba(255, 255, 255, 0.3) 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0.3)));
-  background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255, 255, 255, 0.3) 100%);
-  background: -o-linear-gradient(top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.3) 100%);
-  background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.3) 100%);
   background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.3) 100%);
   content: "\00a0";
 }
@@ -176,21 +170,13 @@ html[xmlns] #teaspoon-interface .teaspoon-clearfix {
   outline: none;
   border-radius: 0.4em;
   background-color: #fff;
-  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.05));
-  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.05));
-  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.05));
-  background-image: -ms-linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.05));
   background-image: linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.05));
-  -webkit-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.5);
-  -moz-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.5);
   box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.5);
   text-align: center;
   cursor: pointer;
 }
 #teaspoon-controls button:active,
 #teaspoon-controls button.active {
-  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
   box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
   background: #D9D9D9;
   outline: 0;

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

@@ -68,6 +68,9 @@ Teaspoon.configure do |config|
     # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default, 
     # Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
     #suite.expand_assets = true
+
+    # Non-.js file extensions Teaspoon should consider JavaScript files
+    #suite.js_extensions = [/(\.js)?.coffee/, /(\.js)?.es6/, ".es6.js"]
   end
 
   # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also

data/lib/tasks/teaspoon.rake

@@ -9,5 +9,7 @@ task teaspoon: :environment do
     driver_options: ENV["driver_options"],
   }
 
+  options.delete_if { |k, v| v.nil? }
+
   abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
 end

data/lib/teaspoon-devkit.rb

@@ -28,6 +28,7 @@ module Teaspoon
     framework_name = options[:framework_name]
     framework_const = options[:framework_const]
     framework_root = options[:framework_root]
+    framework_env = options[:framework_env]
     compile_assets = options[:compile_assets]
 
     namespace :teaspoon do
@@ -36,9 +37,20 @@ module Teaspoon
         RSpec::Core::RakeTask.new(:spec) do |t|
           t.pattern = File.expand_path("spec/**/*_spec.rb", framework_root)
         end
-      end
 
-      namespace framework do
+        desc "Run the #{framework_name} javascript tests"
+        task :jsspec do
+          rails_env = File.expand_path("spec/dummy/config/environment.rb", DEV_PATH)
+          cmd = "rake teaspoon TEASPOON_DEVELOPMENT=true TEASPOON_RAILS_ENV=#{rails_env} TEASPOON_ENV=#{framework_env}"
+
+          # we shell out to another command so that it creates a pristine runtime environment
+          IO.popen(cmd).each do |line|
+            STDOUT.print(line)
+          end.close
+
+          exit(1) unless $?.success?
+        end
+
         desc "Builds Teaspoon #{framework_name} into the distribution ready bundle"
         task build: "#{framework}:build:javascripts"
 
@@ -61,7 +73,7 @@ module Teaspoon
       Rake::Task["default"].prerequisites.clear
       Rake::Task["default"].clear
 
-      task default: "teaspoon:#{framework}:spec"
+      task default: ["teaspoon:#{framework}:spec", "teaspoon:#{framework}:jsspec"]
     end
   end
 end

data/lib/teaspoon/configuration.rb

@@ -62,7 +62,7 @@ module Teaspoon
     class Suite
       attr_accessor :matcher, :helper, :javascripts, :stylesheets,
                     :boot_partial, :body_partial,
-                    :hooks, :expand_assets
+                    :hooks, :expand_assets, :js_extensions
 
       def initialize(name = nil)
         @matcher       = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
@@ -75,6 +75,7 @@ module Teaspoon
 
         @hooks         = Hash.new { |h, k| h[k] = [] }
         @expand_assets = true
+        @js_extensions = [/(\.js)?\.coffee/, /(\.js)?\.es6/, ".es6.js"]
 
         default = Teaspoon.configuration.suite_configs["default"]
         instance_eval(&default[:block]) if default
@@ -93,7 +94,6 @@ module Teaspoon
 
         raise Teaspoon::UnknownFrameworkVersion.new(name: name, version: version)
       end
-      alias_method :use_framework=, :use_framework
 
       def hook(group = :default, &block)
         @hooks[group.to_s] << block

data/lib/teaspoon/coverage.rb

@@ -56,7 +56,7 @@ module Teaspoon
       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.")
+      raise Teaspoon::DependencyError.new("Unable to generate #{format} coverage report:\n#{result}")
     end
 
     def threshold_args

data/lib/teaspoon/deprecated.rb

@@ -83,6 +83,11 @@ teaspoon coverage directive has changed and is now more flexible, define coverag
         []
       end
       alias_method :no_coverage=, :no_coverage
+
+      def use_framework=(name, _version = nil)
+        Teaspoon.dep("suite.use_framework= is deprecated, use suite.use_framework instead.")
+        use_framework(*name)
+      end
     end
   end
 end

data/lib/teaspoon/driver/capybara_webkit.rb

@@ -11,18 +11,22 @@ require "teaspoon/driver/base"
 module Teaspoon
   module Driver
     class CapybaraWebkit < Base
+      class TeaspoonNotFinishedError < StandardError; end
       def initialize(_options = nil)
       end
 
       def run_specs(runner, url)
         session.visit(url)
 
-        session.document.synchronize(Teaspoon.configuration.driver_timeout.to_i) do
+        timeout = Teaspoon.configuration.driver_timeout.to_i
+        session.document.synchronize(timeout, errors: [TeaspoonNotFinishedError]) 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
+          unless done
+            raise TeaspoonNotFinishedError
+          end
         end
       end
 

data/lib/teaspoon/driver/phantomjs.rb

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

data/lib/teaspoon/environment.rb

@@ -28,7 +28,7 @@ module Teaspoon
 
     def self.find_env(override = nil)
       override ||= ENV["TEASPOON_ENV"]
-      env_files = override ? [override] : standard_environments
+      env_files = override && !override.empty? ? [override] : standard_environments
 
       env_files.each do |filename|
         file = File.expand_path(filename, Dir.pwd)
@@ -53,7 +53,14 @@ module Teaspoon
 
     def self.load_rails
       rails_env = ENV["TEASPOON_RAILS_ENV"] || File.expand_path("config/environment", Dir.pwd)
-      require rails_env
+
+      # Try to load rails, assume teaspoon_env will do it if the expected
+      # environment isn't found.
+      if File.exists?(rails_env)
+        require rails_env
+      else
+        require_environment
+      end
     end
   end
 end

data/lib/teaspoon/formatter/base.rb

@@ -1,6 +1,8 @@
 module Teaspoon
   module Formatter
     class Base
+      RESERVED_PARAMS = ["body", "instrument"]
+
       attr_accessor :total_count, :run_count, :passes, :pendings, :failures, :errors
 
       def initialize(suite_name = :default, output_file = nil)
@@ -142,7 +144,14 @@ module Teaspoon
       end
 
       def filename(file)
-        file.gsub(%r(^http://127.0.0.1:\d+/assets/), "").gsub(/[\?|&]?body=1/, "")
+        uri = URI(file)
+        params = uri.query.split("&").reject do |param|
+          RESERVED_PARAMS.include?(param.split("=").first)
+        end
+
+        filename = uri.path.sub(%r(^/assets/), "")
+        filename += "?#{params.join("&")}" if params.any?
+        filename
       end
     end
   end

data/lib/teaspoon/suite.rb

@@ -94,8 +94,10 @@ module Teaspoon
       normalize_js_extension(filename)
     end
 
-    def normalize_js_extension(filename)
-      filename.gsub(".erb", "").gsub(/(\.js\.coffee|\.coffee|\.es6|\.js\.es6)$/, ".js")
+    def normalize_js_extension(original_filename)
+      config.js_extensions.inject(original_filename.gsub(".erb", "")) do |filename, extension|
+        filename.gsub(Regexp.new(extension.to_s + "$"), ".js")
+      end
     end
 
     def glob

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -52,6 +52,8 @@ files:
 - app/assets/javascripts/teaspoon/error.coffee
 - app/assets/javascripts/teaspoon/fixture.coffee
 - app/assets/javascripts/teaspoon/hook.coffee
+- app/assets/javascripts/teaspoon/mixins/_namespace.coffee
+- app/assets/javascripts/teaspoon/mixins/filter_url.coffee
 - app/assets/javascripts/teaspoon/reporters/console.coffee
 - app/assets/javascripts/teaspoon/reporters/html.coffee
 - app/assets/javascripts/teaspoon/reporters/html/base_view.coffee
@@ -63,7 +65,10 @@ files:
 - app/assets/javascripts/teaspoon/reporters/html/suite_view.coffee
 - app/assets/javascripts/teaspoon/reporters/html/template.coffee
 - app/assets/javascripts/teaspoon/runner.coffee
+- app/assets/javascripts/teaspoon/spec.coffee
+- app/assets/javascripts/teaspoon/suite.coffee
 - app/assets/javascripts/teaspoon/teaspoon.coffee
+- app/assets/javascripts/teaspoon/utility.coffee
 - app/assets/stylesheets/teaspoon.css
 - app/controllers/teaspoon/suite_controller.rb
 - app/views/teaspoon/suite/_body.html.erb
@@ -144,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Teaspoon: A Javascript test runner built on top of Rails'