Commit Graph

344 Commits

Author SHA1 Message Date
ragaskar
96bcde80af Minor logging fix 2009-08-20 19:21:07 -07:00
ragaskar
bc790d6b87 Rebuild jasmine.js 2009-08-19 08:50:56 -07:00
ragaskar
2a4241323d Permit focused running with Queue-based runner 2009-08-19 07:55:51 -07:00
ragaskar
0a3358f249 Merge in new HTML runner. Tests green, regression on focused running. 2009-08-19 07:42:47 -07:00
Christian Williams & Kim Eric Mittler
1573bf58c5 Fix reporter bug. 2009-08-17 13:40:32 -07:00
Christian Williams & Kim Eric Mittler
1c9607ec33 Add a "run all" link. 2009-08-17 13:37:33 -07:00
xian
e9126fdd9b Fix some problems with merge. 2009-08-14 18:04:52 -07:00
xian
ab65914233 Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter
Conflicts:
	lib/TrivialReporter.js
	spec/bootstrap.js
	spec/runner.html
2009-08-14 18:03:47 -07:00
Aaron Peckham & Christian Williams
027b28ecb0 Fix formatting. 2009-08-14 15:44:45 -07:00
Aaron Peckham & Christian Williams
8870f907e8 Fixed formatting. 2009-08-14 15:43:36 -07:00
Aaron Peckham & Christian Williams
ca077342f3 Added toBeLessThan and toBeGreaterThan matchers. 2009-08-14 15:39:28 -07:00
ragaskar
454d453207 add setTimeout to Queue so reporters get periodic updates 2009-08-13 07:52:44 -07:00
ragaskar
8378dd95fe Remove cruft 2009-08-12 22:19:51 -07:00
ragaskar
7b63960db0 Refactor Runner to use Queue; remove ActionCollection 2009-08-12 22:12:28 -07:00
Erik Hanson & Evan Cooney
3e68a2c2bc remove a leftover call to "console.log" 2009-08-12 16:12:57 -07:00
Erik Hanson
4410c7cd94 added failure count to top of trivial reporter 2009-08-12 10:15:15 -07:00
Aaron Peckham & Christian Williams
93c7b092b3 Un-pad body. 2009-08-11 12:05:56 -07:00
Aaron Peckham & Christian Williams
624a6dd85c More application of prettiness. 2009-08-10 18:07:03 -07:00
Aaron Peckham & Christian Williams
8f12dbf3b4 Suites are a little lighter colored. 2009-08-10 17:59:24 -07:00
Aaron Peckham & Christian Williams
2ef71580ad Color suites to reflect spec pass/fail status. 2009-08-10 17:54:20 -07:00
Aaron Peckham & Christian Williams
4b244612c1 Visually group specs by suite. 2009-08-10 17:50:03 -07:00
Aaron Peckham & Christian Williams
b1a007dfb5 Move specFilter function to TrivialReporter. 2009-08-10 16:00:42 -07:00
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
22226f3423 Move server_is_listening_on, wait_for_listener and kill_process_group to Jasmine module 2009-08-10 13:49:59 -07:00
Aaron Peckham & Christian Williams
6e9cd25150 Pass a Proc to SimpleServer.start instead of an array to defer spec file finding. 2009-08-10 13:44:02 -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
0d6c6c2a35 Re-refactored Queue to use straightforward callbacks 2009-08-08 09:31:06 -07:00
ragaskar
9475de28b3 Queue/Spec refactor 2009-08-08 09:30:59 -07:00
ragaskar
b6a41c85e1 Killing .idea -- already in the .gitignore, but not ignored! 2009-08-08 09:30:53 -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
Brian Jenkins & Aaron Peckham
331730f8f5 Changed run.html to expect the jasmine git to be served at /jasmine 2009-07-31 17:07:47 -07:00
ragaskar
60f513cbff minor Spec refactor 2009-07-30 22:31:57 -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
1da0c1c890 carl/bosh - fixed PrettyPrinter 2009-07-28 17:57:29 -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
5ae68b8c3b Fix printing of jasmine.log() messages. 2009-07-21 12:31:16 -07:00
Erik Hanson & David Goudreau
8fb59d391c stfu 2009-07-15 17:03:40 -07:00
Erik Hanson & Christian Williams
2c81941567 set process group id on spawned servers to allow kill by process group id later.
turn off selenium spew.
2009-07-14 10:35:53 -07:00
Erik Hanson & Christian Williams
7da72062b3 Restore noisy selenium logging cuz the fix was making selenium server fail to close. 2009-07-13 18:00:58 -07:00