teaspoon-qunit 1.18.0 → 1.19.0

data/lib/teaspoon/qunit/assets/teaspoon/qunit/spec.coffee

@@ -1,9 +1,9 @@
-class Teaspoon.Qunit.Spec
+class Teaspoon.Qunit.Spec extends Teaspoon.Spec
 
   constructor: (@spec) ->
     @fullDescription = "#{@spec.module} #{@spec.name}"
     @description = "#{@spec.name} (#{@spec.failed}, #{@spec.passed}, #{@spec.total})"
-    @link = "?grep=#{encodeURIComponent("#{@spec.module}: #{@spec.name}")}"
+    @link = @filterUrl("#{@spec.module}: #{@spec.name}")
     @parent = if @spec.module then new Teaspoon.Qunit.Suite({description: @spec.module}) else null
     @suiteName = @spec.module
     @viewId = @spec.viewId

data/lib/teaspoon/qunit/assets/teaspoon/qunit/suite.coffee

@@ -1,16 +1,9 @@
-class Teaspoon.Qunit.Suite
+class Teaspoon.Qunit.Suite extends Teaspoon.Suite
 
   constructor: (@suite) ->
     # In QUnit 1.14, moduleStart uses @suite.name,
     # moduleDone uses @suite.description
     @fullDescription = @suite.description || @suite.name
     @description = @suite.description || @suite.name
-    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @link = @filterUrl(@fullDescription)
     @parent = null
-
-
-# Shim since HTML.SuiteView still initializes the base class.
-# TODO: inject instance into SuiteView
-class Teaspoon.Suite
-  constructor: (suite) ->
-    return new Teaspoon.Qunit.Suite(suite)

data/lib/teaspoon/qunit/framework.rb

@@ -7,7 +7,7 @@ module Teaspoon
       framework_name :qunit
 
       # register standard versions
-      versions = ["1.12.0", "1.13.0", "1.14.0", "1.15.0", "1.16.0", "1.17.1", "1.18.0"]
+      versions = ["1.12.0", "1.13.0", "1.14.0", "1.15.0", "1.16.0", "1.17.1", "1.18.0", "1.19.0"]
 
       versions.each do |version|
         register_version version, "qunit/#{version}.js",

data/lib/teaspoon/qunit/templates/test_helper.coffee

@@ -4,7 +4,7 @@
 #
 # PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 # Use this polyfill to avoid the confusion.
-#= require support/bind-poly
+#= require support/phantomjs-shims
 #
 # You can require your own javascript files here. By default this will include everything in application, however you
 # may get better load performance if you require the specific files that are being used in the test that tests them.

data/lib/teaspoon/qunit/templates/test_helper.js

@@ -4,7 +4,7 @@
 //
 // PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 // Use this polyfill to avoid the confusion.
-//= require support/bind-poly
+//= require support/phantomjs-shims
 //
 // You can require your own javascript files here. By default this will include everything in application, however you
 // may get better load performance if you require the specific files that are being used in the test that tests them.

data/lib/teaspoon/qunit/version.rb

@@ -1,5 +1,5 @@
 module Teaspoon
   module Qunit
-    VERSION = "1.18.0"
+    VERSION = "1.19.0"
   end
 end

data/spec/console_spec.rb

@@ -2,29 +2,29 @@ require_relative "./spec_helper"
 
 feature "Running in the console", shell: true do
   let(:expected_loading_output) do
-    <<-OUTPUT.strip_heredoc
+    Regexp.new(<<-OUTPUT.strip_heredoc)
       Starting the Teaspoon server...
-      Teaspoon running default suite at http://127.0.0.1:31337/teaspoon/default
+      Teaspoon running default suite at http://127\\.0\\.0\\.1:31337/teaspoon/default
     OUTPUT
   end
 
   let(:expected_testing_output) do
-    <<-OUTPUT.strip_heredoc
+    Regexp.new(<<-OUTPUT.strip_heredoc)
       FFFit can log to the console
-      ..
+      \\.\\.
 
       Failures:
 
-        1)  global failure (1, 0, 1)
-           Failure/Error: TypeError: undefined is not a constructor (evaluating 'foo()')
+        1\\)  global failure \\(1, 0, 1\\)
+           Failure/Error: TypeError: undefined is not a constructor \\(evaluating 'foo\\(\\)'\\)
 
-        2) Integration tests allows failing specs (1, 0, 1)
+        2\\) Integration tests allows failing specs \\(1, 0, 1\\)
            Failure/Error: fails correctly
 
-        3) Integration tests allows erroring specs (1, 0, 1)
+        3\\) Integration tests allows erroring specs \\(1, 0, 1\\)
            Failure/Error: errors correctly
 
-      Finished in 0.31337 seconds
+      Finished in 0\\.31337 seconds
       5 examples, 3 failures
 
       Failed examples:
@@ -40,7 +40,10 @@ feature "Running in the console", shell: true do
   end
 
   before do
-    teaspoon_test_app("gem 'teaspoon-qunit', path: '#{Teaspoon::DEV_PATH}'")
+    teaspoon_test_app(<<-GEMFILE)
+      gem 'teaspoon', path: '#{Teaspoon::DEV_PATH}'
+      gem 'teaspoon-qunit', path: '#{Teaspoon::DEV_PATH}'
+    GEMFILE
     install_teaspoon("--coffee --version=#{version}")
     copy_integration_files("test", File.expand_path("../../test", __FILE__), "test")
   end
@@ -48,15 +51,15 @@ feature "Running in the console", shell: true do
   it "runs successfully using the CLI" do
     run_teaspoon("--no-color")
 
-    expect(teaspoon_output).to include(expected_loading_output)
-    expect(teaspoon_output).to include(expected_testing_output)
+    expect(teaspoon_output).to match(expected_loading_output)
+    expect(teaspoon_output).to match(expected_testing_output)
   end
 
   it "runs successfully using the rake task" do
     rake_teaspoon("COLOR=false")
 
-    expect(teaspoon_output).to include(expected_loading_output)
-    expect(teaspoon_output).to include(expected_testing_output)
+    expect(teaspoon_output).to match(expected_loading_output)
+    expect(teaspoon_output).to match(expected_testing_output)
   end
 
   it "can display coverage information" do

data/spec/installation_spec.rb

@@ -2,7 +2,10 @@ require_relative "./spec_helper"
 
 feature "Installation", shell: true do
   before do
-    teaspoon_test_app("gem 'teaspoon-qunit', path: '#{Teaspoon::DEV_PATH}'")
+    teaspoon_test_app(<<-GEMFILE)
+      gem 'teaspoon', path: '#{Teaspoon::DEV_PATH}'
+      gem 'teaspoon-qunit', path: '#{Teaspoon::DEV_PATH}'
+    GEMFILE
   end
 
   it "installs the expected files" do
@@ -15,8 +18,8 @@ feature "Installation", shell: true do
       create  test/javascripts/test_helper.js
     OUTPUT
 
-    check_file_content("test/teaspoon_env.rb", /suite\.use_framework :qunit, "\d+\.\d+\.\d+"/)
-    check_file_content("test/javascripts/test_helper.js", Regexp.new("require support/your-support-file"))
+    expect("test/teaspoon_env.rb").to have_file_content(/suite\.use_framework :qunit, "\d+\.\d+\.\d+"/)
+    expect("test/javascripts/test_helper.js").to have_file_content(Regexp.new("require support/your-support-file"))
   end
 
   it "can install coffeescript and the teaspoon_env without comments" do
@@ -29,7 +32,7 @@ feature "Installation", shell: true do
       create  test/javascripts/test_helper.coffee
     OUTPUT
 
-    check_file_content("test/teaspoon_env.rb", /suite\.use_framework :qunit, "\d+\.\d+\.\d+"/)
-    check_file_content("test/javascripts/test_helper.coffee", Regexp.new("require support/your-support-file"))
+    expect("test/teaspoon_env.rb").to have_file_content(/suite\.use_framework :qunit, "\d+\.\d+\.\d+"/)
+    expect("test/javascripts/test_helper.coffee").to have_file_content(Regexp.new("require support/your-support-file"))
   end
 end

data/test/javascripts/qunit/spec_test.coffee

@@ -16,15 +16,20 @@ module "Teaspoon.Qunit.Spec",
       assertions: @mockAssertions
 
 test "constructor", 7, ->
+  originalParams = Teaspoon.params
+  Teaspoon.params.file = "spec.js"
+
   spec = new Teaspoon.Qunit.Spec(@mockSpec)
   ok(spec.fullDescription == "_full qunit name_ _description_", "sets fullDescription")
   ok(spec.description == "_description_ (1, 2, 3)", "sets description")
-  ok(spec.link == "?grep=_full%20qunit%20name_%3A%20_description_", "sets link")
+  ok(spec.link == "?grep=_full%20qunit%20name_%3A%20_description_&file=spec.js", "sets link")
   ok(spec.parent.description == "_full qunit name_", "builds a parent suite")
   ok(spec.suiteName == "_full qunit name_", "sets suiteName")
   ok(spec.viewId == 420, "sets viewId")
   ok(spec.pending == false, "sets pending to false") # no pending support
 
+  Teaspoon.params = originalParams
+
 test "#errors", 5, ->
   errors = new Teaspoon.Qunit.Spec(@mockSpec).errors()
   ok(errors.length == 4, "returns the correct length array")

data/test/javascripts/qunit/suite_test.coffee

@@ -3,8 +3,13 @@ module "Teaspoon.Qunit.Suite",
     @mockSuite = description: "_full qunit description_"
 
 test "constructor", 4, ->
+  originalParams = Teaspoon.params
+  Teaspoon.params.file = "spec.js"
+
   suite = new Teaspoon.Qunit.Suite(@mockSuite)
   ok(suite.fullDescription == "_full qunit description_", "sets fullDescription")
   ok(suite.description == "_full qunit description_", "sets description")
-  ok(suite.link == "?grep=_full%20qunit%20description_", "sets link")
+  ok(suite.link == "?grep=_full%20qunit%20description_&file=spec.js", "sets link")
   ok(suite.parent == null, "sets parent to null") # no structure to consider
+
+  Teaspoon.params = originalParams

data/test/teaspoon_env.rb

@@ -6,7 +6,7 @@ Teaspoon.configure do |config|
   config.fixture_paths << Teaspoon::FIXTURE_PATH
 
   config.suite do |suite|
-    suite.use_framework :qunit, "1.18.0"
+    suite.use_framework :qunit, "1.19.0"
     suite.matcher = "#{path}/**/*_test.{js,js.coffee,coffee}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon-qunit
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - jejacks0n
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teaspoon
@@ -41,6 +41,7 @@ files:
 - lib/teaspoon/qunit/assets/qunit/1.16.0.js
 - lib/teaspoon/qunit/assets/qunit/1.17.1.js
 - lib/teaspoon/qunit/assets/qunit/1.18.0.js
+- lib/teaspoon/qunit/assets/qunit/1.19.0.js
 - lib/teaspoon/qunit/assets/qunit/MIT.LICENSE
 - lib/teaspoon/qunit/assets/teaspoon-qunit.js
 - lib/teaspoon/qunit/assets/teaspoon/qunit.coffee
@@ -97,7 +98,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 QUnit: A Javascript test runner built on top of Rails for QUnit'