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
5533d1a920
Fix casing for PhantomJS is userAgent check
2017-03-14 14:43:44 -07:00
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
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
538ae7b9ac
Merge branch 'foretagsplatsen-toHaveBeenCalledBefore'
2017-03-10 09:57:21 -08:00
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
bd9ae3a25b
Fix syntax error
2017-03-07 17:05:12 -08:00
1042c9a2dd
Collect unhandled exceptions and pass them to the current runnable
...
Fixes #529
Fixes #937
2017-03-07 16:32:11 -08:00
92e7436db2
Make sure the unlink is explicitly synchronous
2017-03-07 14:07:37 -08:00
74fe7fb85b
Only have code climate grade the src
2017-03-01 16:29:10 -10:00
7e0fd79b3b
Exclude some more stuff from codeclimate
2017-03-01 16:18:40 -10:00
8807bbb850
Pretty print objects passed to fail method
...
Fixes #1090
2017-02-26 19:25:02 +01:00
c93f35fbc8
fixup! Add toHaveBeenCalledBefore matcher
2017-02-20 10:55:23 +01:00
4cfdd06700
Add toHaveBeenCalledBefore matcher
...
This matcher makes sure the 'actual' spy is called before the
'expected' spy.
This code has been written in cooperation with Benjamin Van Ryseghem.
2017-02-20 09:52:14 +01:00
19b89d437e
Skip a spec in PhantomJS that has bugs about iframe
2017-02-16 14:50:24 +09:00
43f96d3ecd
Update gem authors
2017-02-15 17:00:17 -08:00
ac42bd9b35
More emeritus maintainers
2017-02-15 16:54:28 -08:00
9fbd0ba551
Nicer error messages for spyOn when null is provided
...
Fixes #1258
2017-02-15 15:55:27 -08:00
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
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
ed23254865
fix #1252
2017-02-10 17:17:39 +09:00
137e7e94d3
Merge pull request #1249 from Scottkao85/patch-1
...
Update MIT.LICENSE for new year
2017-01-02 12:14:44 -08:00
923b8fe9c4
Merge pull request #1248 from Nebojsaa/patch-1
...
Update README.md for new year
2017-01-02 12:14:27 -08:00
61cc1eec66
Update MIT.LICENSE
...
update copyright year to 2017
2017-01-02 10:52:58 -08:00
04be4c4583
Update README.md
2017-01-02 16:13:17 +01:00
b59ac96b51
Require arguments to beforeEach, it, etc, to be actual functions
2016-12-27 23:53:35 -08:00
be6ff8b24c
Remove unused message param from Suite#pend
...
- See #1132
2016-12-02 10:08:39 -08:00
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
41a813521b
Fix tests for toEqual diff output in IE
...
- Merges #1236 from @benchristel
2016-11-30 15:34:39 -08:00
54e7a82ef3
Merge branch 'benchristel-eq-diffs'
...
- Merges #1163 from @benchristel
- Fixes #675
2016-11-16 18:01:42 -08:00
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
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
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
Gregg Van Hove