Merge pull request #381 from mcmire/fix-jasmine-2-try-catch

Fix try/catch on Jasmine 2 so that it works again
jejacks0n · Jun 29, 2015 · 9796f89 · 9796f89
2 parents c7ac493 + 1652599
commit 9796f89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/teaspoon-jasmine/lib/teaspoon/jasmine/assets/teaspoon/jasmine2/reporters/html.coffee b/teaspoon-jasmine/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: ->

diff --git a/teaspoon-jasmine/spec/javascripts/jasmine2/reporters/html_spec.coffee b/teaspoon-jasmine/spec/javascripts/jasmine2/reporters/html_spec.coffee
@@ -8,8 +8,7 @@ describe "Teaspoon.Jasmine2.Reporters.HTML", ->
 
     it "sets jasmine.CATCH_EXCEPTIONS", ->
       @reporter.readConfig()
-      expect(jasmine.CATCH_EXCEPTIONS).toBe(@reporter.config["use-catch"])
-
+      expect(jasmine.getEnv().catchingExceptions()).toBe(@reporter.config["use-catch"])
 
   describe "#envInfo", ->