warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,864 Commits 1 Branch 120 Tags
83ba2eb4d607768a16c2e2b801e011b6d8a782a7
Commit Graph

96 Commits

Author SHA1 Message Date
Majid Razvi 11b8b59e03 Change message for extra elements at end of actual array. #1485 2018-03-10 00:05:07 -07:00
Steve Gravrock 11827572d3 Moved toHaveClass matcher into core so that it can be used in Karma 
- Fixes #1503
 2018-02-13 17:09:42 -08:00
Gregg Van Hove 274011ed03 Merge branch 'master' into 3.0-features 2018-02-02 16:33:38 -08:00
Gregg Van Hove 46cc48ccfa Detect an Error passed to done and add an expectation failure 
- See #567
 2018-01-29 16:46:30 -08:00
Gregg Van Hove 91aab8e1b8 Merge branch 'Volox-ie11-sets-support' 
- Merges #1478 from @Volox
- Fixes #1355
 2018-01-12 17:33:51 -08:00
Volonterio Riccardo 486a64658f Added complete support for Set also for IE11. 
Fixes 1355
 2018-01-12 12:18:35 +01:00
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
Volonterio Riccardo 085a1f8a16 Added complete support for Map also for IE11. 
Fixes 1472
 2018-01-11 18:13:24 +01:00
Gregg Van Hove 21655a82c9 Use prototype for spy strategy for better memory management 
- Also convert `identity` to a property from a method
 2017-11-30 17:30:20 -08:00
Steve Gravrock 9619acf91f Extracted the predicate version of toThrowError into its own matcher 
This simplifies the signature of each matcher to something that jsdoc
can actually handle.

[Finishes #20622765]
 2017-11-28 14:30:06 -08:00
Steve Gravrock b0ec95c472 Merge branch 'master' into 3.0-features 2017-11-10 10:26:14 -08:00
Steve Gravrock 419470e9df Removed support for IE <10 
[#150527985]
 2017-11-08 08:30:22 -08:00
Steve Gravrock 285f06d5c4 Merge branch 'promise-matching-1314' of https://github.com/sderickson/jasmine 2017-11-02 17:18:24 -07:00
Benjamin Mularczyk b4dfdd7a48 Fix equality computation for ES6 Sets. 2017-11-01 01:01:26 +01:00
Steve Gravrock 12ed3bfacd Allow use of a predicate function to validate thrown exceptions 
[Finishes #20622765]
 2017-10-30 08:51:25 -07:00
Steve Gravrock 324ad0073e Refactored toThrowMatching to facilitate adding more strategies 
* Extracted sub-matchers for the two major existing strategies
  (matching all errors, and matching by type and/or message)
* Reduced the use of mutable state
 2017-10-30 08:51:25 -07:00
Steve Gravrock 9f7a6ef061 Check truthiness of toThrowError args, not arg count 
This enables some useful simplifications at the cost of making it
impossible (for now) to expect a function to throw an error with a falsy
message.

[#20622765]
 2017-10-30 08:51:25 -07:00
Zaven Muradyan 6d3953356d Add special handling of asymmetric matcher objects as keys in Maps. 
The previous Map equality code was assuming that the set of keys would
be identical between the two Maps. This change adds insertion-order
tracking for each key with its corresponding key. If one of the two keys
is an asymmetric equality obj, the keys are eq()'d, and if it succeeds,
the corresponding values are compared. Otherwise, the "main" key is
looked up directly in the other object; this is to prevent
similar-looking obj keys with different obj identities from comparing
equal.

Fixes #1432.
 2017-10-23 23:01:50 -07:00
ksvitkovsky e7049d3183 Add 'nothing' matcher and tests 2017-08-09 16:44:19 +04:00
Gilberto Stankiewicz 090a6234c3 Make toEqual matcher report the difference between array elements when arrays have different length 2017-08-08 09:55:17 -07:00
ksvitkovsky 1db81c334d Ensure no message added on asym. match success 2017-08-04 10:26:51 -07:00
Sébastien Cevey fc6ee243e9 Rewrite ES6 Set and Map comparison to ignore insertion order 2017-08-02 15:22:33 +01:00
Scott Erickson 6ddf64568e Add Promise checking to eq 
Fixes #1314
 2017-06-26 19:10:19 -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
Pierre Vanduynslager c604012793 Fix rounding in toBeCloseTo 2017-06-25 16:59:24 -04:00
Beat Richartz 271908a2c4 Fail when one of the arguments passed into toBeCloseTo matcher is null 2017-06-02 15:36:39 +01:00
rmehlinger 5ee03f02ed Add ES6 map support to Jasmine 2017-05-01 00:12:48 -07:00
Gregg Van Hove fbd2ffc08b Build distribution for keys lookup fix 2017-04-25 14:35:58 -07:00
Sean Parmelee 0d6ecbec17 iterate through keys with a regular for loop 2017-04-25 11:28:16 -05:00
Thodoris Bais 08f046c24c Added infinity methods, with tests 2017-03-27 00:04:43 +02:00
Gregg Van Hove 9cb2f06aa6 Add a first pass at jsdoc. 
[##130415655] #596
 2017-03-21 11:36:41 -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
Damien Cassou c93f35fbc8 fixup! Add toHaveBeenCalledBefore matcher 2017-02-20 10:55:23 +01:00
Damien Cassou 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
anseki ed23254865 fix #1252 2017-02-10 17:17:39 +09:00
Ben Christel 41a813521b Fix tests for toEqual diff output in IE 
- Merges #1236 from @benchristel
 2016-11-30 15:34:39 -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 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 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 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
Kevin Logan c0a9d20a02 fix for issue #1188 2016-09-01 10:59:19 -05:00
Ben Christel d9ded15c45 Move functions in to a higher scope 
- Prevents them from accessing eq's local vars, which could cause bugs.
 2016-07-21 12:10:37 -07:00
Ben Christel a0bce8031e Test comparison of objects from different frames 2016-07-21 12:10:37 -07:00
Ben Christel 738c10fd43 Make toEqual pass for arrays with equivalent properties 
- Fixes a bug caused by accidental use of a closure variable
 2016-07-18 16:48:00 -07:00
Joey Parrish de7b7c029e Pass custom testers to asymmetric testers 
This allows custom equality testers to affect asymmetric matches.
This avoid suprises when combining addCustomEqualityTester with
objectContaining or arrayContaining.

Closes #1138
 2016-06-23 14:33:39 -07:00
slackersoft 954a6a0091 Merge branch 'feat/improveErrorMessages' of https://github.com/dhoko/jasmine into dhoko-feat/improveErrorMessages 
- Merges #1026 from @dhoko
- Fixes #1025
 2016-03-18 10:59:31 -07:00
Erik Welander 927cc011d6 Added support for ES6 sets to toContain and toEqual. 2016-03-04 02:09:59 -08:00
dhoko 14067d0785 Improve errors with the domaine and how to use the API 2016-02-29 10:33:45 +01:00
Gregg Van Hove 5458f2f18d Array equality treats undefined elements as equal however they got in there 
- Fixes #786
 2016-02-22 11:06:59 -08:00