Commit Graph

36 Commits

Author SHA1 Message Date
ragaskar 250c483a6b Merged in Selenium optimizations from http://github.com/gannett/jasmine branch. Updated json2 to latest. 2009-09-29 22:09:30 -07:00
ragaskar 2588368231 Deprecate getResults() (use results()). Add some unit test coverage for jasmine.Spec. Add some unit test coverage for JsApiReporterSpec. 2009-09-28 11:13:44 -07:00
ragaskar 26fdc7cc91 Fix for jasmine rake tasks, fix for window.eval issues 2009-09-09 18:18:00 -07:00
Christian Williams 724f1772b7 Merge branch 'master' of git@github.com:pivotal/jasmine
Conflicts:
	Rakefile
	examples/ruby/Rakefile
	examples/ruby/spec/jasmine_spec.rb
	lib/jasmine-0.9.0.js
	src/Queue.js
2009-09-08 06:48:57 -07:00
ragaskar 65cec7a2b9 Updated require for SimpleClient for greater selenium compatibility 2009-09-04 19:46:39 -07:00
Christian Williams & Kim Eric Mittler 8ba804e299 Change url from /run.html to /. 2009-09-02 12:51:39 -07:00
Christian Williams & Kim Eric Mittler 17b513eafb Switch back to window.eval(xxx) instead of eval(xxx, window) -- arghghgh. 2009-09-02 12:38:17 -07:00
Christian Williams & Kim Eric Mittler ca6b23684e Time out if we can't load suite info within 60 seconds. 2009-09-02 12:36:51 -07:00
Christian Williams & Kim Eric Mittler 268cb0c6c5 Jasmine::Runner arranges for jasmine.js, json.js, and TrivialReporter.js to be included, so callers should remove those files. 2009-09-02 12:16:16 -07:00
Christian Williams & Kim Eric Mittler 5e8b52debf Merge branch 'master' of git://github.com/pivotal/jasmine 2009-09-02 10:29:59 -07:00
ragaskar e8d582600c Fixes for jasmine rake test:ci 2009-08-26 22:41:19 -07:00
ragaskar 7a446d53c0 Reorg. Added examples/ with html and ruby test runner examples 2009-08-26 22:13:30 -07:00
ragaskar ba5b4ab166 Fix compatibility with the ruby contrib runner 2009-08-26 15:55:08 -07:00
Christian Williams & Kim Eric Mittler 985d08885e Add Jasmine.cachebust. 2009-08-26 10:54:16 -07:00
Aaron Peckham & Christian Williams 624a6dd85c More application of prettiness. 2009-08-10 18:07: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
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
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
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
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 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
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