admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,607 Commits 1 Branch 0 Tags
f9d1e2f2806d7ca6fdcae6fa1d2aa7c1f0bbfe41
Commit Graph

616 Commits

Author SHA1 Message Date
Gregg Van Hove
1fe1bbb6ed Merge branch 'master' of https://github.com/beatrichartz/jasmine into beatrichartz-master 
- Merges #1362 from @beatrichartz
 2017-06-07 14:16:48 -07:00
Gregg Van Hove
994878e6f6 bump version to 2.6.3 
- cherry-pick release notes, etc.
 2017-06-07 14:15:21 -07:00
Gregg Van Hove
578f63b9bd Make sure the queue runner goes async for async specs 
- Even if `done` is called synchronously.

See #1327 #1334 jasmine/gulp-jasmine-browser#48
 2017-06-06 14:29:02 -07:00
Gregg Van Hove
3372af1cf1 Merge branch 'seed-reporting' of https://github.com/sgravrock/jasmine into sgravrock-seed-reporting 
- Merges #1348 from @sgravrock
 2017-05-23 14:12:49 -07:00
Gregg Van Hove
2ea4e9507c Merge branch 'map-support' of https://github.com/rmehlinger/jasmine into rmehlinger-map-support 
- Merges #1340 from @rmehlinger
- Fixes #1257
 2017-05-19 14:19:14 -07:00
Gregg Van Hove
c848a66faa Merge branch 'promises' of https://github.com/sgravrock/jasmine into sgravrock-promises 
- Merges #1356 from @sgravrock
- Fixes #1336
- Fixes #1270
- Fixes #1350
- Fixes #1320
 2017-05-19 14:03:21 -07:00
Gregg Van Hove
5d1d19f494 Bump version to 2.6.2 2017-05-17 17:24:16 -07:00
Steve Gravrock
4f49288f31 Built distribution 
- Fixes #1327
- Fixes jasmine/gulp-jasmine-browser#48
 2017-05-16 14:36:35 -07:00
Gregg Van Hove
8e5823c0d2 Merge branch 'sgravrock-global-errors-rethrow' 
- Merges #1347 from @sgravrock
 2017-05-08 14:15:34 -07:00
rmehlinger
5ee03f02ed Add ES6 map support to Jasmine 2017-05-01 00:12:48 -07:00
Gregg Van Hove
2835ca3cce Bump version to 2.6.1 2017-04-26 14:18:15 -07:00
Gregg Van Hove
1d62504534 Check for process.listeners as well, for GlobalErrors 
- Fixes #1333
 2017-04-26 13:54:07 -07:00
Gregg Van Hove
0c7f36a181 Merge branch 'UziTech-remove-evil' 
- Merges #1330 from @UziTech
- Fixes #1325
 2017-04-26 13:36:06 -07:00
Gregg Van Hove
b771c083cb No longer try to use nextTick since node.js gets upset 2017-04-25 14:38:09 -07:00
Gregg Van Hove
fbd2ffc08b Build distribution for keys lookup fix 2017-04-25 14:35:58 -07:00
Gregg Van Hove
4b696fbf26 Bump version to 2.6.0 2017-04-19 14:14:39 -07:00
Gregg Van Hove
19b83a7434 Throw a recognizable Error message when fail outside of a spec. 
Fixes #1017
 2017-04-11 12:02:29 -07:00
Gregg Van Hove
7f11ecb62e Merge branch '1123-custom-error' of https://github.com/deckar01/jasmine into deckar01-1123-custom-error 
- Merges #1298 from @deckar01
- Fixes #1123
 2017-04-10 13:47:31 -07:00
Gregg Van Hove
97f8db0616 Merge branch 'gdborton-afterAll-order' 
- Merges #1312 from @gdborton
- Fixes #1311
 2017-04-10 13:37:04 -07:00
Gregg Van Hove
ddcae84480 Merge branch 'issue-1294' of https://github.com/toubou91/jasmine into toubou91-issue-1294 
- Merges #1300 from @toubou91
- Fixes #1294
 2017-04-07 17:42:17 -07:00
Gregg Van Hove
7f8f2b5e7a Update jsDocs to something close to full coverage for public API 
- #596
 2017-03-23 12:20:08 -07:00
Gregg Van Hove
a37b6c0d32 Merge branch 'master' of https://github.com/mmmichl/jasmine into mmmichl-master 
- Merges #1283 from @mmmichl
 2017-03-14 17:50:28 -07:00
Gregg Van Hove
75e652d6a7 Cleanup toThrowError constructor lookup to work in older IE 
- Also use the existing browser detection for phantom
 2017-03-14 14:26:17 -07:00
Gregg Van Hove
e1f7ca51da Merge branch 'issue-1252' of https://github.com/anseki/jasmine into anseki-issue-1252 
- Merges #1275 from @anseki
- Fixes #1252
 2017-03-10 14:36:22 -08:00
Gregg Van Hove
2ea41d3e27 Merge branch 'toHaveBeenCalledBefore' of https://github.com/foretagsplatsen/jasmine into foretagsplatsen-toHaveBeenCalledBefore 
- Merges #1242 from @DamienCassou
 2017-03-10 09:57:03 -08:00
Gregg Van Hove
1042c9a2dd Collect unhandled exceptions and pass them to the current runnable 
Fixes #529
Fixes #937
 2017-03-07 16:32:11 -08:00
Gregg Van Hove
9fbd0ba551 Nicer error messages for spyOn when null is provided 
Fixes #1258
 2017-02-15 15:55:27 -08:00
Gregg Van Hove
52876a7bf2 Merge branch 'bugfix-non-fn-args' of https://github.com/voithos/jasmine into voithos-bugfix-non-fn-args 
- Merges #1222 from @voithos
- Fixes #1004
 2017-02-15 15:18:50 -08:00
Gregg Van Hove
2eec3427e8 Re-generate files for new year in copyright 
- Also read from env variable for sauce connect path
 2017-02-15 15:15:58 -08:00
Gregg Van Hove
be6ff8b24c Remove unused message param from Suite#pend 
- See #1132
 2016-12-02 10:08:39 -08:00
Gregg Van Hove
da2005fe97 Merge branch 'beforeall-in-xdescribe' of https://github.com/voithos/jasmine into voithos-beforeall-in-xdescribe 
- Merges #1225 from @voithos
- Fixes #1175
 2016-12-02 09:56:36 -08:00
Ben Christel
41a813521b Fix tests for toEqual diff output in IE 
- Merges #1236 from @benchristel
 2016-11-30 15:34:39 -08:00
Gregg Van Hove
54e7a82ef3 Merge branch 'benchristel-eq-diffs' 
- Merges #1163 from @benchristel
- Fixes #675
 2016-11-16 18:01:42 -08:00
Ben Christel
d5e6bf47ed Make toEqual matcher report the difference between objects 
- Mismatches deep within object/array structures are pinpointed with a JsonPath-like syntax.
 2016-11-14 22:08:34 -08:00
Gregg Van Hove
5a76e59d5b Merge branch 'spyOnProperty2' of https://github.com/celluj34/jasmine into celluj34-spyOnProperty2 
- Merges #1203 from @celluj34
- Merges #1008 from @smacker
- Fixes #943
 2016-11-04 14:36:56 -07:00
Gregg Van Hove
f5cfa2a4c1 Merge branch 'master' of https://github.com/d-reinhold/jasmine into d-reinhold-master 
- Merges #1046 from @d-reinhold
- Fixes #510
 2016-11-04 10:29:09 -07:00
Pivotal
369e8cc08b Merge branch 'mockMethodsShortcut' of https://github.com/mbildner/jasmine into mbildner-mockMethodsShortcut 
- Merges #1101 from @mbildner
 2016-10-17 15:53:05 -07:00
Gregg Van Hove
0e9b9a11c3 Fix tests for new stack clearing in IE 2016-10-14 15:53:00 -07:00
Gregg Van Hove
2f01f64249 Build distribution for clear stack implemenation 2016-10-14 09:48:11 -07:00
Gregg Van Hove
0d1a9a72d9 Fix spy arity stuff to work in IE8 2016-09-28 11:49:07 -07:00
Gregg Van Hove
c2e2bd7c91 Merge branch 'spy-arity-preservation' of https://github.com/kapke/jasmine into kapke-spy-arity-preservation 
- Merges #1055 from @kapke
- Fixes #991
 2016-09-27 15:42:45 -07:00
Gregg Van Hove
05097b3e42 Merge branch 'set-equality' of https://github.com/alur/jasmine into alur-set-equality 
- Merges #1067 from @alur
 2016-09-27 13:37:57 -07:00
Gregg Van Hove
f4849f6401 Merge branch 'pretty-print-cross-frame-objects' of https://github.com/thatfulvioguy/jasmine into thatfulvioguy-pretty-print-cross-frame-objects 
- Merges #1091 from @thatfulvioguy
- Fixes #1087
 2016-09-27 11:40:01 -07:00
Gregg Van Hove
ec2ae4d521 Merge branch 'custom-testers-in-asymmetric-matchers' of https://github.com/joeyparrish/jasmine into joeyparrish-custom-testers-in-asymmetric-matchers 2016-09-27 11:01:45 -07:00
Gregg Van Hove
6816bc4252 Update to 2.5.2 2016-09-16 17:19:59 -07:00
Gregg Van Hove
04bb56a5b5 Allow currently registered reporters to be cleared 
- jasmine/jasmine-npm#88
 2016-09-16 16:02:08 -07:00
Gregg Van Hove
4e47b78f1f Use isFunction to check for functionness in callFake 
- Fixes #1191
 2016-09-14 16:06:44 -07:00
Gregg Van Hove
a4b92b34f4 Update to 2.5.1 2016-09-07 14:31:18 -07:00
Gregg Van Hove
3486e8d166 Merge branch '1189' of https://github.com/seanparmelee/jasmine into seanparmelee-1189 
- Merges #1193 from @seanparmlee
- Fixes #1189
 2016-09-01 21:11:07 -07:00
Gregg Van Hove
8366ef9be5 Merge branch 'fix' of https://github.com/logankd/jasmine into logankd-fix 
- Merges #1192 from @logankd
- Fixes #1188
 2016-09-01 20:44:13 -07:00