admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,985 Commits 1 Branch 0 Tags
4e10cf84d5f28ef26d4ea3dea8be4cde04d18974
Commit Graph

471 Commits

Author SHA1 Message Date
Gregg Van Hove
e04d3d8a62 Fix bad merge for spyOnProperty error message 2019-05-17 17:07:47 -07:00
Gregg Van Hove
06814769c6 Merge branch 'enelson/spyregerrors' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyregerrors 
- Merges #1706 from @elliot-nelson
 2019-05-17 16:44:26 -07:00
Gregg Van Hove
ea1bac5b74 Merge branch 'enelson/spyonproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonproperty 
- Merges #1705 from @elliot-nelson
 2019-05-17 16:21:17 -07:00
Gregg Van Hove
11b0d95a7d Merge branch 'enelson/toBeInstanceOf' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/toBeInstanceOf 
- Merges #1697 from @elliot-nelson
 2019-05-16 17:35:09 -07:00
Gregg Van Hove
3dde56bbd8 Merge branch 'enelson/spyonall' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyonall 
- Merges #1699 from @elliot-nelson
- Fixes #1677
 2019-05-14 18:01:27 -07:00
Gregg Van Hove
9a18fdca27 Merge branch 'enelson/spystrategies' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spystrategies 
- Merges #1688 from @enelson
- See #1590
 2019-05-09 17:30:45 -07:00
Gregg Van Hove
d856b0548a Merge branch 'megahertz-feature-to-be-rejected-with-error' 
- Merges #1686 from @megahertz
- Fixes #1625
 2019-05-03 16:36:37 -07:00
Gregg Van Hove
2fbeb201bc Fix failure messages for positive/negative infinity matchers 
- Fixes #1674
 2019-04-16 17:40:07 -07:00
Gregg Van Hove
b994a17039 Merge branch 'FelixRilling-boolean-matcher' 
- Merges #1679 from @FelixRilling
 2019-04-15 17:48:49 -07:00
Gregg Van Hove
e636f5f822 Bump version to 3.4 2019-04-03 17:03:07 -07:00
Gregg Van Hove
f5663a9076 Merge branch 'johnjbarton-duration' 
- Merges #1660 from @johnjbarton
- Fixes #1646
 2019-03-14 19:12:39 -07:00
Gregg Van Hove
7c0f013003 Merge branch 'johnjbarton-noop-timer' 
- Merges #1669 from @johnjbarton
 2019-03-13 17:34:12 -07:00
Gregg Van Hove
4108deca02 Build distribution for various typo PRs 2019-03-11 17:39:03 -07:00
Gregg Van Hove
4991f2a713 Merge branch 'print_global_error_type' of https://github.com/jbunton-atlassian/jasmine into jbunton-atlassian-print_global_error_type 
- Merges #1632 from @jbunton-atlassian
 2019-02-11 09:02:16 -08:00
Gregg Van Hove
0d6db64eb1 Merge branch 'onerror' of https://github.com/johnjbarton/jasmine into johnjbarton-onerror 
- Merges #1644 from @jognjbarton
 2019-01-30 17:38:27 -08:00
Gregg Van Hove
37dfe50d99 Stop treating objects with a nodeType as if they are DOM Nodes 
- Fixes #1638
 2018-12-17 17:10:53 -08:00
Gregg Van Hove
b3ccd4312c Bump version to 3.3.0 2018-10-25 09:47:09 -07:00
Gregg Van Hove
5524207658 Add api docs for .not and .withContext 2018-10-24 16:49:31 -07:00
Gregg Van Hove
2d303a6e46 Merge common async/sync expectation stuff 2018-10-24 16:17:30 -07:00
Gregg Van Hove
1e47dcf2cc Pull async matchers out to their own functions 
- Makes AsyncExpectation closer to Expectation
 2018-10-23 16:02:31 -07:00
Gregg Van Hove
ba1e8f8008 Implement withContext for async expectations too 2018-10-22 16:42:36 -07:00
Gregg Van Hove
a91db0dfc2 more rejected to -> rejected with 2018-10-22 16:08:57 -07:00
Gregg Van Hove
1d130036f4 Merge branch 'master' into expect-context 2018-10-22 14:55:20 -07:00
Gregg Van Hove
e6a60a7bef Merge branch 'codymikol-toBeRejectedWith' 
- Merges #1615 from @codymikol
- Closes #1600
- Fixes #1595
 2018-10-22 11:20:03 -07:00
Gregg Van Hove
7b9fc80b8f Merge branch 'tdurtschi-master' 
- Merges #1616 from @tdurtshi
- Fixes #1614
 2018-10-22 10:59:03 -07:00
Gregg Van Hove
440b6934aa Merge branch 'codymikol-assertAsync-promiseLike-support' 
- Merges #1613 from @codymikol
- Fixes #1612
 2018-10-19 16:24:30 -07:00
Gregg Van Hove
16fef04629 Merge branch 'patch-1' of https://github.com/nitobuendia/jasmine into nitobuendia-patch-1 
- Merges #1601 from @nitobuendia
- Fixes #1594
 2018-09-25 17:28:57 -07:00
Gregg Van Hove
d180c2026e Merge branch 'master' of https://github.com/Havunen/jasmine into Havunen-master 
- Merges #1599 from @Havunen
 2018-09-25 17:14:49 -07:00
Gregg Van Hove
92d0882a32 Introduce a configuration object to Env deprecating old single use functions 
[finishes #159158038]
 2018-09-25 17:08:41 -07:00
Gregg Van Hove
12f56fdb7d bump version to 3.2.1 2018-08-14 17:19:23 -07:00
Gregg Van Hove
afa18e554c Correctly expost spyOnAllFunctions 
- See #1581
 2018-08-14 17:11:50 -07:00
Gregg Van Hove
112672c4a9 bump version to 3.2.0 2018-08-08 17:33:50 -07:00
Gregg Van Hove
3a52c444f8 Merge branch 'aeisenberg-spy-all' 
- Merges #1581 from @aeisenberg
- Fixes #1421
 2018-07-24 17:55:44 -07:00
Ilya Konstantinov
8c1b80daae Improve Jasmine timeout error message 2018-06-18 17:36:43 -07:00
Gregg Van Hove
e2895a92dc Fix JSDoc naming for Env functions 
- See #1565
 2018-06-06 17:13:52 -07:00
Gregg Van Hove
03998c1b20 Add documentation for more public functions on Env 
- Fixes #1565
 2018-06-05 17:13:58 -07:00
Steve Gravrock
9472df0db4 Added a basic set of async matchers 
- Fixes #1447
- Fixes #1547
 2018-06-04 21:07:44 -07:00
Gregg Van Hove
8f7327cb4d Properly cascade StopExecutionError's up the tree 
- Fixes #1563
 2018-05-30 17:32:14 -07:00
Gregg Van Hove
3636014917 Merge branch 'hide-grey-specs' of https://github.com/SamFare/jasmine into SamFare-hide-grey-specs 
- Merges #1561 from @SamFare
 2018-05-23 17:15:40 -07:00
Steve Gravrock
282c436463 Implemented matcher negation as a filter 2018-05-13 23:01:55 -07:00
Steve Gravrock
533bda5d24 Split Expectation#wrapCompare into several smaller functions 2018-05-13 22:48:58 -07:00
Gregg Van Hove
ced2b114e4 Better detection of DOM Nodes for equality 
- Also use JSDom if a real one isn't present to get some more coverage
  there

- Fixes #1172
 2018-05-04 18:01:08 -07:00
Gregg Van Hove
01a1113387 Merge branch 'yinm-fix-typo' 
- Merges #1555 from @yinm
 2018-05-03 17:21:18 -07:00
Gregg Van Hove
d6cfc4a9b5 Merge branch 'riophae-master' 
- Merges #1551 from @riophae
 2018-05-02 17:52:03 -07:00
Gregg Van Hove
7e14a97371 Explicitly pass in timing functions in mock clock integration specs 
- This way we can make sure that clear stack always works no matter
  how long the suite in the spec is

[fixes #153518103]
 2018-04-23 17:25:11 -07:00
Gregg Van Hove
c440d13754 Use the same global for everything in Env 
- No longer use `getGlobal` for clearStack and QueueRunner
 2018-04-13 17:14:48 -07:00
Gregg Van Hove
a978f50f1d name new global status stuff correctly in API docs 2018-04-02 17:20:39 -07:00
Steve Gravrock
74287c578c Check for accidental global variable creation 2018-03-25 12:01:50 -07:00
Steve Gravrock
847a959b13 Merge branch 'handle-rejection' of https://github.com/johnjbarton/jasmine 
- Merges #1521 from @johnjbarton
 2018-03-24 19:49:58 -07:00
Steve Gravrock
05015a8b3e Correctly format stack traces for errors with multiline messages 
- Fixes #1526
 2018-03-10 12:03:08 -08:00