Commit Graph

197 Commits

Author SHA1 Message Date
slackersoft
f5a02ca9a0 Depend on jasmine-core npm instead of vendoring
- jasmine-core now exports the files necessary to load jasmine in an
  html page.

- This allows users to choose their jasmine version by just updating
  their jasmine-core dependency.
2014-08-22 22:51:30 -07:00
Jarrod Overson
585a88f424 Merge pull request #158 from cobbdb/ie7-support
Expose polyfills as options
2014-08-03 20:03:26 -07:00
cobbdb
ad0310bfd9 Expose polyfills option to inject additional libraries above core jasmine
scripts.
2014-08-03 19:41:26 -07:00
Vlad Filippov
e954033776 Merge pull request #157 from cobbdb/master
Update es5-shim to latest to remove npm install warning
2014-08-03 12:20:42 -07:00
cobbdb
99640b86a1 Update es5-shim to latest to remove npm install warning 2014-08-02 23:23:20 -07:00
Jarrod Overson
10ac875a24 updated changelog and built readme 2014-07-26 19:28:33 -07:00
Jarrod Overson
e3645e2351 0.7.0 2014-07-26 19:23:58 -07:00
Jarrod Overson
bf27b3e831 moved jshint task to test and fixed lint errors 2014-07-26 19:22:30 -07:00
Jarrod Overson
d4d45192e7 Merge branch 'kissrobber-add_stack_in_summary'
* kissrobber-add_stack_in_summary:
  add a stack in summary
2014-07-26 19:10:38 -07:00
Jarrod Overson
e1f8004c6e Merge branch 'add_stack_in_summary' of https://github.com/kissrobber/grunt-contrib-jasmine into kissrobber-add_stack_in_summary
* 'add_stack_in_summary' of https://github.com/kissrobber/grunt-contrib-jasmine:
  add a stack in summary
2014-07-26 19:10:31 -07:00
Vlad Filippov
b658f3f98f Merge pull request #155 from stdavis/stringify
Fixes circular reference bug phantom reporter caused by jasmine 2.0.1
2014-07-26 16:11:06 -07:00
Scott Davis
acca918ce5 Fixes circular reference bug phantom reporter caused by jasmine 2.0.1 2014-07-25 07:37:56 -06:00
Vlad Filippov
f11c39b205 Merge pull request #154 from stdavis/jasmine
Jasmine 2.0.1 support
2014-07-24 09:59:53 -07:00
Scott Davis
a5a3763e3f Jasmine 2.0.1 support 2014-07-23 15:32:40 -06:00
kissrobber
e1efe79c69 add a stack in summary 2014-07-20 21:30:06 +09:00
Vlad Filippov
5d036af878 Merge pull request #134 from Wildhoney/add_cdata_to_junit
Wrapped Failure Message in CDATA
2014-07-07 14:42:21 -07:00
Paul Meyerle
0a34006863 Squashed commit of the following:
commit 45fc50c09e60aafc0134248a9fd9c55db0b413d2
Author: Paul Meyerle <pmeyerle@smartertravelmedia.com>
Date:   Thu Mar 13 14:30:30 2014 -0400

    suiteDone should reference the suite id

Closes gh-129.
2014-07-01 09:19:48 -07:00
vladikoff
568f01f5d5 Add Windows CI 2014-06-07 15:54:35 -07:00
vladikoff
074233cd62 0.7.0-pre 2014-06-07 15:09:56 -07:00
Vlad Filippov
c040bc834c Merge pull request #139 from timhall/file-expand
Update file expand behavior
2014-06-07 15:08:47 -07:00
vladikoff
88728e31b0 'none' option docs 2014-06-07 15:07:02 -07:00
Vlad Filippov
a2f523d0de Merge pull request #133 from dubspeed/none_output
added 'none' as valid display option
2014-06-07 15:03:53 -07:00
Michael Lennartz
bbe22a5c74 Squashed commit of the following:
commit a360e3e57fd95f6ea5fe117cca1b31ef83bbc302
Author: vladikoff <vlad.filippov@gmail.com>
Date:   Sat Jun 7 11:13:44 2014 -0700

    Fix spaces

commit 6dae9be0d83eede54e3c3bda454d716f2599d9ba
Author: Michael Lennartz <michael.lennartz@innogames.com>
Date:   Fri Mar 21 19:06:03 2014 +0100

    fix misplaced closing bracket

commit 62ccbe97707e2f47588a6c7fbaefc6877d68678b
Author: Michael Lennartz <michael.lennartz@innogames.com>
Date:   Fri Mar 21 15:49:05 2014 +0100

    add try/catch for stringify

Closes gh-132.
2014-06-07 11:13:50 -07:00
Tim Hall
dc793d4843 Add test for file expand behavior 2014-06-06 19:33:59 -04:00
James Smith
7ca9250e9a Merge pull request #150 from samccone/patch-1
png => svg for build badge
2014-06-02 11:59:36 -04:00
Sam Saccone
320088fd33 png => svg for build badge 2014-06-02 11:50:13 -04:00
James Smith
a711b67728 Merge pull request #149 from samccone/patch-1
Update grunt-lib-phantomjs dependency
2014-06-02 11:37:24 -04:00
Sam Saccone
5950e8d512 Update grunt-lib-phantomjs dependency
fixes #142
2014-06-02 11:25:17 -04:00
vladikoff
e59768cd60 Merge branch 'master' of github.com:gruntjs/grunt-contrib-jasmine
* 'master' of github.com:gruntjs/grunt-contrib-jasmine:
  Update npm on install.
  Option to allow specifying a junitTemplate
  Added jasmine favicon to default html runner template.
2014-05-31 21:19:06 -07:00
vladikoff
be208ce154 0.6.5 2014-05-31 21:18:53 -07:00
Vlad Filippov
21647b8bc8 Merge pull request #147 from prettycode/master
Option to allow specifying a junitTemplate
2014-05-31 21:12:00 -07:00
Vlad Filippov
be259e7424 Update npm on install. 2014-05-31 21:07:38 -07:00
Chris O.
238aad2e06 Option to allow specifying a junitTemplate
Allow for a customized junitTemplate using options.junit.template.
2014-05-19 22:43:40 -07:00
Vlad Filippov
f28ced0bea Merge pull request #138 from stdavis/favicon
Added jasmine favicon to default html runner template.
2014-05-18 14:47:06 -04:00
vladikoff
f2a98381de 0.6.4 2014-04-28 15:49:12 -04:00
vladikoff
1b262fc9ae Update indentLevel. Fixes #135. Fixes #140. 2014-04-27 14:45:56 -04:00
Tim Hall
86aaa6d453 Update file expand in getRelativeFileList
`getRelativeFileList` was stepping through patterns rather than passing
them all to `grunt.file.expand` leading to exclusions (`!`) being missed
since they remove rather than add files to the list.
2014-04-22 17:43:59 -04:00
Scott Davis
2e735b34e0 Added jasmine favicon to default html runner template.
This will allow this project to be used with the [jasmine-favicon-reporter](https://github.com/simsalabim/jasmine-favicon-reporter) project as well as make the spec runner look a bit nicer.
2014-04-11 14:55:18 -06:00
Adam Timberlake
45a96782ad Wrapped Failure Message in CDATA 2014-03-27 12:47:45 +00:00
Jmeas Smith
420a84464e Merge pull request #118 from wheresrhys/patch-1
Moved scripts inside the body tag
2014-03-26 22:07:15 -04:00
Michael Lennartz
12a07d2ff4 added 'none' as valid display option 2014-03-21 16:15:08 +01:00
Jarrod Overson
166057a0a3 built readme 2014-03-19 16:21:24 -07:00
Jarrod Overson
5eaa39950d 0.6.3 2014-03-19 16:21:00 -07:00
Jarrod Overson
5f717e0387 fixed symbol reference 2014-03-19 16:20:42 -07:00
Jarrod Overson
4d08197dc2 Merge pull request #127 from shaqq/master
Adding a complex example
2014-03-07 15:51:42 -08:00
Shaker Islam
a615cc9052 Adding a complex example 2014-03-07 15:25:39 -06:00
Vlad Filippov
c93eee129b Update jasmine-options.md 2014-03-04 13:04:19 -05:00
Vlad Filippov
8b44250fb4 Merge pull request #126 from scottsword/patch-1
Update README.md
2014-03-04 13:03:53 -05:00
Scott Sword
1c4f9282d4 Update README.md
Added additional info for the source. When using a requireJS template the source is pulled through requireJS. I found it confusing when people had tried to load a controller in both the src and from their module. This provides better clarification for RequireJS users.
2014-03-03 17:27:48 -07:00
Kyle Robinson Young
13f5a998fb Update copyright to 2014 2014-02-28 16:54:50 -08:00