Commit Graph

135 Commits

Author SHA1 Message Date
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 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 7b63960db0 Refactor Runner to use Queue; remove ActionCollection 2009-08-12 22:12:28 -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 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
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 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 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 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
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 ff5e1d337a Fixed bootstrap tests 2009-06-16 07:19:15 -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 a5cf424f08 dwf: finished ExceptionsTest.js - BOOTSTRAP is red, not sure why 2009-06-15 13:47:05 -07:00
Davis W. Frank 6a2602f243 dwf: started moving Exceptions tests from bootstrap to runner 2009-06-15 08:28:14 -07:00
Davis W. Frank 95b52b9f82 dwf: moved runner finished & callback test to suites 2009-06-15 08:14:55 -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