Commit Graph

305 Commits

Author SHA1 Message Date
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
Kim Eric Mittler & Christian Williams 9a8cb48a53 The jasmine server process was running specs, for some reason; sleep a really long time instead. 2009-07-13 17:25:53 -07:00
Erik Hanson 8cb9f865f4 find an open port in a more robust way 2009-07-13 15:08:11 -07:00
Erik Hanson dc843e8812 find an open port in a more robust way 2009-07-13 15:07:45 -07:00
Kim Eric Mittler & Christian Williams 8d20259dfb Make Selenium quiet. 2009-07-13 13:27:24 -07:00
Kim Eric Mittler & Christian Williams b753cf64d6 Rename Jasmine::RemoteRunner to Jasmine::SpecBuilder. 2009-07-13 13:20:09 -07:00
Christian Williams & Aaron Peckham 5b695d3deb Report spec results properly. 2009-07-10 14:35:24 -07:00
Christian Williams & Aaron Peckham 286fc25aab Merge branch 'master' of git://github.com/infews/jasmine 2009-07-10 10:59:25 -07:00
Christian Williams & Aaron Peckham d378ce76e5 More work on meta_spec.rb. 2009-07-10 10:31:34 -07:00
Christian Williams & Aaron Peckham fe7c91220f Exposing eval_js and more interface. 2009-07-10 10:14:27 -07:00
Davis W. Frank 708d148d31 dwf: merging in Xian's multi-reporter updates 2009-07-09 21:53:28 -07:00
Christian Williams & Aaron Peckham 8b7ecc3f5c Be smarter about picking a server port, so multiple instances could run on the same box 2009-07-09 18:25:04 -07:00
Christian Williams & Aaron Peckham ae610eca0d Created Jasmine::Runner, added rspec builder. 2009-07-09 18:14:10 -07:00
Christian Williams 3a518b2a3c Move jasmine_runner.rb to emi/jasmine fork. 2009-07-09 11:17:58 -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 687b94374c Clarification re spy properties. 2009-07-08 00:07:29 -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
Christian Williams 662b4b94f4 jasmine.Spec.prototype.(expect|waits|waitFor) shouldn't be deprecated. 2009-07-07 23:06:18 -07:00
Davis W. Frank 19b73469dd dwf: more doc commits 2009-06-28 13:36:51 -07:00
Davis W. Frank 165c041256 dwf: more docs; also, previous commit refactored spies for better documentation 2009-06-28 13:35:52 -07:00
Davis W. Frank 7e956f77f5 Merge branch 'pivotal' 2009-06-28 13:26:45 -07:00
Davis W. Frank 254de641f7 dwf: added JsDoc files & lots of documentation in the source 2009-06-28 13:25:26 -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
ragaskar c420c78517 Updated example.html to use TrivialReporter 2009-06-20 20:01:03 -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 7b3cfab563 Fixed example.html 2009-06-16 07:47:25 -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
pivotal 5b24ee8498 Merge branch 'master' of git://github.com/infews/jasmine into infews/master 2009-06-15 14:03:03 -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
Brian Takita 8723421bc3 Fixed example.html 2009-06-15 00:51:51 -07:00