f38e8e9235
Merge branch 'cloned-args-on-calltracker' of https://github.com/a-r-d/jasmine into a-r-d-cloned-args-on-calltracker
...
- Merges #1000
- Fixes #872
2016-02-16 15:00:49 -08:00
6489b0f400
Add support on Env to provide fallback report
2016-02-15 23:12:05 -02:00
5e3582d8e7
Add support to fallback report providing on ReportDispatcher
2016-02-15 23:12:05 -02:00
d6f1f8dec5
Correctly teardown spies on inherited methods
...
- If the spied method is not an own property of the object being spied
upon, the method is deleted from the object on teardown instead of
being set to the original implementation.
- #737
2016-02-01 17:45:47 -08:00
65241565c5
Reverse order that spies are cleared up.
...
Fixes #1010
2016-01-03 19:14:57 -08:00
17c5e2b10d
Merge branch 'fix-clock-date' of https://github.com/andrewiggins/jasmine into andrewiggins-fix-clock-date
...
Fixes #915
Merges #980
2015-12-22 15:18:58 -08:00
3e91ac0889
add option to shallow clone args in call tracker
2015-12-22 00:27:51 -05:00
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
e2e2d1b343
Revert #908
...
- Run `afterEach` in reverse order declared as before
2015-12-03 16:02:32 -08:00
c8b212f278
make DelayedFunctionScheduler update the mockDate
2015-11-20 03:45:57 -08:00
c1ab3c9cbe
Add support for returning run details for reporting randomness
...
[#92249258 ]
2015-11-04 12:05:29 -08:00
0f6a7f04b3
Merge branch 'issue#896' of https://github.com/himajasuman/jasmine into himajasuman-issue#896
2015-10-27 14:12:31 -07:00
25d73515f3
Merge branch 'to-throw-error-unused-param' of https://github.com/FuzzySockets/jasmine into FuzzySockets-to-throw-error-unused-param
2015-10-27 12:21:42 -07:00
ea4c44904d
IE 8 doesn't support defineProperty on non-DOM nodes, skip that kindof thing
2015-10-26 17:41:30 -07:00
c2ae3b6b12
Remove unused parameter from toThrowError
2015-10-26 11:43:31 -04:00
110cacab19
Added a throw error block in describe incase a function with arguments is passed in describe
2015-10-25 14:13:14 -04:00
e7dbc75fc2
feat(spy): add option to respy
...
will not throw error if spyOn called on a spy
fixes #931
2015-10-24 08:37:33 +03:00
a81466d9e7
Abort spying when the target cannot be spied on
2015-10-21 12:44:52 +02:00
e5c2572753
Change #xit so that it will output a more BDD-style pending message
2015-10-14 21:03:47 -06:00
4221b2d2c4
Merge branch 'random-tests' of https://github.com/marcioj/jasmine into marcioj-random-tests
2015-10-04 14:03:17 -07:00
3f3fa484b2
Allow tests to run in random order
2015-09-26 14:53:08 -03:00
d0ad9b98cd
Use toString for objects if it has been overriden
2015-09-25 20:19:48 +01:00
f3a7396845
afterEach behavior
2015-08-18 17:55:03 -04:00
750a9aac6d
Merge pull request #869 from ljwall/jasmine
...
Fixes #855
2015-08-03 15:01:43 -07:00
a6a1962924
add toHaveBeenCalledTimes matcher
...
Fix #853
2015-06-05 21:07:24 -07:00
7bfc4c0a45
xdescribe marks pending, plus associated tests.
2015-05-29 17:21:28 +01:00
302e78f1df
Raise an error when jasmine.any() isn't passed a constructor
2015-05-17 02:21:26 -04:00
65a6decd6d
Fix ordering for suites with more than 11 direct children.
...
- When no specs were focused, they all had the same precedence, and
`sort`ing them caused some of the nodes to move around
Fixes #850
2015-05-13 14:45:11 -07:00
225c7bdda3
Set the shared user context correctly when executing the top level suite
...
Fixes #846
2015-05-11 10:29:51 -07:00
add841a1e9
A spec without a function provided should be pending not disabled
...
Fixes #840
2015-05-07 13:46:52 -07:00
ff029b37b5
Use instanceof when checking Error types in toThrowError
...
Fixes #819
2015-04-09 15:38:24 -07:00
1d366772b7
Don't throw if we're already handling an exception
...
[finish #91407284 ]
2015-03-30 08:19:06 -07:00
d137b83c1c
Don't install the clock if the current timing functions aren't the originals
...
[finish #64116664 ] Fix #782
2015-03-27 10:14:03 -07:00
2af9a45fb2
Correctly handle functions that are scheduled after the clock is uninstalled and reinstalled from within Clock#tick.
...
Fixes #790 .
2015-03-14 17:40:27 -07:00
7693a4c959
Allow user to stop a specs execution when an expectation fails
...
[finish #1165916 ] #577
2015-03-05 15:28:00 -08:00
ce9600a3f6
Allow the clock to be installed for the duration of a single closure
...
[finish #67434180 ]
2015-03-04 17:41:49 -08:00
c77ff30263
Show the name of the constructor function when printing an any
...
- instead of a `toString` of the entire constructor
Fixes #796
2015-03-03 13:27:31 -08:00
dc652cfb05
Clean up some TreeProcessor stuff.
...
- Properly segment parents of segmented suites
2015-03-03 13:14:20 -08:00
715de7aa38
Implement TreeProcessor to solve some issues with running the suite
...
- execute beforeAll/afterAll once per suite instead of once per child
when running focused specs/suites Fixes #773
- refuse to execute an order if it would cause a suite with a beforeAll
or afterAll to be re-entered after leaving once
- report children of an xdescribe similarly to how they would be
reported if they were themselves x'd out Fixes #774
- only process the tree once instead of figuring it out again at each
level
[finishes #87545620 ]
Fixes #776
2015-03-02 11:41:45 -08:00
0c68cc4afc
Fix spec so it can be run in isolation
...
relates to #790
2015-02-27 16:57:23 -08:00
10f87b3b90
Fixes issue where mock clock was being used by QueueRunner
...
- If the mock clock was installed in a beforeAll, the QueueRunner would use the mock clock for its own clock. If the mock clock was ticked more than the default timeout, async specs would timeout.
[fixes #783 #792 ]
2015-02-24 21:56:52 -05:00
69956bf8f6
ObjectContaining matches prototype properties
...
[#769 ]
2015-02-05 14:15:57 -08:00
d5dfbc98c3
Updates pretty printer to include array properties
...
[fixes #766 ][finishes #87644044 ]
2015-02-04 11:05:03 -08:00
53b0752ff0
Allow arrays from different frames or contexts to be equal
2015-02-04 09:28:04 -08:00
8e3066db42
Allow pending to take a reason and show it in the HtmlReporter
...
[#78954014 ] Fix #671
2015-01-26 15:55:31 -08:00
ebbaab4cf9
Prevents *Alls from running when runnables are explicitly set
...
- This requires passing if runnables are set to the Suite. Hopefully in
the future we will change how focused runnables and *Alls interact so
this is no longer necessary.
[#732 ]
2015-01-23 17:27:13 -08:00
1dd4af3835
anything and stringMatching have custom pretty-print now.
2015-01-21 12:59:01 -08:00
3140d5fb95
Allow createSpyObj to be called with just an array of method names
...
[Finish #50757607 ] #321
2015-01-12 15:16:50 -08:00
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
c1479acd17
Fix fail specs for all browsers #734
2015-01-12 13:37:10 -08:00
Gregg Van Hove