Add ability to pass --implementation to the IE server from Ruby.

SeleniumHQ · Sep 14, 2014 · dfb5197 · dfb5197
1 parent 9e59826
commit dfb5197
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/rb/lib/selenium/webdriver/ie/bridge.rb b/rb/lib/selenium/webdriver/ie/bridge.rb
@@ -13,14 +13,15 @@ class Bridge < Remote::Bridge
         DEFAULT_TIMEOUT = 30
 
         def initialize(opts = {})
-          caps          = opts.delete(:desired_capabilities) { Remote::Capabilities.internet_explorer }
-          timeout       = opts.delete(:timeout) { DEFAULT_TIMEOUT }
-          port          = opts.delete(:port) { PortProber.above(DEFAULT_PORT) }
-          http_client   = opts.delete(:http_client)
-          ignore_mode   = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
-          native_events = opts.delete(:native_events) != false
-
-          @server = Server.get
+          caps           = opts.delete(:desired_capabilities) { Remote::Capabilities.internet_explorer }
+          timeout        = opts.delete(:timeout) { DEFAULT_TIMEOUT }
+          port           = opts.delete(:port) { PortProber.above(DEFAULT_PORT) }
+          http_client    = opts.delete(:http_client)
+          ignore_mode    = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
+          native_events  = opts.delete(:native_events) != false
+          implementation = opts.delete(:implementation)
+
+          @server = Server.get(:implementation => implementation)
 
           @server.log_level = opts.delete(:log_level) if opts[:log_level]
           @server.log_file  = opts.delete(:log_file) if opts[:log_file]

diff --git a/rb/lib/selenium/webdriver/ie/server.rb b/rb/lib/selenium/webdriver/ie/server.rb
@@ -5,10 +5,11 @@ class Server
 
         STOP_TIMEOUT = 5
 
-        def self.get
+        def self.get(opts = {})
           binary = IE.driver_path || Platform.find_binary("IEDriverServer")
+
           if binary
-            new(binary)
+            new binary, opts
           else
             raise Error::WebDriverError,
               "Unable to find standalone executable. Please download the IEDriverServer from http://selenium-release.storage.googleapis.com/index.html and place the executable on your PATH."
@@ -24,8 +25,10 @@ def initialize(binary_path, opts = {})
           @process = nil
 
           opts = opts.dup
-          @log_level   = opts.delete(:log_level)
-          @log_file    = opts.delete(:log_file)
+
+          @log_level      = opts.delete(:log_level)
+          @log_file       = opts.delete(:log_file)
+          @implementation = opts.delete(:implementation)
 
           unless opts.empty?
             raise ArgumentError, "invalid option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -76,6 +79,7 @@ def server_args
 
           args << "--log-level=#{@log_level.to_s.upcase}" if @log_level
           args << "--log-file=#{@log_file}" if @log_file
+          args << "--implementation=#{@implementation.to_s.upcase}" if @implementation
 
           args
         end

diff --git a/rb/spec/unit/selenium/webdriver/ie/bridge_spec.rb b/rb/spec/unit/selenium/webdriver/ie/bridge_spec.rb
@@ -56,6 +56,15 @@ module IE
           )
         end
 
+        it 'should be able to set implementation' do
+          Server.should_receive(:get).with(:implementation => :vendor).and_return(server)
+
+          Bridge.new(
+            :implementation => :vendor,
+            :http_client    => http
+          )
+        end
+
         it 'takes desired capabilities' do
           custom_caps = Remote::Capabilities.new
           custom_caps['ignoreProtectedModeSettings'] = true