Commit Graph

21 Commits

Author SHA1 Message Date
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
4620ea6a44 Merged in Xian's speed fixes 2009-09-04 10:57:08 -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
5e8b52debf Merge branch 'master' of git://github.com/pivotal/jasmine 2009-09-02 10:29:59 -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
ragaskar
e8d582600c Fixes for jasmine rake test:ci 2009-08-26 22:41:19 -07:00
ragaskar
ba5b4ab166 Fix compatibility with the ruby contrib runner 2009-08-26 15:55:08 -07:00
Aram Price & Ryan Dy
368756e4d5 rakefile 2009-08-24 17:41:51 -07:00
ragaskar
3993969c41 Add versioning to jasmine 2009-08-20 22:16:14 -07:00
ragaskar
7b63960db0 Refactor Runner to use Queue; remove ActionCollection 2009-08-12 22:12:28 -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
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
Christian Williams
e1408a9f58 Add jasmine.Reporter no-op base class for reporters. 2009-07-08 18:18:17 -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
853f47e4aa Added rake :build task to concat files together. Removed jsUnitMockTimeout.js 2009-06-16 07:13:45 -07:00