Commit Graph

170 Commits

Author SHA1 Message Date
Aaron Peckham & Christian Williams
e476f2375a Allow individual specs to be rerun; show skipped tests in gray. 2009-08-10 15:39:48 -07:00
xian
0f04084f6c Merge branch 'master' of git@github.com:emi/jasmine 2009-08-10 13:52:27 -07:00
Aaron Peckham & Christian Williams
bf3e3c60e5 Add table rounder javascript class 2009-08-10 11:01:03 -07:00
Brian Jenkins & Evan Cooney
988a406da8 Pretty up jasmine runner. 2009-08-10 09:54:01 -07:00
ragaskar
0061054aaa minor runner test cleanup 2009-08-08 09:31:19 -07:00
ragaskar
56c26c5b55 Allow waits/runs in spec.after. spec.after runs in between spec end and afterEach. 2009-08-08 09:31:19 -07:00
ragaskar
8b998749f3 afterEach now allows for waits, runs blocks 2009-08-08 09:31:12 -07:00
ragaskar
b55399bd4b beforeEach now supports waits and Runs blocks 2009-08-08 09:31:07 -07:00
ragaskar
9475de28b3 Queue/Spec refactor 2009-08-08 09:30:59 -07:00
Christian Williams & Erik Hanson
457b5a011f Use jasmine CSS, and get rid of HTML in plain text stacktrace 2009-08-07 14:11:40 -07:00
ragaskar
f73fd8ae95 Refactor Spec block execution into Queue 2009-08-01 14:56:29 -07:00
ragaskar
d5489a3e0d Start of before/after refactor. Yank defineGetter on nestedResults. rake build task now sorts sources to minimize jasmine.js changes post-build 2009-08-01 10:43:03 -07:00
ragaskar
f84c67b98a Merge in Pivotal changes 2009-07-29 22:41:38 -07:00
ragaskar
a1a278ee69 Major refactoring of Spec. Moved QueuedFunction to Block, WaitsBlock and WaitsForBlock. Waits and WaitsFor blocks now sequentially stackable 2009-07-29 22:27:11 -07:00
pivotal
19241ed03d carl/bosh - killed bootstrap dead; refactored to have emitString for use by subclasses. 2009-07-29 11:33:23 -07:00
pivotal
40577433aa carl/bosh - fixed runner.html (</head> was too early); cleanup of script files that no longer existed; use passed getter 2009-07-29 10:04:55 -07:00
pivotal
4cfb7ddd42 carl/bosh - merge pockets pudge changes in and update bootstrap to include some missing src files 2009-07-28 17:27:52 -07:00
Christian Williams & Aaron Peckham
5b695d3deb Report spec results properly. 2009-07-10 14:35:24 -07:00
Davis W. Frank
708d148d31 dwf: merging in Xian's multi-reporter updates 2009-07-09 21:53:28 -07:00
Christian Williams
f451e633cb Add reportRunnerStarting callback to reporters. 2009-07-08 18:33:15 -07:00
Christian Williams
e1408a9f58 Add jasmine.Reporter no-op base class for reporters. 2009-07-08 18:18:17 -07:00
Christian Williams
0c24c2df2e jasmine.Env should always have a reporter now, no need to check. 2009-07-08 18:01:05 -07:00
Christian Williams
a6aa9c652b Allow for registration of multiple Reporter with Jasmine. 2009-07-08 17:55:25 -07:00
Christian Williams
521f839753 Remove cruft from elsewhere. 2009-07-08 11:04:35 -07:00
Christian Williams
6b32586e1f Remove unused parameter. 2009-07-07 23:59:38 -07:00
Christian Williams
ed00c13b15 Provide a way to add more matchers in a spec or suite without affecting later specs or suites. 2009-07-07 23:57:03 -07:00
Christian Williams
378d6bb4ff jasmine.Spec.prototype.(expect|waits|waitFor) shouldn't be deprecated. 2009-07-07 23:06:41 -07:00
Davis W. Frank
19b73469dd dwf: more doc commits 2009-06-28 13:36:51 -07:00
ragaskar
3ccb2e6e8d Add console.log protection to TrivialReporter.js 2009-06-24 22:20:07 -07:00
ragaskar
275b83cc52 Re-arranged files so that lib represents a standalone drop-in of Jasmine. Killed JSON reporter because it has been succeeded by TrivialReporter.js. Using mock-timeout in src for mock-timeout functionality (instead of maintaining two copies 2009-06-24 07:44:40 -07:00
pivotal
280c7bcf27 jb/dwf - updated Jasmine to move mock-timeout into the src dir & build; rake build simplified 2009-06-19 11:47:33 -07:00
ragaskar
853f47e4aa Added rake :build task to concat files together. Removed jsUnitMockTimeout.js 2009-06-16 07:13:45 -07:00
Davis W. Frank
9928674b37 dwf: moved test of #explodes into SpecRunningTest.js - GREEN 2009-06-14 23:41:14 -07:00
Davis W. Frank
b2cbff3bb6 dwf: monster file re-org. RED BUILD 2009-06-14 23:34:29 -07:00
Davis W. Frank
e48c22ffbd dwf: removing a bunch of duplciated files 2009-06-14 23:15:09 -07:00
ragaskar
9d95483de6 Refactored into class files. Meta-tests and runner for jasmine. Stack traces available for Firefox and supported browsers. Experimental pretty print matcher support. Many other new features 2009-05-28 20:02:15 -07:00
ragaskar
dd8f248f7b Major jasmine updates 2009-03-01 05:34:00 -08:00
pivotal
145a2253e8 dwf/rva: exception handling should now work in most cases. 2009-01-15 14:27:39 -08:00
pivotal
c94496c9fe dwf/rva: added better exception handling for Webkit 2009-01-15 12:40:00 -08:00
pivotal
183b06bb9d dwf/rva - moved should_be_defined() into Jasmine from Tweed 2009-01-07 17:12:17 -08:00
pivotal
d9345b3874 rva - Added a 'should_match' regex matcher 2008-12-19 18:13:48 -08:00
pivotal
259390868e dwf/rva: rolled back blank expectations for now; Now catching exceptions & reporting them in results. 2008-12-10 11:20:33 -08:00
pivotal
c9edbbe9b7 dwf/rva: snazzy new graphics 2008-12-10 10:32:23 -08:00
pivotal
72ba4ea90a dwf/rva: better aliasing for getting to results at each level 2008-12-10 10:30:01 -08:00
pivotal
821fb54934 dwf: made Jasmine & Jasmine.Reporters namespaces; the instance of Jasmine is now just jasmine. 2008-12-08 13:01:06 -08:00
pivotal
b8a8dc4562 dwf: refactoring how reporters work to add callbacks at all levels, separating how/when DOM writing works; 2008-12-08 11:35:10 -08:00
pivotal
1450eb5b65 dwf/rva: refactor reporter abstract and jasmine into three distinct report functions for specs, suites, and runners. 2008-12-05 17:33:35 -08:00
pivotal
665c3e9f33 dwf/rva: moved JasmineReporter 'base class' to jasmine.js 2008-12-05 10:22:03 -08:00
pivotal
80e1d6b6e8 dwf/rva: Added Incremental Reporter, refactored abstract reporter class, added tests! 78!!! 2008-12-04 12:54:54 -08:00
pivotal
e1cafe7881 dwf/rva: adding optional element for DOM output 2008-12-04 11:43:22 -08:00
pivotal
cc164257a7 dwf/rva: added JSONReporter 2008-12-04 10:56:58 -08:00
pivotal
735ebd6c66 dwf/rva: actionColllection now has an optional finishCallback 2008-12-04 09:37:36 -08:00
pivotal
00f5f1722c dwf/rva: Added examples, fixed bug with initializing currentSuite with a mock. 2008-12-03 17:11:05 -08:00
pivotal
0f3685aca3 dwf/rva: minor Jasmine cleanup 2008-12-03 16:23:17 -08:00
pivotal
10b613c97d dwf: small cleanups. 2008-12-02 19:59:13 -08:00
pivotal
63db262f35 dwf/rva: tweaked TODO comments 2008-12-02 15:48:00 -08:00
pivotal
f0de62906c dwf/rva: Suites now have beforeEach and AfterEach 2008-12-02 15:27:07 -08:00
pivotal
a9a6d7cbda dwf/rva: results are now carrying descriptions as needed (Runner, Suite, Spec) 2008-12-02 14:26:47 -08:00
pivotal
1df1de2bb7 dwf/rva: results now propagated up. 2008-12-02 13:59:39 -08:00
pivotal
42eeab1cdb dwf/rva: refactoring Suite (describe function) & Runner to use shared parent actionCollection 2008-12-02 11:21:50 -08:00
pivotal
2c1d809e62 dwf/rva: runner that can execute multiple suites. 2008-12-02 11:08:12 -08:00
pivotal
f43ba0a51c added suite functionality and tests on function scope 2008-12-02 10:27:09 -08:00
pivotal
be33f1e6d4 dwf/rva: started suite testing. 2008-12-01 17:57:21 -08:00
pivotal
7a95f3344c dwf/rva: adding a little bit of suite-ness to make async testing more readable. 2008-12-01 16:32:14 -08:00
pivotal
29a0e1f519 dwf/rva: more async refactoring; results now stored on a per-spec basis; 2008-12-01 15:59:41 -08:00
pivotal
0ccb6dfc90 dwf/rva: Refactored async spec logic. 2008-12-01 15:15:34 -08:00
pivotal
3e02023d9f dwf/rva: async working with .waits() syntax; simple case 2008-12-01 14:24:13 -08:00
pivotal
a4979fe851 Added statement chaining to specs 2008-12-01 12:26:12 -08:00
Davis W. Frank
9f2d3e0540 dwf: refactored Jasmine for less coupling; adding Crockford's helper
methods; crafted a new 'bootstrap' test in order to allow name
collisions with JSpec; better formatting of results in bootstrap test.
2008-11-29 18:12:55 -08:00
Davis W. Frank
a2802923e2 dwf: refactor to move expects & spec to the global name space so they're
accessible.
2008-11-27 14:30:46 -08:00