Only show deprecation for catch exceptions if you tell Jasmine not to…

… catch - Fixes #1497
jasmine · Feb 7, 2018 · fbec3cc · fbec3cc
1 parent 4530f94
commit fbec3cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js
@@ -903,8 +903,10 @@ getJasmineRequireObj().Env = function(j$) {
 
     // TODO: fix this naming, and here's where the value comes in
     this.catchExceptions = function(value) {
-      this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
       catchExceptions = !!value;
+      if (!catchExceptions) {
+        this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
+      }
       return catchExceptions;
     };
 

diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb
@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.99.0"
+    VERSION = "2.99.1"
   end
 end
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "2.99.0",
+  "version": "2.99.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/jasmine/jasmine.git"

diff --git a/src/core/Env.js b/src/core/Env.js
@@ -198,8 +198,10 @@ getJasmineRequireObj().Env = function(j$) {
 
     // TODO: fix this naming, and here's where the value comes in
     this.catchExceptions = function(value) {
-      this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
       catchExceptions = !!value;
+      if (!catchExceptions) {
+        this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
+      }
       return catchExceptions;
     };