b1190eefb9
Minor fix
2017-06-04 00:40:53 -03:00
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
d355fa0806
Don't tick extra. It's breaking IE 8 & 9
2017-05-22 14:27:08 -07:00
56a79bef98
Use a less ancient Node on Travis CI
2017-05-19 15:47:54 -07:00
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
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
99fd7ddb88
Update python release instructions
...
- so I don't have search my bash history
2017-05-17 17:35:23 -07:00
5d1d19f494
Bump version to 2.6.2
2017-05-17 17:24:16 -07:00
4f49288f31
Built distribution
...
- Fixes #1327
- Fixes jasmine/gulp-jasmine-browser#48
2017-05-16 14:36:35 -07:00
b9adc76dc7
Clear the stack if onmessage is called before the previous invocation finishes
2017-05-16 14:08:58 -07:00
9672689d40
Added support for ES2017 async functions
2017-05-12 14:42:14 -07:00
a237ac5386
Added support for async before/it/after functions that return promises
2017-05-11 14:31:09 -07:00
5ac3e21abb
Merge branch 'interleaved-suites' of https://github.com/sgravrock/jasmine into sgravrock-interleaved-suites
...
- Merges #1352 from @sgravrock
- Fixes #1344
- Fixes #1349
2017-05-10 13:49:05 -07:00
88763012e4
Unified async and async queueable function running code
2017-05-10 10:14:47 -07:00
b1e97cfb09
Correctly route errors that occur while a QueueRunner is clearing stack
...
Besides surfacing the error in the hopefully-correct place, this also
prevents the queue runners for sibling suites from interleaving, which
in turn prevents all kinds of internal state corruption.
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2017-05-09 15:01:18 -07:00
8e5823c0d2
Merge branch 'sgravrock-global-errors-rethrow'
...
- Merges #1347 from @sgravrock
2017-05-08 14:15:34 -07:00
e6a7932ec1
Report the random seed at the beginning and end of execution
...
This allows reporters to provide the seed to the user even in cases
where Jasmine crashes before completing.
2017-05-08 12:09:17 -07:00
10f1220e55
Don't mask errors that occur when no handlers are installed
...
It's possible for async code to cause an error when Jasmine
doesn't have any listeners registered internally. This causes
Jasmine to crash (Node) or log to the console (browser)
because of trying to call the nonexistent handler. This change
doesn't fix the overall problem but it does ensure that the
original error is logged rather than Jasmine's internal error.
2017-05-08 11:09:32 -07:00
5ee03f02ed
Add ES6 map support to Jasmine
2017-05-01 00:12:48 -07:00
2835ca3cce
Bump version to 2.6.1
2017-04-26 14:18:15 -07:00
120c484419
Merge branch 'patch-1' of https://github.com/reinrl/jasmine into reinrl-patch-1
...
- Merges #1319 from @reinrl
2017-04-26 14:06:18 -07:00
1d62504534
Check for process.listeners as well, for GlobalErrors
...
- Fixes #1333
2017-04-26 13:54:07 -07:00
055d88eff8
Merge branch 'UziTech-ensure-function-or-undefined'
...
- Merges #1329 from @UziTech
- Fixes #1328
2017-04-26 13:50:11 -07:00
d2b33e0c66
allow undefined as function
2017-04-26 13:49:13 -07:00
0c7f36a181
Merge branch 'UziTech-remove-evil'
...
- Merges #1330 from @UziTech
- Fixes #1325
2017-04-26 13:36:06 -07:00
686d8157e5
remove eval to create spy wrapper
2017-04-26 13:34:32 -07:00
b771c083cb
No longer try to use nextTick since node.js gets upset
2017-04-25 14:38:09 -07:00
fbd2ffc08b
Build distribution for keys lookup fix
2017-04-25 14:35:58 -07:00
b3c8fb9797
Merge branch 'seanparmelee-keys-fix'
...
- Merges #1326 from @seanparmelee
- Fixes #1321
- Fixes #1324
2017-04-25 13:47:53 -07:00
ef3cfe7f44
skip the test when we can’t get the propertyDescriptor
2017-04-25 12:27:32 -05:00
0d6ecbec17
iterate through keys with a regular for loop
2017-04-25 11:28:16 -05:00
7e4b8d4531
Update README.md
...
Made installation instructions more version-agnostic (using {#.#.#} instead of what was hard-coded to 2.0.0), corrected example HTML file (../jasmine-core/... instead of ../jasmine-2.0.0/... in the paths for the core files).
2017-04-24 12:43:40 -05:00
4b696fbf26
Bump version to 2.6.0
2017-04-19 14:14:39 -07:00
74511f5425
Merge pull request #1316 from rachelcarmena/update-introduction-url
...
Updating introduction url to last version
2017-04-17 13:51:33 -07:00
3e912f7f4e
Updating introduction url to last version
2017-04-17 20:30:13 +02:00
19b83a7434
Throw a recognizable Error message when fail outside of a spec.
...
Fixes #1017
2017-04-11 12:02:29 -07:00
98569ba0f3
Cache installed gems, so they don't need to be installed every time.
...
- See https://docs.travis-ci.com/user/caching/#Caches-and-build-matrices
2017-04-10 13:52:24 -07:00
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
97f8db0616
Merge branch 'gdborton-afterAll-order'
...
- Merges #1312 from @gdborton
- Fixes #1311
2017-04-10 13:37:04 -07:00
50880fcff7
[lifecycle hooks] Make afterAll hooks operate in the fashion as afterEach.
...
It was discovered that afterAll hooks run in the same order that you add them,
while afterEach hooks were running in reverse order. This commit makes their
order consistent, and adds regression tests.
Relevant issue - https://github.com/jasmine/jasmine/issues/1311
2017-04-10 07:03:37 -07:00
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
9d6a95d9ba
Merge pull request #1301 from toubou91/gitignore-update
...
Gitignore update
2017-04-07 17:28:39 -07:00
0d3b2b2f8e
Added iml files to gitignore
2017-04-04 07:20:10 +02:00
08f046c24c
Added infinity methods, with tests
2017-03-27 00:04:43 +02:00
90c87140ac
Expect an undefined error to be passed to the expectation result
2017-03-24 14:50:54 -05:00
25d9a396aa
Test that custom matchers can supply custom errors
2017-03-24 14:12:33 -05:00
c42b1972e2
Allow the matcher provide a custom error message
2017-03-24 14:12:33 -05:00
7f8f2b5e7a
Update jsDocs to something close to full coverage for public API
...
- #596
2017-03-23 12:20:08 -07:00
9cb2f06aa6
Add a first pass at jsdoc.
...
[##130415655] #596
2017-03-21 11:36:41 -07:00
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
Darío Hereñú