Commit Graph

305 Commits

Author SHA1 Message Date
ragaskar e9e74f1800 Merge branch 'master' of git://github.com/deadlyicon/jasmine 2009-10-15 17:58:51 -07:00
ragaskar 85d3b2d14b IE7 fixes 2009-10-15 17:48:28 -07:00
Jared Grippe 706b180a2c fixed javascript syntax errors in README 2009-10-15 17:43:33 -07:00
Rajan Agaskar & Ryan Dy beddbaf5c7 update jasmine runner to take focus spec 2009-10-14 10:28:23 -07:00
Rajan Agaskar & Ryan Dy a907301dcb Merge branch 'master' of git://github.com/pivotal/jasmine 2009-10-13 15:18:05 -07:00
Rajan Agaskar & Ryan Dy 1b1c2b1998 Allow jasmine::runner to take an optional list of styesheets 2009-10-13 15:16:20 -07:00
Rajan Agaskar & Ryan Dy e7865295dd Revert "Allow jasmine::runner to take an optional list of styesheets"
This reverts commit 6d8557608c.
2009-10-13 15:14:07 -07:00
Rajan Agaskar & Ryan Dy 6d8557608c Allow jasmine::runner to take an optional list of styesheets 2009-10-13 15:12:35 -07:00
Rajan Agaskar & Ryan Dy fd37be4dff Merge branch 'master' of git://github.com/pivotal/jasmine 2009-10-13 14:51:33 -07:00
Rajan Agaskar & Ryan Dy 92ffcb47e2 SimpleServer.start now takes optional array of stylesheet paths for runner 2009-10-13 14:48:09 -07:00
Rajan Agaskar & Ryan Dy c164d58a1a Add calls accessor to spies 2009-10-13 14:28:46 -07:00
Rajan Agaskar & Ryan Dy 3459697cb4 merge in Queue fixes 2009-10-13 14:22:47 -07:00
Rajan Agaskar & Ryan Dy 31bb686fd5 Merge branch 'loop-dont-recurse' of git://github.com/Xian/jasmine into xian_jasmine 2009-10-13 14:12:35 -07:00
Christian Williams 5659a1e79e jasmine.Queue iterates by looping rather than recursing, so stack overflows should be less likely. 2009-10-12 23:09:51 -05:00
Christian Williams b7549196da Blocks which complete synchronously have the completion de-nested. Big speed improvement, not quite sure why yet. 2009-10-12 21:23:57 -05:00
Christian Williams a3ed49a5ed Refactor. 2009-10-12 21:02:50 -05:00
Christian Williams e1ebc1e692 Refactor Queue.js. 2009-10-12 17:22:00 -05:00
Christian Williams d27684d280 Oops, only report results once. 2009-10-12 17:15:57 -05:00
Christian Williams f9b3eff5ab Got standalone HTML test page working again. 2009-10-12 17:13:54 -05:00
Christian Williams 34b479a1a4 Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)"
Let's keep it around though so we can run tests without Ruby, eh?

This reverts commit e33ecf3665.
2009-10-12 17:13:41 -05:00
Christian Williams 6ee8ed02a9 Revert "Removed jasmine spec HTML runner (easier to use Rake tasks)"
Let's keep it around so we can still run tests without Ruby, eh?

This reverts commit e33ecf3665.
2009-10-10 10:18:35 -07:00
ragaskar 73c0d57c94 Tuning to prevent stack overflows in FF 2009-10-05 22:36:10 -07:00
Christian Williams & David Goudreau cbc15d733d Revert "Add no-op test:unit and test:integration tasks for EMI build only."
This reverts commit 61241140e8.
2009-10-05 10:47:26 -07:00
Christian Williams & David Goudreau 61241140e8 Add no-op test:unit and test:integration tasks for EMI build only. 2009-10-05 10:19:02 -07:00
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 a394b564f4 runner-wide beforeEach, afterEach support 2009-09-28 16:24:45 -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 d09cacebc7 Fix HTML runner example 2009-09-15 13:02:20 -07:00
ragaskar ddaab50b75 Documentation updates. 2009-09-09 18:46:29 -07:00
ragaskar e33ecf3665 Removed jasmine spec HTML runner (easier to use Rake tasks) 2009-09-09 18:26:05 -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
Christian Williams 2a29bb3ad9 Revert "rakefile"
This reverts commit 368756e4d5.
2009-09-08 06:23:26 -07:00
Christian Williams 3e7f870965 Revert "adding rake test subtasks (noop) for git submodule rake compatibility"
This reverts commit 4138fd3626.
2009-09-08 06:20:43 -07:00
ragaskar 11f356e375 Integrate JasmineHelper 2009-09-04 23:04:48 -07:00
ragaskar 65cec7a2b9 Updated require for SimpleClient for greater selenium compatibility 2009-09-04 19:46:39 -07:00
ragaskar 4620ea6a44 Merged in Xian's speed fixes 2009-09-04 10:57:08 -07:00
Christian Williams & Kim Eric Mittler 3b702bd992 Add back support for Env's updateInterval. 2009-09-02 15:33:24 -07:00
Christian Williams & Kim Eric Mittler bed9e118b6 Add time reporting. 2009-09-02 15:32:57 -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 43f819e9e2 Deprecated getAllSuites 2009-09-02 07:52:11 -07:00
ragaskar 4533d6a7cd specs() refactor, added test coverage 2009-09-02 07:30:31 -07:00
ragaskar 50134eb1ac Fix 'doubled' test runs in test runner 2009-09-01 21:21:54 -07:00
Kelly Nawrocke & Aram Price 4138fd3626 adding rake test subtasks (noop) for git submodule rake compatibility 2009-09-01 09:20:25 -07:00
ragaskar b9ee6a9119 Version revision uses current timestamp 2009-08-27 22:23:51 -07:00
ragaskar d7a47264ef Automatically build jsdocs on rake build tasks 2009-08-27 22:15:50 -07:00