teaspoon-jasmine 2.2.0 → 2.3.4

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine1/spec.coffee

@@ -1,9 +1,9 @@
-class Teaspoon.Jasmine1.Spec
+class Teaspoon.Jasmine1.Spec extends Teaspoon.Spec
 
   constructor: (@spec) ->
     @fullDescription = @spec.getFullName()
     @description = @spec.description
-    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @link = @filterUrl(@fullDescription)
     @parent = @spec.suite
     @suiteName = @parent.getFullName()
     @viewId = @spec.viewId

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine1/suite.coffee

@@ -1,8 +1,8 @@
-class Teaspoon.Jasmine1.Suite
+class Teaspoon.Jasmine1.Suite extends Teaspoon.Suite
 
   constructor: (@suite) ->
     @fullDescription = @suite.getFullName()
     @description = @suite.description
-    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @link = @filterUrl(@fullDescription)
     @parent = @suite.parentSuite
     @viewId = @suite.viewId

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine2/reporters/html.coffee

@@ -4,7 +4,7 @@ class Teaspoon.Jasmine2.Reporters.HTML extends Teaspoon.Reporters.HTML
 
   readConfig: ->
     super
-    jasmine.CATCH_EXCEPTIONS = @config["use-catch"]
+    jasmine.getEnv().catchExceptions(@config["use-catch"])
 
 
   envInfo: ->

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine2/spec.coffee

@@ -1,11 +1,12 @@
-class Teaspoon.Jasmine2.Spec
+class Teaspoon.Jasmine2.Spec extends Teaspoon.Spec
 
   constructor: (@spec) ->
     @fullDescription = @spec.fullName
     @description = @spec.description
-    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @link = @filterUrl(@fullDescription)
     @parent = @spec.parent
-    @suiteName = @parent.fullName
+    # spec may not have a parent if it's being focused
+    @suiteName = @parent.fullName if @parent
     @viewId = @spec.id
     @pending = @spec.status == "pending"
 
@@ -29,7 +30,7 @@ class Teaspoon.Jasmine2.Spec
 
   result: ->
     status: @status()
-    skipped: @spec.status == "disabled"
+    skipped: @spec.status == "disabled" || @pending
 
 
   status: ->

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine2/suite.coffee

@@ -1,8 +1,8 @@
-class Teaspoon.Jasmine2.Suite
+class Teaspoon.Jasmine2.Suite extends Teaspoon.Suite
 
   constructor: (@suite) ->
     @fullDescription = @suite.fullName
     @description = @suite.description
-    @link = "?grep=#{encodeURIComponent(@fullDescription)}"
+    @link = @filterUrl(@fullDescription)
     @parent = @suite.parent
     @viewId = @suite.id

data/lib/teaspoon/jasmine/framework.rb

@@ -11,7 +11,7 @@ module Teaspoon
                                 dependencies: ["teaspoon-jasmine1.js"],
                                 dev_deps: ["teaspoon/jasmine1.js"]
 
-      versions = ["2.0.3", "2.1.3", "2.2.0"]
+      versions = ["2.0.3", "2.1.3", "2.2.0", "2.2.1", "2.3.4"]
 
       versions.each do |version|
         register_version version, "jasmine/#{version}.js",

data/lib/teaspoon/jasmine/templates/spec_helper.coffee

@@ -7,7 +7,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 spec that tests them.

data/lib/teaspoon/jasmine/templates/spec_helper.js

@@ -7,7 +7,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 spec that tests them.

data/lib/teaspoon/jasmine/version.rb

@@ -1,5 +1,5 @@
 module Teaspoon
   module Jasmine
-    VERSION = "2.2.0"
+    VERSION = "2.3.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.4
 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
@@ -38,6 +38,8 @@ files:
 - lib/teaspoon/jasmine/assets/jasmine/2.0.3.js
 - lib/teaspoon/jasmine/assets/jasmine/2.1.3.js
 - lib/teaspoon/jasmine/assets/jasmine/2.2.0.js
+- lib/teaspoon/jasmine/assets/jasmine/2.2.1.js
+- lib/teaspoon/jasmine/assets/jasmine/2.3.4.js
 - lib/teaspoon/jasmine/assets/jasmine/MIT.LICENSE
 - lib/teaspoon/jasmine/assets/support/jasmine-jquery-1.7.0.js
 - lib/teaspoon/jasmine/assets/support/jasmine-jquery-2.0.0.js
@@ -55,7 +57,6 @@ files:
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2.coffee
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2/fixture.coffee
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2/initialize.coffee
-- lib/teaspoon/jasmine/assets/teaspoon/jasmine2/reporters/console.coffee
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2/reporters/html.coffee
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2/responder.coffee
 - lib/teaspoon/jasmine/assets/teaspoon/jasmine2/runner.coffee
@@ -85,7 +86,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 Jasmine: A Javascript test runner built on top of Rails for Jasmine'

data/lib/teaspoon/jasmine/assets/teaspoon/jasmine2/reporters/console.coffee

@@ -1,18 +0,0 @@
-#= require teaspoon/reporters/console
-
-class Teaspoon.Jasmine2.Reporters.Console extends Teaspoon.Reporters.Console
-
-  reportRunnerStarting: ->
-    @currentAssertions = []
-    @log
-      type:  "runner"
-      total: null
-      start: JSON.parse(JSON.stringify(@start))
-
-
-  reportRunnerResults: =>
-    @log
-      type:    "result"
-      elapsed: ((new Teaspoon.Date().getTime() - @start.getTime()) / 1000).toFixed(5)
-      coverage: window.__coverage__
-    Teaspoon.finished = true