Commit Graph

424 Commits

Author SHA1 Message Date
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
pivotal
187bde37ca dwf/cj: added function and tests to get a suite's spec count 2009-08-27 14:21:10 -07:00
pivotal
7edeb13be8 dwf/cj - fixing .gitignore to ignore all of idea's files. 2009-08-27 10:16:45 -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
Aram Price & Ryan Dy
368756e4d5 rakefile 2009-08-24 17:41:51 -07:00
Aram Price & Ryan Dy
a1bc4dc2e4 submodules 2009-08-24 16:32:48 -07:00
ragaskar
f9d61108ee Minor version changes 2009-08-21 07:00:54 -07:00
ragaskar
3993969c41 Add versioning to jasmine 2009-08-20 22:16:14 -07:00
ragaskar
9b9a4b6835 Add test coverage for empty suite handling 2009-08-20 19:32:15 -07:00
ragaskar
96bcde80af Minor logging fix 2009-08-20 19:21:07 -07:00
ragaskar
bc790d6b87 Rebuild jasmine.js 2009-08-19 08:50:56 -07:00
ragaskar
2a4241323d Permit focused running with Queue-based runner 2009-08-19 07:55:51 -07:00
ragaskar
0a3358f249 Merge in new HTML runner. Tests green, regression on focused running. 2009-08-19 07:42:47 -07:00
Christian Williams & Kim Eric Mittler
1573bf58c5 Fix reporter bug. 2009-08-17 13:40:32 -07:00
Christian Williams & Kim Eric Mittler
1c9607ec33 Add a "run all" link. 2009-08-17 13:37:33 -07:00
xian
e9126fdd9b Fix some problems with merge. 2009-08-14 18:04:52 -07:00
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
027b28ecb0 Fix formatting. 2009-08-14 15:44:45 -07:00
Aaron Peckham & Christian Williams
8870f907e8 Fixed formatting. 2009-08-14 15:43:36 -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
8378dd95fe Remove cruft 2009-08-12 22:19:51 -07:00
ragaskar
7b63960db0 Refactor Runner to use Queue; remove ActionCollection 2009-08-12 22:12:28 -07:00
Erik Hanson & Evan Cooney
3e68a2c2bc remove a leftover call to "console.log" 2009-08-12 16:12:57 -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
93c7b092b3 Un-pad body. 2009-08-11 12:05:56 -07:00
Aaron Peckham & Christian Williams
624a6dd85c More application of prettiness. 2009-08-10 18:07:03 -07:00
Aaron Peckham & Christian Williams
8f12dbf3b4 Suites are a little lighter colored. 2009-08-10 17:59:24 -07:00
Aaron Peckham & Christian Williams
2ef71580ad Color suites to reflect spec pass/fail status. 2009-08-10 17:54:20 -07:00