Commit Graph

115 Commits

Author SHA1 Message Date
Jarrod Overson
ab8b22d13d Merge pull request #83 from jakerella/master
Removed unused 'phantomjs' options object from task
2013-09-10 09:51:22 -07: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
dfe8f05d42 0.5.2 2013-09-02 11:05:38 -07:00
Jarrod Overson
f7470fb44d updated documentation 2013-09-02 11:05:30 -07:00
Jarrod Overson
878475a23b updated documentation 2013-09-02 11:03:05 -07: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
c8241cd172 Merge branch 'master' of https://github.com/HBehrens/grunt-contrib-jasmine into HBehrens-master
* 'master' of https://github.com/HBehrens/grunt-contrib-jasmine:
  use fixed version of grunt-lib-phantomjs to update https://github.com/gruntjs/grunt-contrib-jasmine/pull/44
  test to verify hanging on failed load of iframe

Conflicts:
	package.json
2013-09-02 10:58: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
Jarrod Overson
5cfc8847b5 Merge pull request #78 from ChrisWren/patch-1
Fixed link to Camille Reynder's site
2013-09-02 10:21:42 -07:00
Chris Wren
5bc3d5f863 Fixed link to Camille Reynder's site 2013-08-12 11:56:12 -07:00
Kyle Robinson Young
20746e871f Update jshint and devDeps 2013-08-12 10:18:03 -07:00
Kyle Robinson Young
85ce0e9da5 Update copyright to 2013 2013-08-12 10:16:29 -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
Jarrod Overson
468c93729d 0.5.1 2013-06-18 10:25:06 -07:00
Jarrod Overson
345201e598 updated changelog 2013-06-18 10:24:52 -07: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
e1a9f249b4 updated changelog 2013-06-15 12:25:30 -07:00
Jarrod Overson
d47f17007c Merge branch 'master' of https://github.com/gruntjs/grunt-contrib-jasmine 2013-06-15 12:19:46 -07:00
Jarrod Overson
95a16b29c7 0.5.0 2013-06-15 12:16:10 -07:00
Jarrod Overson
f7b112deb2 added .idea to .npmignore, closes #41 2013-06-15 12:10:44 -07:00
Jarrod Overson
ecfc9d7eee fixed trailing spaces for markdown 2013-06-15 12:09:22 -07: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
Jarrod Overson
72c60666a7 added test for deep outfile 2013-06-15 10:18:17 -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
scheibinger
f8aed8dbf1 fixed misleading comments 2013-06-15 10:18:16 -07:00
Heiko Behrens
d2cc443e6b use fixed version of grunt-lib-phantomjs to update https://github.com/gruntjs/grunt-contrib-jasmine/pull/44 2013-06-05 14:36:57 +02:00
Heiko Behrens
0fdf44b052 Merge commit '8cceb8b9d955686a4a435224304a24ce2896c0c3'
Conflicts:
	package.json
2013-06-05 14:33:47 +02:00
Jarrod Overson
8cceb8b9d9 Merge pull request #56 from scheibinger/patch-1
fixed misleading comments
2013-04-17 09:10:47 -07:00
scheibinger
8ad40817b2 fixed misleading comments 2013-04-17 16:10:39 +03:00
Brian Ng
9819bbe611 Teardown now cleans up onAny event (Fixes #43) 2013-04-15 23:13:17 -05:00
Jarrod Overson
5df50a8afb Merge pull request #53 from existentialism/docs-keeprunner-update
Updated docs with new keepRunner option
2013-04-12 21:42:58 -07:00
Brian Ng
3c3fb73e09 Updated docs with new keepRunner option 2013-04-12 19:47:13 -05:00
Jarrod Overson
769357f2b4 0.4.2 2013-04-04 10:57:17 -07:00
Jarrod Overson
9df2c4ce60 updated documentation 2013-04-04 10:57:11 -07: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
Heiko Behrens
af73f349f8 test to verify hanging on failed load of iframe 2013-03-22 18:07:20 +01:00
Tyler Kellen
ea5334ec7e quote version number for travis 2013-03-15 01:27:09 -05:00