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

77 Commits

Author SHA1 Message Date
Sean Parmelee ef3cfe7f44 skip the test when we can’t get the propertyDescriptor 2017-04-25 12:27:32 -05: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 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 19b89d437e Skip a spec in PhantomJS that has bugs about iframe 2017-02-16 14:50:24 +09: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 bad9c63bf7 Properly skip Set tests in browsers that don't really support it 2016-09-27 15:36:01 -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 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
Ben Christel 227b0c62a3 Make the build pass in ie8 
- pending() throws an exception in ie8. I have not dug into the root cause.
- iframe.contentWindow.eval() isn't supported in ie8
 2016-07-24 21:48:11 -07:00
Ben Christel cb1001e6c2 De-dup test setup 
- Move environment-specific tests for toEquals into describe blocks so the check for the environment can be shared
 2016-07-21 12:26:43 -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
Patrizio Rullo b7d8b0de71 Add toBeGreatThanOrEqual and toBeLessThanOrEqual matchers 
- Implements issue #1013
 2016-02-18 00:13:26 +01:00
Gregg Van Hove 342f0eb9a3 Merge branch 'logankd-master' 
- Support call count of 0 with toHaveBeenCalledTimes matcher

- Merges #1048
- Fixes #994
 2016-02-17 10:33:27 -08:00
Kevin Logan 44b56093e7 #1048 - fixed toThrow expectation 2016-02-17 12:16:54 -06:00
Kevin Logan bee8132848 #1015 - revert formatting and spacing 2016-02-17 12:09:26 -06:00
Kevin Logan e5c744f3dc #1015 use isNumber fuction to check for empty expected argument. This will allow 0 to be passed in. 2016-02-17 12:03:06 -06:00
Gregg Van Hove 79206ccff5 Rename j$ to jasmineUnderTest for specs 
- Clarifies what it is for when writing tests
- No longer named the same as the `jasmine` that is injected into live
  code
 2015-12-03 17:23:32 -08:00
Richard Harrington c2ae3b6b12 Remove unused parameter from toThrowError 2015-10-26 11:43:31 -04:00
Kevin a6a1962924 add toHaveBeenCalledTimes matcher 
Fix #853
 2015-06-05 21:07:24 -07:00
Gregg Van Hove ff029b37b5 Use instanceof when checking Error types in toThrowError 
Fixes #819
 2015-04-09 15:38:24 -07:00
Julie Ralph 53b0752ff0 Allow arrays from different frames or contexts to be equal 2015-02-04 09:28:04 -08:00
Gregg Van Hove a999490de9 Merge branch 'arrayContaining' of https://github.com/slackersoft/jasmine into slackersoft-arrayContaining 
Merge #440 [Finish #59947350]
 2015-01-12 14:01:02 -08:00
slackersoft 895c17e5c1 Merge branch 'rohit-equals-null-protoObjects' 2014-12-20 16:48:26 -08:00
Rohit Arondekar a84eaf2cbe Allow null prototype obj to be compared for equals 
Fixes #729
 2014-12-20 08:35:27 +05:30
slackersoft bfcd8b046d Allow asymmetric equality testers to preempt their symmetric brethren 
- Also allow them to be compared to each other properly.

Fixes #540
 2014-12-16 17:45:58 -08:00
slackersoft 2ab22951a1 Just check if either side implements asymmetricMatch 
- Don't explicitly look for `Any` or `ObjectContaining`

[#82295210]
 2014-12-16 17:29:18 -08:00
slackersoft ea88023553 Check for ObjectContaining on either side of equality. 
- Also clean up `undefined` check.

Fixes #682
 2014-12-16 17:07:35 -08:00
slackersoft 305252f5a8 toMatch requires the expected to be a String or RegExp 
- Otherwise it was using the `toString` as the RegExp, which is almost
  definitely _not_ what you want.

Fixes #723
 2014-12-16 11:50:45 -08:00
slackersoft 0fdb28c6ff Merge branch 'toEqualDomNodes' of https://github.com/alexeibs/jasmine into alexeibs-toEqualDomNodes 2014-12-16 11:25:14 -08:00
slackersoft a84202a6f9 Also check custom properties on Arrays when computing equality 
[Finishes #50616649]
 2014-12-16 10:22:23 -08:00
Charles Hansen da6813ef0d toContain works with array-like objects (Arguments, HTMLCollections, etc) 
Fixes #699

Don't rely on Array.prototype.indexOf for testing containment (not in IE8)
 2014-11-03 13:09:57 -08:00
slackersoft a4d134521a Revert "toContain works with array-like objects (Arguments, HTMLCollections, etc)" 
IE 8 doesn't have Array.prototype.indexOf so this breaks there.
Reverting until we can figure out a better way to solve across all
supported browsers.

This reverts commit 663fbd0cdb.
 2014-11-01 14:28:32 -07:00
Charles Hansen 663fbd0cdb toContain works with array-like objects (Arguments, HTMLCollections, etc) 
Fix #699
 2014-10-30 13:08:16 -07:00
slackersoft 345903220c Refactor toThrowError to be less one huge if/else if/else if block 
- This should also improve it's code climate score as well.
- It's also about 20 lines shorter now too :)

[#59524164]
 2014-09-07 16:02:42 -07:00
Alexei Bykov ac8ef2988d add better support of DOM nodes into equality matcher 2014-08-24 17:07:18 +04:00
slackersoft a1c109ea17 Contains is explicitly false if actual is undefined or null 
Fix #627
 2014-07-18 13:18:22 -07:00
Sheel Choksi 00c8e37257 Pass through custom equality testers in toHaveBeenCalledWith [fixes #536] 2014-03-26 22:19:03 -07:00
Sheel Choksi 76ca5ef6d4 Allow matcher custom failure messages to be a function 
By deferring the evaluation of these messages, we can avoid the
expensive creation of them when in the majority use case (tests are
    passing) they are not needed.

These failure messages were causing performance problems with larger
objects needed to be pretty printed as discussed in #520 and brought up
by @rdy.

[fixes #65925900][fixes #520]
 2014-02-18 20:05:30 -08:00