From fbec3cc230ae0096b3b1164d05b39a3867193755 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Wed, 7 Feb 2018 14:47:10 -0800 Subject: [PATCH 1/4] Only show deprecation for catch exceptions if you tell Jasmine not to catch - Fixes #1497 --- lib/jasmine-core/jasmine.js | 4 +++- lib/jasmine-core/version.rb | 2 +- package.json | 2 +- src/core/Env.js | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 9e6c4243..55805398 100644 --- 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 index f120958d..42f7a6d6 100644 --- 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 index 1050dc8f..180f87fd 100644 --- 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 index c62b7843..50bb73f7 100644 --- 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; }; From c2603efeb465982e0d3db0f371abe9a8a8a29e3f Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Wed, 7 Feb 2018 14:55:28 -0800 Subject: [PATCH 2/4] Specify Jasmine Gem 2.99 tag for bundle install --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 907e2780..7d8b6459 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem "jasmine", :git => 'https://github.com/jasmine/jasmine-gem.git' +gem "jasmine", :git => 'https://github.com/jasmine/jasmine-gem.git', :tag => 'v2.99.0' # gem "jasmine", path: "../jasmine-gem" gemspec From 4e5d947faa126c4f61f6f363f6803aeb90d96817 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Wed, 7 Feb 2018 14:58:14 -0800 Subject: [PATCH 3/4] Also lock for selenium runner --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7d8b6459..159e8980 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,6 @@ gem "jasmine", :git => 'https://github.com/jasmine/jasmine-gem.git', :tag => 'v2 gemspec -gem "jasmine_selenium_runner", :github => 'jasmine/jasmine_selenium_runner' +gem "jasmine_selenium_runner", :github => 'jasmine/jasmine_selenium_runner', :tag => 'v2.4.0' gem "anchorman" From 3c6308f1dc0087f0c6a63ff5c135f3506155b798 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Fri, 9 Feb 2018 09:22:35 -0800 Subject: [PATCH 4/4] Don't include the specs in the ruby gem - Bump to 2.99.2 for gem --- jasmine-core.gemspec | 2 +- lib/jasmine-core/spec | 1 - lib/jasmine-core/version.rb | 2 +- package.json | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 120000 lib/jasmine-core/spec diff --git a/jasmine-core.gemspec b/jasmine-core.gemspec index 8801591e..3e0a6f96 100644 --- a/jasmine-core.gemspec +++ b/jasmine-core.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.rubyforge_project = "jasmine-core" s.license = "MIT" - s.files = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js") + s.files = Dir.glob("./lib/**/*") s.require_paths = ["lib"] s.add_development_dependency "rake" s.add_development_dependency "sauce-connect" diff --git a/lib/jasmine-core/spec b/lib/jasmine-core/spec deleted file mode 120000 index 409f0329..00000000 --- a/lib/jasmine-core/spec +++ /dev/null @@ -1 +0,0 @@ -../../spec \ No newline at end of file diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 42f7a6d6..e37e626e 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -4,6 +4,6 @@ # module Jasmine module Core - VERSION = "2.99.1" + VERSION = "2.99.2" end end diff --git a/package.json b/package.json index 180f87fd..4ff05a30 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", "license": "MIT", - "version": "2.99.1", + "version": "2.99.2", "repository": { "type": "git", "url": "https://github.com/jasmine/jasmine.git"