admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,046 Commits 1 Branch 0 Tags
19292e4ea41591b842e96abde1ce367b33d3eb55
Commit Graph

808 Commits

Author SHA1 Message Date
Steve Gravrock
8ad1dd163b Merge branch 'arrayContaining-actuals-must-be-arrays' of https://github.com/divido/jasmine 
* Merges #1746 from @divido
* Fixes #1745
 2019-08-30 13:12:47 -07:00
Steve Gravrock
ded8b760aa Merge branch 'UziTech-patch-1' 
* Merges #1732 from @UziTech
 2019-08-30 10:27:53 -07:00
Tony Brix
f77ee32c56 Add custom async matchers 2019-08-30 09:30:14 -07:00
Pivotal
008b80adc5 Merge branch 'enelson/default' of https://github.com/elliot-nelson/jasmine 
* Merges #1716 from @elliot-nelson
 2019-08-29 13:50:27 -07:00
Steve Gravrock
1a63ab4677 Accept configurations with Promise: undefined. 
Fixes Karma and anything else that uses Env#configuration
as a starting point for a Jasmine config.
 2019-08-26 15:45:13 -07:00
Gregg Van Hove
0449b35f5a Merge branch 'tobe-tostring' of https://github.com/johnjbarton/jasmine into johnjbarton-tobe-tostring 
- Merges #1718 from @johnjbarton
- Fixes #1726
 2019-08-07 12:03:46 -07:00
Steve Gravrock
18195a868c Updated async timeout message 
There are now multiple ways to do async functions, and callbacks
are probably the least common in new code, so the message should
be more general rather than referring to callbacks.
 2019-08-03 08:25:57 -07:00
Steve Gravrock
c100bb6242 Made output of toHaveBeenCalledWith more readable 
This breaks each call out onto its own line, so that it's much easier to
see where each call starts and how they differ. E.g. previously the output
would be:

    Expected spy foo to have been called with [ 'bar', 'baz', 'qux' ] but actual calls were [ [ 42, 'wibble' ], [ 'bar' 'qux' ], [ 'grault '] ]

Now it's:

    Expected spy foo to have been called with:
      [ 'bar', 'baz', 'qux' ]
    but actual calls were:
      [ 42, 'wibble' ],
      [ 'bar' 'qux' ],
      [ 'grault '].
 2019-07-13 10:37:05 -07:00
Gregg Van Hove
066162d6bc Merge branch 'enelson/spyobjproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyobjproperty 
- Merges #1722 from @elliot-nelson
- Closes #1569
- Fixes #1442
 2019-06-25 16:26:43 -07:00
Gregg Van Hove
3e888105f0 Calculate total suite run time inside the env and report in jasmineDone 2019-06-14 14:59:33 -07:00
Gregg Van Hove
15f969bee7 Add @since to most JSDoc comments 
- See jasmine/jasmine.github.io#117
 2019-06-12 16:23:12 -07:00
Gregg Van Hove
984018bfdf Make no expectations in HTML Reporter message a warning 
- Fixes #1704
 2019-06-12 13:31:25 -07:00
Gregg Van Hove
8da1fd1ed1 Merge branch 'master' of https://github.com/pixelpax/jasmine into pixelpax-master 
- Merges #1713 from @pixelpax
 2019-05-30 17:47:16 -07:00
Gregg Van Hove
8af669677a Cleanup spy promise strategies to be more consistent with Jasmine at large 
- Rename `resolveWith` to `resolveTo` to match `toBeResolvedTo`
- No longer wrap non-Errors in `rejectWith`

- Fixes #1715
 2019-05-23 17:29:12 -07:00
Gregg Van Hove
b4cbe9850f add prettier and eslint 2019-05-21 18:23:48 -07:00
Gregg Van Hove
cf2c5c9acc Merge branch 'enelson/src-cleanup-2' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/src-cleanup-2 
- Merges #1708 from @elliot-nelson
 2019-05-21 17:45:46 -07:00
Gregg Van Hove
df6a71e37d Merge branch 'spy-to-string' of https://github.com/johnjbarton/jasmine into johnjbarton-spy-to-string 
- Merges #1712 from @johnjbarton
 2019-05-20 17:22:05 -07:00
Gregg Van Hove
32a3288c9d Merge branch 'elliot-nelson-enelson/pp' 2019-05-20 17:18:29 -07:00
Gregg Van Hove
b12981a3e7 build dist for rounding fix 2019-05-20 17:17:55 -07:00
Gabriel Elkind
88c8c905ba Adds width to root level html-reporter class 2019-05-20 15:25:38 -05:00
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
wood
873a237e3d Consolidate some dev dependencies and use more maintained versions 2019-03-26 17:12:21 -07:00
wood
828d14f48e Use node.js for browser-based CI 2019-03-25 17:55:53 -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
3ae61b14ad Merge branch 'm1010j-m1010j-add-status-marks-to-standalone' 
- Merges #1610 from @m1010j
- Fixes #1596
 2018-10-01 12:25:23 -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