2151a13705
Let's just use the print function that's passed in for deprecation messaging
...
[#80410002 ]
2014-10-11 14:20:19 -07:00
6cc09e00d3
Oh right, IE doesn't have console by default
...
[#80410002 ]
2014-10-11 13:54:41 -07:00
6d6c31328b
Deprecate console reporter
...
- jasmine-npm has its own version so it's no longer dependent on this
one.
[finish #80410002 ]
2014-10-11 13:34:45 -07:00
c8cd2eabe5
Fixes console check for IE8
...
- Was causing IE8 to hang for some reason
- Also reverts previous commit, not that issue was resolved
[#79533268 ][fixes #80356450 ]
2014-10-09 00:41:17 -07:00
f77071254a
Fixes additional odd IE8 failure
...
[#79533268 ]
2014-10-08 23:14:40 -07:00
8880729250
JsApiReporter suiteResults only includes suite results
...
- It was including suite starts also
[#79533268 ]
2014-10-08 22:33:36 -07:00
9ad15eeaba
Merge branch 'akoptsov-patch-1'
2014-10-08 12:52:40 -07:00
10ca5f0246
Fixed path to src files in node_example
...
There's no such folder as 'jasmine_examples'
2014-10-07 16:35:38 +04:00
a5cd2731b4
Fixes CI for IE8
...
For some reason, when you put this spec in a describe block, it causes
specs to hang on IE8. I tried to debug this for a while, and I have no
idea what is happening.
[#79533268 ]
2014-10-05 14:33:40 -07:00
b12974db2e
Adds suiteResults method to JsApiReporter
...
- Behaves similarly to to specResults
- Since suites were stored in an object instead of an array and the
current interface exposes this object, we now must keep track of suites
twice in the reporter. We cannot just construct the object lazily,
because then the object will not update with new suite results
like it does currently (see JsApiReporterSpec:148).
[#79533268 ]
2014-10-04 18:36:38 -07:00
f4e5573ee3
Add explicit fail and move on for async functions
...
- `done` now has a `fail` property which will call the global `fail`
then continue to the next function in the queue
[finish #73744618 ] Fix #567 Fix #568
2014-10-02 08:10:29 -07:00
0c77c6cfb5
Use the Gemfile from the docs repo
2014-10-01 13:10:11 -07:00
cfc64a6f5c
bundle exec the docs rake tasks
2014-10-01 09:59:39 -07:00
6ab70923b3
Use rake tasks in the docs repo to test it
2014-10-01 08:15:35 -07:00
d9c0b10be4
Remove type from queueableFns since we're not using it to determine afterAll anymore.
2014-09-30 18:28:41 -07:00
a58fd20d82
Build distribution for suite failed status changes
2014-09-26 18:35:06 -07:00
eefa716530
set suite status to failed when afterAll has failures
2014-09-26 09:12:48 -07:00
66c364564e
Fix custom timeout specs for firefox
2014-09-26 08:21:54 -07:00
68ba5b6d48
Allow custom timeout for beforeEach, afterEach, beforeAll, afterAll and it
...
Fix #483
2014-09-25 22:31:00 -07:00
15ae0379ec
Add fit and fdescribe to the public interface
...
They got lost in the merge
2014-09-25 13:19:13 -07:00
1fb0d2eefa
Merge branch 'master' of https://github.com/chernetsov/jasmine into chernetsov-master
...
Fix #678 Close #679
2014-09-25 12:59:10 -07:00
ba0982d89f
Merge branch 'beforeAll' into master
...
Conflicts:
lib/jasmine-core/boot.js
lib/jasmine-core/boot/boot.js
lib/jasmine-core/jasmine.css
lib/jasmine-core/jasmine.js
spec/core/SpecSpec.js
spec/core/SuiteSpec.js
spec/core/integration/EnvSpec.js
spec/node_suite.js
src/core/Env.js
src/core/requireCore.js
src/core/util.js
2014-09-24 20:20:39 -07:00
f703539942
build distribution for toThrowError refactor
2014-09-24 18:27:40 -07:00
62840f72a6
when jasmine clock is installed and date is mocked new Date() instanceof Date should equal true
2014-09-24 15:07:22 -07:00
6d10f97151
Merge branch 'toThrowError_refactor'
2014-09-24 13:23:50 -07:00
15f3d0e9d7
update doc comment for boot.js to match current documentation
2014-09-23 08:22:05 -07:00
b1344d5c73
Add explicit fail function.
...
- Adds an expectation failure to the current spec
[finishes #70975468 ] Fix #563
2014-09-23 08:00:46 -07:00
59aaac026c
Merge branch 'paladox2015-patch-1'
2014-09-22 13:10:12 -07:00
21f62c697a
Merge branch 'patch-1' of https://github.com/paladox2015/jasmine into paladox2015-patch-1
2014-09-22 13:09:07 -07:00
dc93c33af6
Merge branch 'pimterry-trackReturnValues'
2014-09-22 13:04:18 -07:00
4889583d5c
Merge branch 'trackReturnValues' of https://github.com/pimterry/jasmine into pimterry-trackReturnValues
2014-09-22 13:04:01 -07:00
41df058171
update contributing doc to indicate use of jasmine-npm
2014-09-20 20:54:45 -07:00
fa837ae90a
Don't depend on debugger gem, we don't really have any ruby code here.
2014-09-20 20:17:55 -07:00
c82c958e0d
Build distribution for earlier fixes
2014-09-16 13:05:11 -07:00
752e831b30
Merge branch 'mkhanal-chain_spy_andReturn'
...
Fix #669 #660
2014-09-15 13:10:40 -07:00
bd30065d66
Merge branch 'chain_spy_andReturn' of https://github.com/mkhanal/jasmine into mkhanal-chain_spy_andReturn
2014-09-15 13:10:24 -07:00
84dff421ea
Use === when checking for circular dependencies for pretty printing.
2014-09-13 18:58:02 -07:00
709e032d1c
Added returnValues functionality to spy strategy
2014-09-13 12:41:20 +10:00
1290d93b6a
Suite result status added when suite is complete
...
- This makes it easier to detect afterAll failures, because we can
rely only complete runnables having statuses
[#78306786 & #73741654 ]
2014-09-09 11:26:32 -07:00
345903220c
Refactor toThrowError to be less one huge if/else if/else if block
...
- This should also improve it's code climate score as well.
- It's also about 20 lines shorter now too :)
[#59524164 ]
2014-09-07 16:02:42 -07:00
3332f93a24
Only run focused runnables inside focused suites
...
- Focused runnables now walk up the tree to unfocus the first focused
ancestor. Because of the way the tree is constructed, this makes sure
that each focused runnable has no focused ancestors.
[#78289686 ]
2014-09-05 12:25:28 -07:00
3b19d66268
Check for afterAll failures in a more browser independent way.
...
- Only look at the message, so browsers that don't provide a stack don't
blow up.
2014-09-04 18:49:14 -07:00
137c1a39f6
Check afterAll failure messages with regexp, since some browsers add more info
2014-09-04 08:15:23 -07:00
9402d59859
Suites report errors in afterAlls in the suiteDone event
...
- remove `afterAllEvent` from reporters
2014-09-03 22:18:20 -07:00
e8178d061b
Merge branch 'tgirardi-issue655'
...
Fix #655 #658
2014-09-02 13:20:18 -07:00
dd75394ea8
Merge branch 'issue655' of https://github.com/tgirardi/jasmine into tgirardi-issue655
2014-09-02 13:19:31 -07:00
6b857d11ce
Factor out some common logic between fdesc and desc
2014-08-29 09:25:41 -07:00
eb48c83649
Add specs for intervals that "clear themselves"
...
Add specs to test if issue #655 is present: the handler of an interval
cannot successfully clear the same interval that generated it's
invocation.
The most direct test consist in setting an interval with a handler that
calls clearInterval over that same interval and make the clock tick for
double of it's period. If the issue is present the interval's handler
will be called twice. If the issue is not present, the first invocation
of the handler will avoid a second one (because of the clearInterval).
Another test is included in order to check if recurring scheduled
functions are rescheduled before being called. Doing this in the reverse
order is the exact cause of the issue.
2014-08-28 20:58:30 -04:00
08a35d134d
Ensure focused tests are only run once
...
Required duplicating some of the logic for constructing a suite from
describe so that we could mark a suite as focused in fdescribe, but
otherwise this prevents focused tests from being run more than once.
[#73742944 ]
2014-08-28 17:54:42 -07:00
14824b5f9e
Expose fit and fdescribe in boot.js
...
* adds done() callbacks to existing specs (because we forgot, whoops!)
[Finishes #73742944 ]
2014-08-28 16:37:37 -07:00
slackersoft