From c5db2c1b591fa13332aaa7de7f84461fad8bdfcd Mon Sep 17 00:00:00 2001
From: Michael Mintz <mdmintz@gmail.com>
Date: Fri, 24 Jan 2025 19:33:35 -0500
Subject: [PATCH] Do some refactoring

---
 seleniumbase/core/sb_cdp.py        |  2 +-
 seleniumbase/fixtures/base_case.py | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/seleniumbase/core/sb_cdp.py b/seleniumbase/core/sb_cdp.py
index 65a36be9..f35b1a3b 100644
--- a/seleniumbase/core/sb_cdp.py
+++ b/seleniumbase/core/sb_cdp.py
@@ -1604,7 +1604,7 @@ class CDPMethods():
         """Return True if checkbox (or radio button) is checked."""
         selector = self.__convert_to_css_if_xpath(selector)
         self.find_element(selector, timeout=settings.SMALL_TIMEOUT)
-        return self.get_element_attribute(selector, "checked")
+        return bool(self.get_element_attribute(selector, "checked"))
 
     def is_selected(self, selector):
         selector = self.__convert_to_css_if_xpath(selector)
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
index 7c9d6595..81696196 100644
--- a/seleniumbase/fixtures/base_case.py
+++ b/seleniumbase/fixtures/base_case.py
@@ -2494,8 +2494,10 @@ class BaseCase(unittest.TestCase):
         kind = self.get_attribute(selector, "type", by=by, timeout=timeout)
         if kind != "checkbox" and kind != "radio":
             raise Exception("Expecting a checkbox or a radio button element!")
-        return self.get_attribute(
-            selector, "checked", by=by, timeout=timeout, hard_fail=False
+        return bool(
+            self.get_attribute(
+                selector, "checked", by=by, timeout=timeout, hard_fail=False
+            )
         )
 
     def is_selected(self, selector, by="css selector", timeout=None):
@@ -15166,9 +15168,12 @@ class BaseCase(unittest.TestCase):
                             self.driver.close()
                         self.switch_to_window(0)
                     if self._crumbs:
-                        self.wait_for_ready_state_complete()
-                        with suppress(Exception):
-                            self.driver.delete_all_cookies()
+                        if self.binary_location == "chs":
+                            self.delete_session_storage()
+                        else:
+                            self.wait_for_ready_state_complete()
+                            with suppress(Exception):
+                                self.driver.delete_all_cookies()
         if self._reuse_session and sb_config.shared_driver and has_url:
             good_start_page = False
             if self.recorder_ext: