Commit Graph

76 Commits

Author SHA1 Message Date
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
Vlad Filippov
c040bc834c Merge pull request #139 from timhall/file-expand
Update file expand behavior
2014-06-07 15:08:47 -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
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
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
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
5f717e0387 fixed symbol reference 2014-03-19 16:20:42 -07: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
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
5ecc8fd961 accounted for non-terminal output, closes #110 2014-01-30 12:26:29 -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
27512c9dc6 making client logs more visible 2013-11-20 16:50:53 -08:00
Jarrod Overson
17190d25c1 updating tests for 2.0 2013-11-20 16:46:27 -08:00
Sheel Choksi and Tim Jarratt
cbb57ff310 Update phantom reporter to use Jasmine 2.x reporter interface
Includes support for pending specs
2013-10-30 09:46:44 -07:00
Travis Jeffery
a78d1cd558 Add jasmine v2.0.0-rc3 2013-10-25 00:19:28 -05:00
jakerella
9af3f8abd9 Removed unused 'phantomjs' options object from task per issue #82 in main repo. 2013-09-10 11:09:33 -05:00
Jarrod Overson
dda77661fd Merge branch 'filter' of https://github.com/stilva/grunt-contrib-jasmine into stilva-filter
* 'filter' of https://github.com/stilva/grunt-contrib-jasmine:
  Added a filter flag, to filter through the *Spec files
2013-09-02 11:00:08 -07:00
Jarrod Overson
63ccee9ef9 Merge pull request #77 from existentialism/junit-failure-output
Fixed missing junit failure output (#76)
2013-09-02 10:23:03 -07:00
Boris Staal
b704304691 PhantomReporter made not to break IE. Closes GH-71. 2013-08-12 10:10:40 -07:00
Brian Ng
0c26688e6f Slight refactor 2013-07-30 22:53:55 -05:00
Brian Ng
e89b839357 Fixed missing junit failure output (#76) 2013-07-30 19:46:45 -05:00
Thomas.A
c565e35142 Added a filter flag, to filter through the *Spec files
This allows to filter through the *Spec.js files, without modifying Gruntfile.js
2013-06-19 13:26:34 +10:00
Ian Mays
44da8e7089 ensure async grunt method is called regardless of success status or keepRunner flag - bugfix keep alive on test failure 2013-06-18 11:17:24 +01:00
Jarrod Overson
e157b822bf failing task on unspecified phantom error, closes #64 2013-06-15 12:08:34 -07:00
Jarrod Overson
e622be01c6 async teardown and .grunt removal, closes #58 2013-06-15 11:51:28 -07:00
Jarrod Overson
3bde360e05 allowing options to be passed to getRelativeFileList 2013-06-15 11:15:01 -07:00
Jarrod Overson
ce4a167521 Added phantom polyfill, closes #63 2013-06-15 10:36:54 -07:00
Jarrod Overson
1d71a9be02 Merge branch 'forEach-ie-fix' of git://github.com/pimterry/grunt-contrib-jasmine into pimterry-forEach-ie-fix
* 'forEach-ie-fix' of git://github.com/pimterry/grunt-contrib-jasmine:
  Added explicit map implementation too, for further IE compatibility
  Whoops, stripped leftover semi-colon that makes jshint unhappy
  Switched forEach out to for(var; < length; ++) to allow compatibility with other browsers
2013-06-15 10:33:02 -07:00
Duncan Beevers
3615419e90 Make relative paths relative to outfile 2013-06-15 10:18:17 -07:00
Pete Hopkins
69288dc2b8 Intercepts jasmine.Spec to stringify it as "[ Spec ]" instead of JSON.
This is required for using jasmine-given with the reporter, as that library
sets expectations on jasmine.Specs themselves. When the Spec is stringified
as JSON, it ends up stringifying the entire Jasmine environment, including
previous ExpectationResults. Since those previous ExpectationResults have had
their "expected" values stringified, they may include stringified Specs
themselves. This leds to exponential growth in the size of stringified Specs.

Special-casing jasmine.Spec prevents the exponential growth by short-circuting
the value to a small, still-useful String.
2013-06-15 10:18:16 -07:00
Brian Ng
9819bbe611 Teardown now cleans up onAny event (Fixes #43) 2013-04-15 23:13:17 -05:00
Jarrod Overson
bd81d37009 Merge branch 'keep-runner' of https://github.com/irium/grunt-contrib-jasmine
* 'keep-runner' of https://github.com/irium/grunt-contrib-jasmine:
  Don't remover spec runner on fail.
  Added option 'keepRunner' to keep spec runner after specs execution.
2013-04-04 10:39:04 -07:00
Jarrod Overson
380729b874 fixed example, bumped grunt-lib-phantomjs, checking for trailing slash on host 2013-04-04 10:39:00 -07:00
Nicolas Rakoto
2069f109e2 Moved status init of defaults in setup(). Fixes gruntjs/grunt-contrib-jasmine#50 2013-03-29 23:18:51 +01:00
Tim Perry
9a773a188a Added explicit map implementation too, for further IE compatibility 2013-03-28 13:06:40 +00:00
Tim Perry
f22ec9c178 Whoops, stripped leftover semi-colon that makes jshint unhappy 2013-03-28 12:54:47 +00:00
pimterry
33ff4ff10e Switched forEach out to for(var; < length; ++) to allow compatibility with other browsers 2013-03-28 00:04:02 +00:00
irium
d74c91c504 Don't remover spec runner on fail. 2013-03-11 19:08:43 +04:00
irium
3800acd69c Added option 'keepRunner' to keep spec runner after specs execution. 2013-03-11 19:07:03 +04:00