Commit Graph

14 Commits

Author SHA1 Message Date
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
e157b822bf failing task on unspecified phantom error, closes #64 2013-06-15 12:08:34 -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
scheibinger
f8aed8dbf1 fixed misleading comments 2013-06-15 10:18:16 -07:00
Heiko Behrens
0fdf44b052 Merge commit '8cceb8b9d955686a4a435224304a24ce2896c0c3'
Conflicts:
	package.json
2013-06-05 14:33:47 +02:00
scheibinger
8ad40817b2 fixed misleading comments 2013-04-17 16:10:39 +03:00
Heiko Behrens
af73f349f8 test to verify hanging on failed load of iframe 2013-03-22 18:07:20 +01:00
NeverI
5cea4291f4 Failure tests for easier testing (disabled) 2013-02-24 01:47:58 +01:00
Jarrod Overson
7fd976a2a1 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)
General refactor
2013-01-08 11:28:26 -08:00
Jarrod Overson
f1ff456c73 generalized configuration for requirejs template, updated jasmine, added loader plugin closing #5, #6, #7 2012-12-03 00:33:32 -08:00
Jarrod Overson
e1fc9c1c07 updated for new grunt/grunt-contrib apis, updated docs, updated dependencies 2012-11-24 15:44:00 -08:00
Jarrod Overson
d44d81448b Fixed race condition with requirejs template 2012-11-07 10:56:19 -08:00
Jarrod Overson
9a71d179ea initial commit 2012-11-01 22:03:09 -07:00