warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,707 Commits 1 Branch 120 Tags
486a64658f17b8fca4798b3a2661b6cd6df88317
Commit Graph

444 Commits

Author SHA1 Message Date
Gregg Van Hove 1dfdc89ba9 Merge branch 'ie11-maps-support' of https://github.com/Volox/jasmine into Volox-ie11-maps-support 
- Merges #1477 from @Volox
- Fixes #1472
 2018-01-11 17:50:56 -08:00
Steve Gravrock aeeb5b7107 Bumped copyright dates 2018-01-10 10:16:02 -08:00
Steve Gravrock cb6de64e58 Fixed DelayedFunctionScheduler IE 8 compatibility issue 2018-01-02 18:17:23 -08:00
Steve Gravrock f69949ebc0 Merge branch 'fix-1426' of https://github.com/leahciMic/jasmine 
- Merges #1427 from @eahciMic
- Fixes #1426
 2018-01-02 08:18:32 -08:00
Steve Gravrock b943f6b736 Fixed SPEC HAS NO EXPECTATIONS warning in HTML reporter 
[Finishes #153891435]
 2017-12-23 11:14:37 -08:00
Steve Gravrock b439e2fb37 Extracted results state management out of the HTML reporter 
[#153891435]
 2017-12-23 11:12:38 -08:00
Steve Gravrock c79ce125c0 Merge branch 'node-timeouts' of https://github.com/chris--young/jasmine 
- Merges #1470 from @chris--young
- Fixes #1469
 2017-12-21 13:24:21 -08:00
Steve Gravrock 65b4499dec In Jasmine's own tests, don't leak between jasmine and jasmineUnderTest 2017-12-20 12:08:22 -08:00
Steve Gravrock b6cc34d9e9 Correctly remove spies of window.onerror on IE 2017-12-18 16:34:37 -08:00
Steve Gravrock d3a3cf1ff3 Collapsed StringPrettyPrinter into PrettyPrinter 
We never really took advantage of the potential extensibility that the
split provided, and the boundary between the two was getting muddied
over time.
 2017-12-18 09:43:25 -08:00
Steve Gravrock c0d0513199 Stop serializing objects after hitting jasmine.MAX_PRETTY_PRINT_CHARS 2017-12-15 13:23:59 -08:00
Steve Gravrock 86a38fceb9 Truncate pretty printer output that is more than j$.MAX_PRETTY_PRINT_CHARS long 2017-12-13 08:09:22 -08:00
Steve Gravrock c74af1d900 Reduced pretty printer limits to much smaller values 
This should help prevent out of memory errors when printing large object
graphs. See #1291 and #1422.

[#153257532]
 2017-12-13 08:07:43 -08:00
Steve Gravrock f4caf27208 Fixed pending() for async/promise-returning specs 
Fixes #1449.
Fixes #1450.
 2017-11-29 08:57:29 -08:00
Julian Lannigan 2be5e0a962 Allowed async functions to be passed into spy#callFake 2017-11-09 19:59:23 -05:00
Steve Gravrock 285f06d5c4 Merge branch 'promise-matching-1314' of https://github.com/sderickson/jasmine 2017-11-02 17:18:24 -07:00
Steve Gravrock 3aece2ac74 Merge branch 'master' of https://github.com/b-3-n/jasmine 
- Merges #1445 from @b-3-n
- Fixes #1444
 2017-11-02 08:17:27 -07:00
Steve Gravrock da91294182 Merge branch 'anything-fix' of https://github.com/voithos/jasmine 
- Merges #1436 from @voithos
 2017-10-24 08:26:13 -07:00
Steve Gravrock bd41a97cd5 Merge branch 'anysymbol-fix' of https://github.com/voithos/jasmine 
- Merge #1435 from @voithos
 2017-10-24 08:18:42 -07:00
Steve Gravrock 4c6dadb9b1 Merge branch 'github-1295' of https://github.com/ksvitkovsky/jasmine 
- Merges #1411 from @ksvitkovsky
 2017-10-23 11:58:30 -07:00
Steve Gravrock b7e9594c86 Merge branch 'jasmine-deep-clone-args' of https://github.com/aj-dev/jasmine 
- Merges #1424 from @aj-dev
 2017-10-23 11:32:58 -07:00
Steve Gravrock 6c363f11b3 Merge branch 'lintfix' of https://github.com/voithos/jasmine 
- Merges #1428 from @voithos
 2017-10-23 11:01:18 -07:00
Gregg Van Hove f6342ad4fe Add a note about defineProperty for spyOnProperty 
- Fixes #1415
 2017-08-24 12:22:11 -07:00
Gregg Van Hove 8cf8736cab bump version to 2.8.0 2017-08-24 11:41:41 -07:00
Gregg Van Hove 8834142198 Update jsApiReporter docs to link to new suite and spec results 2017-08-09 10:36:53 -07:00
Gregg Van Hove 1926fc11ae Add jsdocs for reporter events 2017-08-09 10:21:59 -07:00
Gregg Van Hove 80dba1138a Add explicit docs for the callback function passed to it etc. 2017-08-08 17:28:36 -07:00
Gregg Van Hove 8ad9abb19a Add arrayWithExactContents asymmetric matcher 
- Fixes #817
 2017-08-04 12:07:09 -07:00
Gregg Van Hove 8dd0ad531c Merge branch 'ksvitkovsky-github-1403' 
- Closes #1407 from @ksvitkovsky
- Fixes #1403
 2017-08-04 09:55:09 -07:00
Gregg Van Hove 4d18e63b0f Merge branch 'ksvitkovsky-github-1180' 
- Closes #1404 from @ksvitkovsky
- Fixes #1180
 2017-08-04 09:34:16 -07:00
Gregg Van Hove acc8c23bf4 Merge branch 'theefer-fix-map+set-comparison' 
- Merges #1406 from @theefer
- Fixes #1402
 2017-08-04 09:23:31 -07:00
Gregg Van Hove b256741bec bump version to 2.7.0 2017-07-27 17:47:20 -07:00
Gregg Van Hove 1d4a2b5c22 Merge branch 'user-context' of https://github.com/darthjee/jasmine into darthjee-user-context 
- Merges #1400 from @darthjee
 2017-07-26 17:18:02 -07:00
Gregg Van Hove 543e056056 Merge branch 'jberney-master' 
- Merges #1399 from @jberney
 2017-07-24 17:13:21 -07:00
Gregg Van Hove 22e9d6df20 PrettyPrinter allows an object to have a toString that isn't a function 
- Fixes #1389
 2017-07-17 22:01:06 -07:00
Alpha Chen aa72b0b7cf Simplified rounding code in toBeCloseTo 
Signed-off-by: Steve Gravrock <sgravrock@pivotal.io>
 2017-06-26 10:22:54 -07:00
Alpha Chen 9f3952ff87 Merge branch 'vanduynslagerp-fix-tobecloseto' 
- Fixes #1382

Signed-off-by: Alpha Chen <achen@pivotal.io>
 2017-06-26 10:21:13 -07:00
Steve Gravrock 585287b9d6 When stop on failure is enabled, skip subsequent it() and beforeEach(). 
Note: afterEach() functions are still run, because skipping them is
highly likely to pollute specs that run after the failure.

[Finishes #92252330]

- Fixes #577
- Fixes #807
 2017-06-19 13:48:43 -07:00
Gregg Van Hove de862f8133 Only clear out the spec param for Run all link 
- Fixes #1369
 2017-06-16 14:07:40 -07:00
Gregg Van Hove 4e3ae726aa Bump version to 2.6.4 2017-06-16 13:44:43 -07:00
Steve Gravrock 9ee7b4ee0b Don't setTimeout() every time the stack is cleared via MessageChannel() 2017-06-16 09:58:41 -07:00
Gregg Van Hove 2e737f50ca Don't use window 2017-06-15 14:32:18 -07:00
Gregg Van Hove 4c491b2dc0 Pretty printer will now use MAX_PRETTY_PRINT_ARRAY_LENGTH for objects 
- Fixes #1291
- Fixes #1360
 2017-06-14 13:36:35 -07:00
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