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

..

spec

Change url from /run.html to /.

2009-09-02 12:51:39 -07:00

jasmine_runner.rb

Merge branch 'master' of git@github.com:pivotal/jasmine

2009-09-08 06:48:57 -07:00

jasmine_spec_builder.rb

Time out if we can't load suite info within 60 seconds.

2009-09-02 12:36:51 -07:00

run.html

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