diff --git a/RELEASE.md b/RELEASE.md index 42aba354..ab3e1cbb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -15,11 +15,16 @@ Please attempt to keep commits to `master` small, but cohesive. If a feature is We attempt to stick to [Semantic Versioning](http://semver.org/). Most of the time, development should be against a new minor version - fixing bugs and adding new features that are backwards compatible. -The current version lives in the file `/package.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0. +The current version lives in the file `/package.json`. This version will be the version number that is currently released. When releasing a new version, update `package.json` and `bower.json` with the new version and `grunt build:copyVersionToGem` to update the gem version number. This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem. -Note that Jasmine should *not* use the "patch" version number. Let downstream projects rev their patch versions as needed, keeping their major and minor version numbers in sync with Jasmine core. +Note that Jasmine should only use the "patch" version number in the following cases: + +* Changes related to packaging for a specific platform (npm, gem, or pip). +* Fixes for regressions. + +When jasmine-core revs its major or minor version, the binding libraries should also rev to that version. ## Release diff --git a/bower.json b/bower.json index f26cd76a..71a7d0a7 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", - "version": "2.1.3", - "homepage": "https://github.com/jasmine/jasmine", + "version": "2.2.0", + "homepage": "http://jasmine.github.io", "authors": [ "slackersoft " ], diff --git a/dist/jasmine-standalone-2.2.0.zip b/dist/jasmine-standalone-2.2.0.zip new file mode 100644 index 00000000..6b748c55 Binary files /dev/null and b/dist/jasmine-standalone-2.2.0.zip differ diff --git a/jasmine-core.gemspec b/jasmine-core.gemspec index b66f0a25..b061b191 100644 --- a/jasmine-core.gemspec +++ b/jasmine-core.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.summary = %q{JavaScript BDD framework} s.description = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.} s.email = %q{jasmine-js@googlegroups.com} - s.homepage = "http://pivotal.github.com/jasmine" + s.homepage = "http://jasmine.github.io" s.rubyforge_project = "jasmine-core" s.license = "MIT" diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 767ef93f..6bf3f02a 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -3044,5 +3044,5 @@ getJasmineRequireObj().interface = function(jasmine, env) { }; getJasmineRequireObj().version = function() { - return '2.1.3'; + return '2.2.0'; }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 02ac94b1..e433f895 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -4,6 +4,6 @@ # module Jasmine module Core - VERSION = "2.1.3" + VERSION = "2.2.0" end end diff --git a/package.json b/package.json index e627b493..a49929a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", "license": "MIT", - "version": "2.1.3", + "version": "2.2.0", "repository": { "type": "git", "url": "https://github.com/jasmine/jasmine.git" diff --git a/release_notes/2.2.0.md b/release_notes/2.2.0.md index 50bc42c6..db1da6a8 100644 --- a/release_notes/2.2.0.md +++ b/release_notes/2.2.0.md @@ -1,21 +1,17 @@ # Jasmine Core 2.2.0 Release Notes -## Summary - ## Changes -* Just return the result directly from `any` and `objectContaining` -* ObjectContaining no longer tries to track exact mismatches -* Keep extra query params when focusing on a spec or suite -* Also check custom properties on Arrays when computing equality -* Also test in IE 11 on travis -* spyOn explicitly checks to see that a method name to spy on was passed. +* `ObjectContaining` no longer tries to track exact mismatches +* HTML reporter keeps extra query params when focusing on a spec or suite +* Check custom properties on Arrays when computing equality +* Better error message if `spyOn` is called without a method name * Rename `jasmineMatches` to `asymmetricMatch` -* Don't double escape focus spec links. -* Just check if either side implements `asymmetricMatch` -* Add asymmetric equality tester to match a string against a regexp -* Add jshint to node run on travis for pull request builds -* Restructure node examples folder structure to look more realistic. +* Don't double escape focus spec links +* Jasmine equality checks if either side implements `asymmetricMatch` +* Add asymmetric equality tester to match a string with a RegExp +* Add jshint to node build on Travis for pull request builds +* Restructure node examples directory to look more realistic ## Pull Requests & Issues @@ -39,7 +35,7 @@ * Update contribution guide to mention possible ffi dependencies for Ubuntu - Fixes [#755](https://github.com/jasmine/jasmine/issues/755) -* fix spelling mistake in contributors guide +* Fix spelling mistake in contributors guide - Merges [#746](https://github.com/jasmine/jasmine/issues/746) from @swirlycheetah * Use new jasmine github repo url @@ -60,7 +56,7 @@ * Link to the Jasmine NPM module - Merges [#736](https://github.com/jasmine/jasmine/issues/736) from @moonmaster9000 -* Allow null prototype obj to be compared for equals +* Allow null prototype objects to be compared for equality - Merges [#731](https://github.com/jasmine/jasmine/issues/731) from @rohit - Fixes [#729](https://github.com/jasmine/jasmine/issues/729) @@ -73,19 +69,19 @@ * Allow asymmetric equality testers to preempt their symmetric brethren - Fixes [#540](https://github.com/jasmine/jasmine/issues/540) -* Check for `ObjectContaining` on either side of equality. +* Check for `ObjectContaining` on either side of equality - Fixes [#682](https://github.com/jasmine/jasmine/issues/682) * Display the name of the constructor when pretty printing objects - Fixes [#598](https://github.com/jasmine/jasmine/issues/598) -* toMatch requires the `expected` to be a String or RegExp +* `toMatch` requires the `expected` to be a String or RegExp - Fixes [#723](https://github.com/jasmine/jasmine/issues/723) * Better equality comparison of Dom nodes - Merges [#657](https://github.com/jasmine/jasmine/issues/657) from @alexeibs -* Hide more things from the npm package +* Hide unnecessary files from the npm package - Fixes [#726](https://github.com/jasmine/jasmine/issues/726) * Properly record finishing an `xdescribe` so further cleanup works @@ -94,7 +90,7 @@ * Reschedule all functions for a tick before executing any. This allows any function run during a tick to cancel any other in the same tick. - Fixes [#708](https://github.com/jasmine/jasmine/issues/708) -* pass through all args from external interface for befores, afters, its +* Pass through all args from external interface for befores, afters, its - Fixes [#483](https://github.com/jasmine/jasmine/issues/483) ------ diff --git a/setup.py b/setup.py index a10d0190..ad602a41 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with open('package.json') as packageFile: setup( name="jasmine-core", version=version, - url="http://pivotal.github.io/jasmine/", + url="http://jasmine.github.io", author="Pivotal Labs", author_email="jasmine-js@googlegroups.com", description=('Jasmine is a Behavior Driven Development testing framework for JavaScript. It does not rely on '+