83beca6899
Merge branch '2.99-patch'
2018-02-09 09:32:09 -08:00
3c6308f1dc
Don't include the specs in the ruby gem
...
- Bump to 2.99.2 for gem
2018-02-09 09:22:35 -08:00
fa6a80b76e
Merge branch 'master' of https://github.com/aptx4869/jasmine into aptx4869-master
...
- Merges #1501 from @aptx4869
2018-02-08 10:22:36 -08:00
4fcd4099ad
Resolve merge conflict
...
Fixes #1500
2018-02-08 15:07:29 +08:00
fbec3cc230
Only show deprecation for catch exceptions if you tell Jasmine not to catch
...
- Fixes #1497
2018-02-07 14:47:10 -08:00
4530f9431f
Generate combined file with new version numbers
2018-02-06 10:33:39 -08:00
d4b76a4d3b
version bump to 3.0
2018-02-06 09:33:49 -08:00
764d58a7f5
Merge branch 'master' into 3.0-features
...
- cleaning up 2.99 deprecations
2018-02-06 09:31:51 -08:00
9911d37f06
bump version to 2.99
2018-02-05 16:57:51 -08:00
c142490c69
Add deprecation messages for things that will change/break in 3.0
...
[#154746527 ]
2018-02-05 14:01:46 -08:00
24bf3489dc
Display deprecation warnings in HTML reporter
...
- Also no longer check for stack since IE doesn't do that
[#154746527 ]
2018-02-05 12:11:36 -08:00
5afe1222f4
Add ability to report deprecation warnings from within the suite
...
[#154746527 ]
2018-02-05 11:19:15 -08:00
274011ed03
Merge branch 'master' into 3.0-features
2018-02-02 16:33:38 -08:00
0eca06a33b
Now pass a navigation helper to HtmlReporter instead of click handlers
2018-01-30 14:30:28 -08:00
84953ec210
stop spec on failure should not default to true
2018-01-30 11:48:25 -08:00
e15f273f06
Replace old "catch exceptions" logic with proper fail fast with error reporting
...
- Option is called stopOnSpecFailure
[#85966014 ]
- See #414
- See jasmine/jasmine-npm#16
2018-01-30 11:36:56 -08:00
46cc48ccfa
Detect an Error passed to done and add an expectation failure
...
- See #567
2018-01-29 16:46:30 -08:00
262a2fe674
Generate compiled jasmine.js for async reporters work
2018-01-29 14:02:02 -08:00
341c6df6ea
Fix HTML reporter display for excluded specs
2018-01-29 10:00:15 -08:00
3df9cc26d4
Update css for new reporter status
...
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2018-01-26 15:27:35 -08:00
6b156ca6d1
Unify status for xdescribe and xit
...
- Ensure *All's only execute if at least one child will run
- Specs will report a status of `excluded` instead of disabled
[finishes #153967580 ]
- #1418
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-25 16:17:31 -08:00
07996b567f
Suite level errors are reported in failures list
...
[#150118881 ]
Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io >
2018-01-23 15:39:11 -08:00
9a96396f65
Generate jasmine.js for suite reporting changes
...
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-23 14:38:40 -08:00
414e03bded
Setup createSpy in all specs where needed and finish renaming params
...
Signed-off-by: Elenore Bastian <ebastian@pivotal.io >
2018-01-22 14:21:52 -08:00
038ab87252
Merge branch 'custom-spy-strategy' into 3.0-features
2018-01-22 12:12:59 -08:00
f20f78f82b
Don't clobber previous custom plans with later plans
...
[finishes #37288941 ]
2018-01-22 12:10:24 -08:00
70bce55721
Bump version to 2.9.1
2018-01-19 17:51:18 -08:00
c82e5947f5
Version bump to 2.9.0
2018-01-16 17:29:34 -08:00
91aab8e1b8
Merge branch 'Volox-ie11-sets-support'
...
- Merges #1478 from @Volox
- Fixes #1355
2018-01-12 17:33:51 -08:00
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
e2a191b116
Refactor QueueRunner and remove references to functions that Jasmine is done with
...
[finishes #56030214 ]
2018-01-11 17:20:13 -08:00
cf2f922e30
Merge branch 'master' into 3.0-features
2018-01-10 15:28:55 -08:00
aeeb5b7107
Bumped copyright dates
2018-01-10 10:16:02 -08:00
4934e420b2
Allow adding custom spy strategies
...
[#37288941 ]
2018-01-10 08:59:19 -08:00
1085914a76
Extracted a SpyFactory to slim Env down a bit
2018-01-09 13:32:28 -08:00
6f119c4e5a
Moved createSpy to env so it can be stateful
2018-01-09 10:16:02 -08:00
298b5ba127
Moved createSpyObj to env so it can be stateful
2018-01-09 09:53:45 -08:00
16e07a0e99
Add the ability to specify the strategy to use for a spy based on which parameters are passed
...
[Finishes #92260826 ]
2018-01-03 08:49:34 -08:00
cb6de64e58
Fixed DelayedFunctionScheduler IE 8 compatibility issue
2018-01-02 18:17:23 -08:00
f69949ebc0
Merge branch 'fix-1426' of https://github.com/leahciMic/jasmine
...
- Merges #1427 from @eahciMic
- Fixes #1426
2018-01-02 08:18:32 -08:00
b943f6b736
Fixed SPEC HAS NO EXPECTATIONS warning in HTML reporter
...
[Finishes #153891435 ]
2017-12-23 11:14:37 -08:00
b439e2fb37
Extracted results state management out of the HTML reporter
...
[#153891435 ]
2017-12-23 11:12:38 -08:00
c79ce125c0
Merge branch 'node-timeouts' of https://github.com/chris--young/jasmine
...
- Merges #1470 from @chris--young
- Fixes #1469
2017-12-21 13:24:21 -08:00
65b4499dec
In Jasmine's own tests, don't leak between jasmine and jasmineUnderTest
2017-12-20 12:08:22 -08:00
d742ada71d
Added links to re-run the suites containing a failing spec
...
[Finishes #25508053 ]
2017-12-19 11:29:18 -08:00
b6cc34d9e9
Correctly remove spies of window.onerror on IE
2017-12-18 16:34:37 -08:00
ef9f82a17d
Merge branch 'master' into 3.0-features
2017-12-18 09:48:17 -08:00
d3a3cf1ff3
Collapsed StringPrettyPrinter into PrettyPrinter
...
We never really took advantage of the potential extensibility that the
split provided, and the boundary between the two was getting muddied
over time.
2017-12-18 09:43:25 -08:00
c0d0513199
Stop serializing objects after hitting jasmine.MAX_PRETTY_PRINT_CHARS
2017-12-15 13:23:59 -08:00
86a38fceb9
Truncate pretty printer output that is more than j$.MAX_PRETTY_PRINT_CHARS long
2017-12-13 08:09:22 -08:00
Gregg Van Hove