[py]: Options now returns bool values for various properties when not set rather than None

symonk · symonk · commit bcbf432b6b0d · 2022-08-31T20:55:27.000+01:00
diff --git a/py/CHANGES b/py/CHANGES
@@ -1,8 +1,9 @@
 Selenium (TBA next version)
 * Fix frame_to_be_available_and_switch_to_it() for string inputs (#10963)
-* Implicit non w3c capability conversion for `acceptSslCerts`, `platform` and `version` is now deprecated.
+* Implicit non w3c capability conversion for `acceptSslCerts`, `platform` and `version` is now deprecated
 * Additional type hints
 * Less strict requirements on the version of `certifi`
+* Bugfix options returning `None` when strict_file_interactability, set_window_rect or accept_insecure_certs are not set
 
 
 Selenium 4.4.3
diff --git a/py/selenium/webdriver/common/options.py b/py/selenium/webdriver/common/options.py
@@ -157,7 +157,7 @@ def accept_insecure_certs(self) -> bool:
         """
         :returns: whether the session accepts insecure certificates
         """
-        return self._caps.get('acceptInsecureCerts')
+        return self._caps.get('acceptInsecureCerts', False)
 
     @accept_insecure_certs.setter
     def accept_insecure_certs(self, value: bool) -> None:
@@ -174,7 +174,7 @@ def strict_file_interactability(self) -> bool:
         """
         :returns: whether session is strict about file interactability
         """
-        return self._caps.get('strictFileInteractability')
+        return self._caps.get('strictFileInteractability', False)
 
     @strict_file_interactability.setter
     def strict_file_interactability(self, value: bool) -> None:
@@ -190,7 +190,7 @@ def set_window_rect(self) -> bool:
         """
         :returns: whether the remote end supports setting window size and position
         """
-        return self._caps.get('setWindowRect')
+        return self._caps.get('setWindowRect', False)
 
     @set_window_rect.setter
     def set_window_rect(self, value: bool) -> None:
diff --git a/py/test/unit/selenium/webdriver/common/common_options_tests.py b/py/test/unit/selenium/webdriver/common/common_options_tests.py
@@ -58,3 +58,10 @@ def test_enable_mobile_with_device_serial(options):
                           android_activity="crackers",
                           device_serial="1234")
     options.mobile_options["androidDeviceSerial"] == "1234"
+
+
+def test_missing_capabilities_return_false_rather_than_none():
+    options = ArgOptions()
+    assert options.strict_file_interactability is False
+    assert options.set_window_rect is False
+    assert options.accept_insecure_certs is False
