rally-jasmine 1.2.0.8 → 1.2.0.10

data/lib/jasmine/selenium_driver.rb

@@ -3,11 +3,9 @@ module Jasmine
     def initialize(browser, http_address)
       require 'selenium-webdriver'
 
-      ::Selenium::WebDriver::Driver.send(:attr_accessor, :bridge)
-      ::Selenium::WebDriver::Remote::Bridge.send(:attr_accessor, :http)
-      ::Selenium::WebDriver::Remote::Http::Default.send(:attr_accessor, :server_url)
+      @usingWebDriverJS = (ENV['JASMINE_USE_WEBDRIVERJS'] || 'false').downcase == 'true'
 
-      selenium_server = if ENV['SELENIUM_SERVER']
+      @selenium_server = if ENV['SELENIUM_SERVER']
         ENV['SELENIUM_SERVER']
       elsif ENV['SELENIUM_SERVER_PORT']
         "http://localhost:#{ENV['SELENIUM_SERVER_PORT']}/wd/hub"
@@ -24,8 +22,31 @@ module Jasmine
                 end || {}
       http_client = Selenium::WebDriver::Remote::Http::Default.new
       http_client.timeout = 600 # seconds
-      @driver = if selenium_server
-        Selenium::WebDriver.for :remote, :url => selenium_server, :desired_capabilities => browser.to_sym, :http_client => http_client
+      @driver = if @usingWebDriverJS
+        unless @selenium_server
+          require 'selenium/server'
+          selenium_jar_path = ENV['SELENIUM_JAR_PATH']
+          selenium_server_args = ENV['SELENIUM_SERVER_ARGS']
+          if selenium_jar_path
+            begin
+              @server = Selenium::Server.new(selenium_jar_path, :background => true)
+            rescue Errno::ENOENT => e
+              raise e, "Unable to find selenium jar. Is ENV['SELENIUM_JAR_PATH'] correct? #{e.message}", e.backtrace
+            end
+          else
+            @server = Selenium::Server.get(ENV['SELENIUM_VERSION'] || '2.29.0', :background => true)
+          end
+          @server << selenium_server_args if selenium_server_args
+          @server.start
+          @selenium_server = @server.webdriver_url
+        end
+        capabilities_opts = {:native_events => false}
+        browser_version = ENV["#{browser.to_s.upcase}_VERSION"]
+        capabilities_opts[:version] = browser_version if browser_version
+        Selenium::WebDriver.for :remote,
+          :url => @selenium_server,
+          :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.send(browser.to_sym, capabilities_opts),
+          :http_client => http_client
       else
         Selenium::WebDriver.for browser.to_sym, options.merge(:http_client => http_client)
       end
@@ -33,17 +54,22 @@ module Jasmine
     end
 
     def connect
-      wdsid = @driver.bridge.session_id
-      wduri = @driver.bridge.http.server_url
+      if @usingWebDriverJS
+        wdsid = @driver.capabilities['webdriver.remote.sessionid']
+        wduri = URI.parse(@selenium_server)
 
-      wdurl = "#{wduri.scheme}://#{wduri.host}:#{wduri.port}/wd/hub"
-      url = "#{@http_address}?wdurl=#{URI.encode(wdurl)}&wdsid=#{URI.encode(wdsid)}"
+        wdurl = "#{wduri.scheme}://#{wduri.host}:#{wduri.port}/wd/hub"
+        url = "#{@http_address}?wdurl=#{URI.encode(wdurl)}&wdsid=#{URI.encode(wdsid)}"
+      else
+        url = @http_address
+      end
       @driver.navigate.to url
       url
     end
 
     def disconnect
       @driver.quit
+      @server.stop if @server
     end
 
     def eval_js(script)

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.2.0.8"
+  VERSION = "1.2.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rally-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.2.0.8
+  version: 1.2.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2205489775247955638
+      hash: -2774273710119208349
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2205489775247955638
+      hash: -2774273710119208349
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24