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

700 Commits

Author SHA1 Message Date
Thodoris Bais 08f046c24c Added infinity methods, with tests 2017-03-27 00:04:43 +02:00
Jared Deckard c42b1972e2 Allow the matcher provide a custom error message 2017-03-24 14:12:33 -05:00
Gregg Van Hove 7f8f2b5e7a Update jsDocs to something close to full coverage for public API 
- #596
 2017-03-23 12:20:08 -07:00
Gregg Van Hove 9cb2f06aa6 Add a first pass at jsdoc. 
[##130415655] #596
 2017-03-21 11:36:41 -07:00
Gregg Van Hove 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
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
Gregg Van Hove 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
Gregg Van Hove 1042c9a2dd Collect unhandled exceptions and pass them to the current runnable 
Fixes #529
Fixes #937
 2017-03-07 16:32:11 -08:00
mmmichl 8807bbb850 Pretty print objects passed to fail method 
Fixes #1090
 2017-02-26 19:25:02 +01: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
Gregg Van Hove 9fbd0ba551 Nicer error messages for spyOn when null is provided 
Fixes #1258
 2017-02-15 15:55:27 -08:00
anseki ed23254865 fix #1252 2017-02-10 17:17:39 +09:00
Zaven Muradyan b59ac96b51 Require arguments to beforeEach, it, etc, to be actual functions 2016-12-27 23:53:35 -08:00
Gregg Van Hove be6ff8b24c Remove unused message param from Suite#pend 
- See #1132
 2016-12-02 10:08:39 -08:00
Gregg Van Hove 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
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 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
Zaven Muradyan c21bdaf35d Fix bug where before/afterAll were being executed in disabled suites. 2016-10-23 20:40:58 -07:00
Pivotal 369e8cc08b Merge branch 'mockMethodsShortcut' of https://github.com/mbildner/jasmine into mbildner-mockMethodsShortcut 
- Merges #1101 from @mbildner
 2016-10-17 15:53:05 -07:00
Gregg Van Hove 0e9b9a11c3 Fix tests for new stack clearing in IE 2016-10-14 15:53:00 -07:00
Gregg Van Hove 2f01f64249 Build distribution for clear stack implemenation 2016-10-14 09:48:11 -07:00
Gregg Van Hove 17c89c69d6 Separate clear stack and run it after each spec 
[finishes #50197985][fix #109418332]
- Fixes #985
- Fixes #945
- Fixes #366
 2016-10-14 09:21:49 -07:00
Gregg Van Hove 0d1a9a72d9 Fix spy arity stuff to work in IE8 2016-09-28 11:49:07 -07:00
Gregg Van Hove c2e2bd7c91 Merge branch 'spy-arity-preservation' of https://github.com/kapke/jasmine into kapke-spy-arity-preservation 
- Merges #1055 from @kapke
- Fixes #991
 2016-09-27 15:42:45 -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 f4849f6401 Merge branch 'pretty-print-cross-frame-objects' of https://github.com/thatfulvioguy/jasmine into thatfulvioguy-pretty-print-cross-frame-objects 
- Merges #1091 from @thatfulvioguy
- Fixes #1087
 2016-09-27 11:40:01 -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 04bb56a5b5 Allow currently registered reporters to be cleared 
- jasmine/jasmine-npm#88
 2016-09-16 16:02:08 -07:00
Gregg Van Hove 4e47b78f1f Use isFunction to check for functionness in callFake 
- Fixes #1191
 2016-09-14 16:06:44 -07:00
Henry Blyth 8e23c26383 Make spyOnProperty available in tests 
Needed adding to the env and require interface
 2016-09-12 18:22:58 -05:00
Sukharev Maxim 56191cfb2e Implement spies for get/set functions on accessor properties 2016-09-12 18:22:58 -05:00
Gregg Van Hove 3486e8d166 Merge branch '1189' of https://github.com/seanparmelee/jasmine into seanparmelee-1189 
- Merges #1193 from @seanparmlee
- Fixes #1189
 2016-09-01 21:11:07 -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
Sean Parmelee 8676bbf11a fallback on assignment when a spy cannot be deleted 2016-09-01 13:39:25 -05:00
Kevin Logan c0a9d20a02 fix for issue #1188 2016-09-01 10:59:19 -05:00
Gregg Van Hove c7cc3b4a29 Properly tick date along with clock 
- Specifically when there aren't functions scheduled at the ticks

Fixes #1190
 2016-08-31 21:24:01 -07:00
Gregg Van Hove 850204dfb8 Merge branch 'prettyPrintCustomConstructortoString' of https://github.com/mbildner/jasmine into mbildner-prettyPrintCustomConstructortoString 
- Fixes #1019
- Merges #1099
 2016-08-15 15:50:59 -07:00
Gregg Van Hove b9c25e88b9 Merge branch 'callfake-better-error' of https://github.com/kapke/jasmine into kapke-callfake-better-error 
- Merges #1059
- Fixes #1016
 2016-08-15 09:34:03 -07: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
Greg Cobb 314eb63552 Merge pull request #1129 from gregeinfrank/remove-runnable-lookup-table 
Remove runnableLookupTable which is no longer used
 2016-07-18 23:39:15 -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
Greg Einfrank e13c7a55a9 Remove runnableLookupTable which is no longer used 2016-06-08 10:59:42 -07:00
Pivotal 7a62969a14 createSpyObj may use object for method->response shorthand 
examples:

```JavaScript
var mySpy = jasmine.createSpyObj("mySpy", { getAge: 55, getLanguage: "JavaScrizzle" });

var age = mySpy.getAge();

expect(age).toEqual(55);
expect(mySpy.getAge).toHaveBeenCalled();
```

Also does:

Add "isObject_" method to utils to make it easier for "createSpy" to support an array or object of stubs
 2016-04-25 17:10:22 -04:00
Pivotal 604cd6132f Prettyprint objects whose constructors have custom toString method 
- when the constructor has a name, print the name
- when the constructor does not have a name, print `<anonymous>`

[Fixes issue 1019](https://github.com/jasmine/jasmine/issues/1019)
 2016-04-25 14:23:48 -04:00
Fulvio Valente 2710bdfc5e Correctly pretty print objects from other contexts (e.g. iframes) and which do not override toString 
Fixes #1087
 2016-04-11 18:51:04 +01:00