Merge pull request #1796 from seleniumbase/a-few-updates

A Few Updates

Author: mdmintz

mkdocs_build/requirements.txt

@@ -27,7 +27,7 @@ cssselect2==0.7.0
 tinycss2==1.2.1
 defusedxml==0.7.1
 mkdocs==1.4.2
-mkdocs-material==9.1.1
+mkdocs-material==9.1.2
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1

requirements.txt

@@ -67,7 +67,7 @@ pytest-metadata==1.11.0;python_version<"3.7"
 pytest-metadata==2.0.4;python_version>="3.7"
 pytest-ordering==0.6
 pytest-rerunfailures==10.3;python_version<"3.7"
-pytest-rerunfailures==11.1.1;python_version>="3.7"
+pytest-rerunfailures==11.1.2;python_version>="3.7"
 pytest-xdist==2.5.0;python_version<"3.7"
 pytest-xdist==3.2.0;python_version>="3.7"
 parameterized==0.8.1

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.13.9"
+__version__ = "4.13.10"

seleniumbase/console_scripts/sb_commander.py

@@ -276,17 +276,21 @@ def create_tkinter_gui(tests, command_string, files, solo_tests):
     chk.pack()
 
     tk.Label(root, text="").pack()
-    plural = "s"
-    if len(files) == 1:
-        plural = ""
     run_display = (
-        "Select from %s rows (%s file%s with %s tests):  "
+        "Select from %s rows (%s files with %s tests):  "
         "(All tests will run if none are selected)"
-        % (len(tests), len(files), plural, len(solo_tests))
+        % (len(tests), len(files), len(solo_tests))
     )
     if len(solo_tests) == 1:
         run_display = "Only ONE TEST was found and will be run:"
         tests = solo_tests
+    elif len(files) == 1:
+        run_display = (
+            "Select from %s tests:  "
+            "(All tests will run if none are selected)"
+            % (len(solo_tests))
+        )
+        tests = solo_tests
     tk.Label(root, text=run_display, fg="blue").pack()
     text_area = ScrolledText(
         root, width=100, height=12, wrap="word", state=tk.DISABLED

seleniumbase/fixtures/base_case.py

@@ -13647,7 +13647,11 @@ def setUp(self, masterqa_mode=False):
                             self.driver.close()
                         self.switch_to_window(0)
                     if self._crumbs:
-                        self.driver.delete_all_cookies()
+                        self.wait_for_ready_state_complete()
+                        try:
+                            self.driver.delete_all_cookies()
+                        except Exception:
+                            pass
                 except Exception:
                     pass
         if self._reuse_session and sb_config.shared_driver and has_url:

seleniumbase/fixtures/page_utils.py

@@ -190,6 +190,8 @@ def _get_unique_links(page_url, soup):
                 if len(simple_url.split("/")) > 1:
                     f_b_url = full_base_url + "/" + simple_url.split("/")[1]
                 link = f_b_url + "/" + link
+            elif link.startswith('"') and link.endswith('"') and len(link) > 4:
+                link = link[1:-1]
             else:
                 pass
             unique_links.append(link)

setup.py

@@ -191,7 +191,7 @@
         'pytest-metadata==2.0.4;python_version>="3.7"',
         "pytest-ordering==0.6",
         'pytest-rerunfailures==10.3;python_version<"3.7"',
-        'pytest-rerunfailures==11.1.1;python_version>="3.7"',
+        'pytest-rerunfailures==11.1.2;python_version>="3.7"',
         'pytest-xdist==2.5.0;python_version<"3.7"',
         'pytest-xdist==3.2.0;python_version>="3.7"',
         "parameterized==0.8.1",