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
parent 2a29bb3ad9 11f356e375
commit 724f1772b7
30 changed files with 3606 additions and 3370 deletions
--- a/contrib/ruby/jasmine_runner.rb
+++ b/contrib/ruby/jasmine_runner.rb
@@ -134,7 +134,7 @@ module Jasmine

  class SimpleClient
    def initialize(selenium_host, selenium_port, selenium_browser_start_command, http_address)
-      require 'selenium'
+      require 'selenium/client'
      @driver = Selenium::Client::Driver.new(
        selenium_host,
        selenium_port,