Commit Graph

276 Commits

Author SHA1 Message Date
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
Jarrod Overson
f610a2b388 Merge branch 'master' of https://github.com/magalhas/grunt-contrib-jasmine into magalhas-master
* 'master' of https://github.com/magalhas/grunt-contrib-jasmine:
  including es5-shim instead of standalone bind polyfill
2014-02-27 14:25:44 -08:00
Jarrod Overson
f282a065e2 generated readme 2014-02-27 14:16:44 -08:00
Jarrod Overson
1e0b7a7104 0.6.2 2014-02-27 14:16:44 -08:00
Christian Rondeau
1d43bf20e7 merged summary 2014-02-27 14:16:27 -08:00
Jarrod Overson
1123e03044 separated long vs short symbols 2014-02-27 14:02:10 -08:00
Christian Rondeau
6e77b4eda2 short display of test run results using options.short 2014-02-26 15:21:55 -05:00
magalhas
476c1b6b1c including es5-shim instead of standalone bind polyfill 2014-02-25 19:42:30 +00:00
Rhys Evans
20aebec1fd Moved scripts inside the body tag
Putting scripts as the last item before the closing body tag is these days probably the most common approach to loading scripts in a page, so the jasmine template should arguably follow this convention.

Also this means setup scripts within my src that assume body is present and which run before any specs do will not throw an error
2014-02-13 10:29:35 +00:00
Jarrod Overson
839a2a9994 updated autogenned doc 2014-01-30 12:27:04 -08:00
Jarrod Overson
f02bf7fc1f 0.6.1 2014-01-30 12:26:33 -08:00
Jarrod Overson
5ecc8fd961 accounted for non-terminal output, closes #110 2014-01-30 12:26:29 -08:00
Jarrod Overson
30ad17e4bc removed version in readme header 2014-01-29 09:44:48 -08:00
Jarrod Overson
c755025c57 merged jasmine 2.0.0 branch 2014-01-29 08:53:31 -08:00
Jarrod Overson
4f50a8e4d2 0.6.0 2014-01-29 08:52:05 -08:00
Jarrod Overson
d89f0a9d2f updated docs 2014-01-29 08:51:59 -08:00
Jarrod Overson
f4d50bad42 removed more unnecessary code in reporter 2014-01-29 08:33:47 -08:00
Jarrod Overson
8c111a15ae added watch dep, removed console logging for performance in browser 2014-01-28 17:15:55 -08:00
Jarrod Overson
dfa9182e20 updated logging and junit output for jasmine 2.0.0 2014-01-28 17:12:51 -08:00
Jarrod Overson
12854458f2 updated jasmine to 2.0.0 final 2014-01-28 17:12:07 -08:00
Vlad Filippov
c7b89e3883 Merge pull request #106 from cgross/master
Enhanced output. Fixes #87 and fixes #104.
2014-01-27 11:21:25 -08:00
Chris Gross
b74dcac449 Enhanced output. Fixes #87 and fixes #104. 2014-01-27 12:51:53 -05:00