warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,693 Commits 1 Branch 120 Tags
b6cc34d9e94de82df94db506f75af6146b410855
Commit Graph

79 Commits

Author SHA1 Message Date
Steve Gravrock
18ed34e9be Fixed failing specs 2017-11-29 09:32:12 -08:00
Steve Gravrock
f4caf27208 Fixed pending() for async/promise-returning specs 
Fixes #1449.
Fixes #1450.
 2017-11-29 08:57:29 -08:00
Steve Gravrock
4c6dadb9b1 Merge branch 'github-1295' of https://github.com/ksvitkovsky/jasmine 
- Merges #1411 from @ksvitkovsky
 2017-10-23 11:58:30 -07:00
Gregg Van Hove
6d0f0ed915 Only use the extra setTimeout outside of IE8. 2017-08-10 16:38:13 -07:00
ksvitkovsky
da2673e02f Test nested methods to throw an error 2017-08-10 22:05:13 +04:00
Gregg Van Hove
2588b442e6 Integration specs that actually execute a suite need to be async 2017-08-09 11:51:26 -07:00
Gregg Van Hove
af41e5ea5c Properly wait until test env has completed before moving on. 2017-08-09 11:43:55 -07:00
darthjee
b0aac6b852 Add class UserContext 2017-07-26 23:40:22 +02:00
Gregg Van Hove
2e737f50ca Don't use window 2017-06-15 14:32:18 -07:00
Gregg Van Hove
c60d669940 Break into a setTimeout every once in a while 
- Allows the CPU to run other things that used the real `setTimeout`

- Fixes #1327
- See #1334
- Fixes jasmine/gulp-jasmine-browser#48
 2017-06-15 14:24:40 -07:00
Gregg Van Hove
578f63b9bd Make sure the queue runner goes async for async specs 
- Even if `done` is called synchronously.

See #1327 #1334 jasmine/gulp-jasmine-browser#48
 2017-06-06 14:29:02 -07:00
Gregg Van Hove
3372af1cf1 Merge branch 'seed-reporting' of https://github.com/sgravrock/jasmine into sgravrock-seed-reporting 
- Merges #1348 from @sgravrock
 2017-05-23 14:12:49 -07:00
Gregg Van Hove
d355fa0806 Don't tick extra. It's breaking IE 8 & 9 2017-05-22 14:27:08 -07:00
Steve Gravrock
b1e97cfb09 Correctly route errors that occur while a QueueRunner is clearing stack 
Besides surfacing the error in the hopefully-correct place, this also
prevents the queue runners for sibling suites from interleaving, which
in turn prevents all kinds of internal state corruption.

Signed-off-by: Gregg Van Hove <gvanhove@pivotal.io>
 2017-05-09 15:01:18 -07:00
Steve Gravrock
e6a7932ec1 Report the random seed at the beginning and end of execution 
This allows reporters to provide the seed to the user even in cases
where Jasmine crashes before completing.
 2017-05-08 12:09:17 -07:00
Gregg Van Hove
19b83a7434 Throw a recognizable Error message when fail outside of a spec. 
Fixes #1017
 2017-04-11 12:02:29 -07:00
Gregg Van Hove
a37b6c0d32 Merge branch 'master' of https://github.com/mmmichl/jasmine into mmmichl-master 
- Merges #1283 from @mmmichl
 2017-03-14 17:50:28 -07:00
Gregg Van Hove
1042c9a2dd Collect unhandled exceptions and pass them to the current runnable 
Fixes #529
Fixes #937
 2017-03-07 16:32:11 -08:00
mmmichl
8807bbb850 Pretty print objects passed to fail method 
Fixes #1090
 2017-02-26 19:25:02 +01:00
Zaven Muradyan
c21bdaf35d Fix bug where before/afterAll were being executed in disabled suites. 2016-10-23 20:40:58 -07:00
Gregg Van Hove
0e9b9a11c3 Fix tests for new stack clearing in IE 2016-10-14 15:53:00 -07:00
Gregg Van Hove
9750ae59e7 Update env integration specs now that we're really async 2016-10-14 10:13:27 -07:00
Gregg Van Hove
17c89c69d6 Separate clear stack and run it after each spec 
[finishes #50197985][fix #109418332]
- Fixes #985
- Fixes #945
- Fixes #366
 2016-10-14 09:21:49 -07:00
Gregg Van Hove
dbd198f7d0 Allow expectations in a global beforeAll or afterAll 
- Report afterAll failures in jasmineDone
- Issue #811
 2016-02-25 15:01:47 -08:00
Gregg Van Hove
602f5bc08a Merge branch 'fallback-report' of https://github.com/mauricioborges/jasmine into mauricioborges-fallback-report 
- Merges #1009
 2016-02-22 10:20:48 -08:00
Gregg Van Hove
5bdd7e8fbf Merge branch 'issue-931-respy' of https://github.com/guy-mograbi-at-gigaspaces/jasmine into guy-mograbi-at-gigaspaces-issue-931-respy 
- Merges #953
- Fixes #931
 2016-02-18 11:40:01 -08:00
Mauricio Borges Silva
6489b0f400 Add support on Env to provide fallback report 2016-02-15 23:12:05 -02:00
Gregg Van Hove
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
guy-mograbi-at-gigaspaces
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
Marcio Junior
3f3fa484b2 Allow tests to run in random order 2015-09-26 14:53:08 -03:00
Liam Wall
7bfc4c0a45 xdescribe marks pending, plus associated tests. 2015-05-29 17:21:28 +01:00
Gregg Van Hove
add841a1e9 A spec without a function provided should be pending not disabled 
Fixes #840
 2015-05-07 13:46:52 -07:00
slackersoft
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
slackersoft
0c68cc4afc Fix spec so it can be run in isolation 
relates to #790
 2015-02-27 16:57:23 -08:00
Greg Cobb
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
slackersoft
8e3066db42 Allow pending to take a reason and show it in the HtmlReporter 
[#78954014] Fix #671
 2015-01-26 15:55:31 -08:00
Gregg Van Hove
c1479acd17 Fix fail specs for all browsers #734 2015-01-12 13:37:10 -08:00
Gregg Van Hove
3a93f845d6 Use the stack trace from the Error object if supplied 
Fixes #734
 2015-01-12 11:51:45 -08:00
slackersoft
8bb2f67fb3 Properly record finishing an xdescribe so further cleanup works 
Fix #724
 2014-12-09 12:40:00 -08:00
slackersoft
9f94e8e226 Top level suite no longer reports suiteStart and suiteDone 
- jasmineStart and jasmineDone are reported separately

Fixes #716
 2014-11-28 21:25:45 -08:00
slackersoft
23a492cb65 Suites still run their children even if none are executable 
- Continue skipping beforeAll and afterAll

Fixes #707
 2014-11-16 14:43:44 -08:00
slackersoft
42b1bda919 Top-level suite triggers suiteStarted and suiteEnd to be consistent 
Fixes #706
 2014-11-14 18:37:00 -08:00
slackersoft
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
slackersoft
66c364564e Fix custom timeout specs for firefox 2014-09-26 08:21:54 -07:00
slackersoft
68ba5b6d48 Allow custom timeout for beforeEach, afterEach, beforeAll, afterAll and it 
Fix #483
 2014-09-25 22:31:00 -07:00
slackersoft
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
slackersoft
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
slackersoft
4889583d5c Merge branch 'trackReturnValues' of https://github.com/pimterry/jasmine into pimterry-trackReturnValues 2014-09-22 13:04:01 -07:00
Greg Cobb
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
slackersoft
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