lib/selenium/webdriver/ie/bridge.rb in selenium-webdriver-2.30.0 vs lib/selenium/webdriver/ie/bridge.rb in selenium-webdriver-2.31.0

@@ -11,27 +11,27 @@
         HOST            = Platform.localhost
         DEFAULT_PORT    = 5555
         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
-          
+
           @server.log_level = opts.delete(:log_level) if opts[:log_level]
           @server.log_file  = opts.delete(:log_file) if opts[:log_file]
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
           @port = @server.start Integer(port), timeout
 
-          caps = Remote::Capabilities.internet_explorer
           if ignore_mode
             caps['ignoreProtectedModeSettings'] = true
           end
 
           caps['nativeEvents'] = native_events