[rb] match other bindings by defaulting debugger_address and accept_i…

…nsecure_certs to true for Firefox
SeleniumHQ · Sep 26, 2022 · 58f5833 · 58f5833
1 parent 04e1dfc
commit 58f5833
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/rb/lib/selenium/webdriver/firefox/options.rb b/rb/lib/selenium/webdriver/firefox/options.rb
@@ -57,7 +57,8 @@ class Options < WebDriver::Options
         #
 
         def initialize(log_level: nil, **opts)
-          @debugger_address = opts.delete(:debugger_address)
+          @debugger_address = opts.delete(:debugger_address) { true }
+          opts[:accept_insecure_certs] = true unless opts.key?(:accept_insecure_certs)
 
           super(**opts)
 

diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -195,7 +195,6 @@ def create_remote_driver(**opts)
         def create_firefox_driver(**opts)
           WebDriver::Firefox.path = ENV.fetch('FIREFOX_BINARY', nil) if ENV.key?('FIREFOX_BINARY')
           options = opts.delete(:options) { WebDriver::Options.firefox }
-          options.debugger_address = true
           options.web_socket_url = true
           options.add_argument('--headless') if ENV['HEADLESS']
           WebDriver::Driver.for(:firefox, options: options, **opts)

diff --git a/rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb b/rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb
@@ -49,8 +49,10 @@ def expect_request(body: nil, endpoint: nil)
 
         it 'accepts provided Options as sole parameter' do
           opts = {invalid: 'foobar', args: ['-f']}
-          expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox", 'moz:firefoxOptions': opts}}})
-
+          expect_request(body: {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
+                                                             browserName: "firefox",
+                                                             'moz:firefoxOptions': opts,
+                                                             'moz:debuggerAddress': true}}})
           expect { Driver.new(options: Options.new(**opts)) }.not_to raise_exception
         end
 
@@ -99,9 +101,10 @@ def as_json(*)
 
             it 'with Options instance' do
               options = Options.new(args: ['-f'])
-              expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox",
-                                                                 'moz:firefoxOptions': {args: ['-f']}}}})
-
+              expect_request(body: {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
+                                                                 browserName: "firefox",
+                                                                 'moz:firefoxOptions': {args: ['-f']},
+                                                                 'moz:debuggerAddress': true}}})
               expect { Driver.new(capabilities: [options]) }.not_to raise_exception
             end
 
@@ -113,8 +116,10 @@ def as_json(*)
             end
 
             it 'with Options instance and an instance of a custom object responding to #as_json' do
-              expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox",
+              expect_request(body: {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
+                                                                 browserName: "firefox",
                                                                  'moz:firefoxOptions': {},
+                                                                 'moz:debuggerAddress': true,
                                                                  'company:key': 'value'}}})
               expect { Driver.new(capabilities: [Options.new, as_json_object.new]) }.not_to raise_exception
             end
@@ -123,7 +128,9 @@ def as_json(*)
               capabilities = Remote::Capabilities.new(browser_name: 'firefox', invalid: 'foobar')
               options = Options.new(args: ['-f'])
               expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox", invalid: 'foobar',
+                                                                 acceptInsecureCerts: true,
                                                                  'moz:firefoxOptions': {args: ['-f']},
+                                                                 'moz:debuggerAddress': true,
                                                                  'company:key': 'value'}}})
 
               expect { Driver.new(capabilities: [capabilities, options, as_json_object.new]) }.not_to raise_exception

diff --git a/rb/spec/unit/selenium/webdriver/firefox/options_spec.rb b/rb/spec/unit/selenium/webdriver/firefox/options_spec.rb
@@ -190,14 +190,19 @@ module Firefox
 
         describe '#as_json' do
           it 'returns empty options by default' do
-            expect(options.as_json).to eq("browserName" => "firefox", "moz:firefoxOptions" => {})
+            expect(options.as_json).to eq("browserName" => "firefox",
+                                          "acceptInsecureCerts" => true,
+                                          "moz:firefoxOptions" => {},
+                                          "moz:debuggerAddress" => true)
           end
 
           it 'returns added options' do
             options.add_option(:foo, 'bar')
             options.add_option('foo:bar', {foo: 'bar'})
-            expect(options.as_json).to eq("browserName" => "firefox",
+            expect(options.as_json).to eq("acceptInsecureCerts" => true,
+                                          "browserName" => "firefox",
                                           "foo:bar" => {"foo" => "bar"},
+                                          "moz:debuggerAddress" => true,
                                           "moz:firefoxOptions" => {"foo" => "bar"})
           end
 
@@ -241,6 +246,7 @@ module Firefox
                                                       'implicit' => 1},
                                        'setWindowRect' => false,
                                        'custom:options' => {'foo' => 'bar'},
+                                       'moz:debuggerAddress' => true,
                                        key => {'args' => %w[foo bar],
                                                'binary' => '/foo/bar',
                                                'prefs' => {'foo' => 'bar'},