Commit Graph

223 Commits

Author SHA1 Message Date
XhmikosR
f5ac86edf2 Assorted lint fixes. 2015-04-24 01:41:14 +03:00
Vlad Filippov
d127b402d8 Merge pull request #203 from dorightdigital/fix-deps
Rolling back dependencies to stabilise the build.
2015-04-14 10:59:40 -04:00
Mat Carey
0f6331863a Rolling back dependencies to stabalise the build. 2015-04-14 01:29:43 +01:00
XhmikosR
0e7a8ef16a Update appveyor.yml.
Use variables for cache items.
2015-03-13 17:15:28 +02:00
XhmikosR
02567c13b3 Update appveyor.yml. 2015-03-04 12:21:24 +02:00
XhmikosR
220c0e18ca Update JSHint config. 2015-02-27 10:11:19 +02:00
XhmikosR
0b49cf0507 Fix AppVeyor. 2015-02-27 10:09:16 +02:00
Sindre Sorhus
d08ddf04f6 Merge pull request #197 from WRidder/patch-1
Update README.md
2015-02-26 12:11:45 +07:00
Wilbert van de Ridder
babae4af31 Update README.md 2015-02-25 12:33:49 +01:00
Sindre Sorhus
a9b0de8a75 bump deps 2015-02-24 20:51:16 +07:00
Sindre Sorhus
2bcb22bb38 minor tweaks 2015-02-08 20:02:58 +07:00
Vlad Filippov
d21731ee8d v0.8.2 2015-01-08 16:19:06 -05:00
Vlad Filippov
8bfe30f061 use a less common port for tests 2015-01-08 16:16:44 -05:00
Vlad Filippov
976b3a7fd8 Merge pull request #187 from robmadole/master
Clear the summary after each run when using grunt watch #145
2015-01-08 16:06:41 -05:00
robmadole
b98974e777 Fix call to addMatchers in the spec helper 2015-01-08 11:42:14 -06:00
robmadole
7bb22be249 Fixes #145 by adding the summary to thisRun 2015-01-08 11:37:01 -06:00
Kyle Robinson Young
b6f1be0585 Update copyright to 2015 2015-01-01 11:30:19 -08:00
Vlad Filippov
14e8ab2478 v0.8.1 2014-10-20 11:50:54 -04:00
Sindre Sorhus
4ff0f80630 Merge pull request #177 from lukeapage/patch-1
remove listeners when using the build flag
2014-10-20 12:40:53 +02:00
Luke Page
e4bb889ea4 remove listeners when using the build flag
, fixes #176
2014-10-20 09:14:21 +01:00
Vlad Filippov
c063f68da9 Merge pull request #174 from adiktofsugar/master
Added handler for fail.load
2014-10-06 23:25:55 -04:00
S McCollum
56b7ff4d69 Added handler for fail.load 2014-10-06 19:36:13 -07:00
vladikoff
dfc76896a0 0.8.0 2014-09-17 22:12:42 -04:00
Vlad Filippov
5ef522852c Merge pull request #163 from slackersoft/jasmine-core
Depend on jasmine-core npm instead of vendoring jasmine
2014-09-17 22:08:25 -04:00
slackersoft
64909c76d5 jasmine-core 2.0.4 is the version that finally works correctly 2014-09-11 12:50:36 -07:00
Vlad Filippov
a3f3ddd90d Update .travis.yml 2014-08-30 10:54:07 -07:00
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