From 9df2c4ce60a79cbdfd3abd47ab63cbf53de4bbd0 Mon Sep 17 00:00:00 2001 From: Jarrod Overson Date: Thu, 4 Apr 2013 10:57:11 -0700 Subject: [PATCH] updated documentation --- CHANGELOG | 6 ++++++ README.md | 39 ++++++++++++++++++++++++++------------- docs/jasmine-options.md | 12 ++++++++++++ 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c3d6879..2437b99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +v0.4.2: + date: 2013-04-03 + changes: + - bumped grunt-lib-phantomjs to 0.3.0/1.9 (closes #45) + - merged #38, #51 + - addressed #40, #43, #48, #45 v0.4.0: date: 2013-03-08 changes: diff --git a/README.md b/README.md index cfc152e..d55574c 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,18 @@ Type: `String|Array` *Minimatch* - CSS files that get loaded after the jasmine.css +#### options.version +Type: `String` +Default: '1.3.1' + +This is the jasmine-version which will be used. currently available versions are: + +* 1.0.0 +* 1.1.0 +* 1.2.0 +* 1.3.0 +* 1.3.1 + #### options.outfile Type: `String` Default: `_SpecRunner.html` @@ -185,7 +197,7 @@ grunt.initConfig({ src: 'src/**/*.js', options: { specs: 'spec/*Spec.js', - helpers: 'spec/*Helper.js' + helpers: 'spec/*Helper.js', template: 'custom.tmpl' } } @@ -218,20 +230,21 @@ for more information on the RequireJS template. ## Release History - * 2013-03-07   v0.4.0   bumped grunt-lib-phantomjs to 0.2.0/1.8 allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http) merged merged - * 2013-02-23   v0.3.3   Added better console output (via Gabor Kiss @Neverl) - * 2013-02-16   v0.3.2   Ensure Gruntfile.js is included on npm. - * 2013-02-14   v0.3.1   First official release for Grunt 0.4.0. - * 2013-01-21   v0.3.1rc7   Exposed phantom and sendMessage to templates - * 2013-01-21   v0.3.0rc7   Updated dependencies for grunt v0.4.0rc6/rc7 - * 2013-01-07   v0.3.0rc5   Updating to work with grunt v0.4.0rc5. Switching to this.filesSrc api. Added JUnit xml output (via Kelvin Luck @vitch) Passing console.log from browser to verbose grunt logging Support for templates as separate node modules Removed internal requirejs template (see grunt-template-jasmine-requirejs) - * 2012-12-02   v0.2.0   Generalized requirejs template config Added loader plugin Tests for templates Updated jasmine to 1.3.0 - * 2012-11-23   v0.1.2   Updated for new grunt/grunt-contrib apis - * 2012-11-06   v0.1.1   Fixed race condition in requirejs template - * 2012-11-06   v0.1.0   Ported grunt-jasmine-runner and grunt-jasmine-task to grunt-contrib + * 2013-04-03   v0.4.2   bumped grunt-lib-phantomjs to 0.3.0/1.9 (closes merged addressed + * 2013-03-08   v0.4.0   bumped grunt-lib-phantomjs to 0.2.0/1.8 allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http) merged merged + * 2013-02-24   v0.3.3   Added better console output (via Gabor Kiss @Neverl) + * 2013-02-17   v0.3.2   Ensure Gruntfile.js is included on npm. + * 2013-02-15   v0.3.1   First official release for Grunt 0.4.0. + * 2013-01-22   v0.3.1rc7   Exposed phantom and sendMessage to templates + * 2013-01-22   v0.3.0rc7   Updated dependencies for grunt v0.4.0rc6/rc7 + * 2013-01-08   v0.3.0rc5   Updating to work with grunt v0.4.0rc5. Switching to this.filesSrc api. Added JUnit xml output (via Kelvin Luck @vitch) Passing console.log from browser to verbose grunt logging Support for templates as separate node modules Removed internal requirejs template (see grunt-template-jasmine-requirejs) + * 2012-12-03   v0.2.0   Generalized requirejs template config Added loader plugin Tests for templates Updated jasmine to 1.3.0 + * 2012-11-24   v0.1.2   Updated for new grunt/grunt-contrib apis + * 2012-11-07   v0.1.1   Fixed race condition in requirejs template + * 2012-11-07   v0.1.0   Ported grunt-jasmine-runner and grunt-jasmine-task to grunt-contrib --- Task submitted by [Jarrod Overson](http://jarrodoverson.com) -*This file was generated on Sun Mar 10 2013 22:14:38.* +*This file was generated on Thu Apr 04 2013 10:52:08.* diff --git a/docs/jasmine-options.md b/docs/jasmine-options.md index 1c6afc3..ee476bf 100644 --- a/docs/jasmine-options.md +++ b/docs/jasmine-options.md @@ -26,6 +26,18 @@ Type: `String|Array` *Minimatch* - CSS files that get loaded after the jasmine.css +## options.version +Type: `String` +Default: '1.3.1' + +This is the jasmine-version which will be used. currently available versions are: + +* 1.0.0 +* 1.1.0 +* 1.2.0 +* 1.3.0 +* 1.3.1 + ## options.outfile Type: `String` Default: `_SpecRunner.html`