Merge pull request #1697 from seleniumbase/fix-bug-and-add-method

mdmintz · web-flow · commit c9dd6919ddb8 · 2023-01-23T13:20:34.000-05:00
Fix bug with UC Mode and add "is_exact_text_visible()"
diff --git a/examples/hack_the_planet.py b/examples/hack_the_planet.py
@@ -24,27 +24,13 @@ def test_all_your_base_are_belong_to_us(self):
         self.set_text_content("#n-aboutsite a", "BELONG")
         self.set_text_content("#n-contactpage a", "TO")
         self.set_text_content("#n-sitesupport a", "US")
-        self.set_text_content(".tocsection-1 span.toctext", "ALL")
-        self.set_text_content(".tocsection-2 span.toctext", "YOUR")
-        self.set_text_content(".tocsection-3 span.toctext", "BASE")
-        self.set_text_content(".tocsection-4 span.toctext", "ARE")
-        self.set_text_content(".tocsection-5 span.toctext", "BELONG")
-        self.set_text_content(".tocsection-6 span.toctext", "TO")
-        self.set_text_content(".tocsection-7 span.toctext", "US")
-        self.highlight("h1#firstHeading", loops=2, scroll=False)
-        self.highlight("#ca-history a", loops=2, scroll=False)
-        self.highlight("nav#p-navigation", loops=2, scroll=False)
-        self.highlight("div#toc", loops=2, scroll=False)
-        self.highlight(".tocsection-1 span.toctext", loops=1, scroll=False)
-        self.highlight(".tocsection-2 span.toctext", loops=1, scroll=False)
-        self.highlight(".tocsection-3 span.toctext", loops=2, scroll=False)
-        self.highlight(".tocsection-4 span.toctext", loops=1, scroll=False)
-        self.highlight(".tocsection-5 span.toctext", loops=1, scroll=False)
-        self.highlight(".tocsection-6 span.toctext", loops=1, scroll=False)
-        self.highlight(".tocsection-7 span.toctext", loops=2, scroll=False)
-        zoom_in = "div.thumbinner{zoom: 1.4;-moz-transform: scale(1.4);}"
+        self.highlight("h1#firstHeading", loops=5, scroll=False)
+        zoom_in = "#ca-history a{zoom: 1.8;-moz-transform: scale(1.8);}"
         self.add_css_style(zoom_in)
-        self.highlight("div.thumbinner", loops=8, scroll=False)
+        self.highlight("#ca-history a", loops=5, scroll=False)
+        zoom_in = "div.thumbinner{zoom: 1.6;-moz-transform: scale(1.6);}"
+        self.add_css_style(zoom_in)
+        self.highlight("div.thumbinner", loops=10, scroll=False)
 
         if not self.headless:
             self.open("https://www.apple.com/store")
@@ -170,8 +156,7 @@ def test_all_your_base_are_belong_to_us(self):
 
         self.open("https://xkcd.com/286/")
         self.set_text_content('a[href="/archive"]', "ALL")
-        self.set_text_content('a[href*="what-if"]', "YOUR")
-        self.set_text_content('a[href*="//blag."]', "BASE")
+        self.set_text_content('a[href*="what-if"]', "YOUR BASE")
         self.set_text_content('a[href*="/about"]', abtu)
         self.remove_element('li:contains("Feed")')
         self.remove_element('li:contains("TW")')
@@ -185,8 +170,7 @@ def test_all_your_base_are_belong_to_us(self):
         self.set_text_content('a[rel="next"]', "Base")
         self.highlight("#topLeft ul", loops=5, scroll=False)
         self.highlight('a[href="/archive"]', loops=1, scroll=False)
-        self.highlight('a[href*="what-if"]', loops=1, scroll=False)
-        self.highlight('a[href*="//blag."]', loops=2, scroll=False)
+        self.highlight('a[href*="what-if"]', loops=3, scroll=False)
         self.highlight('a[href*="/about"]', loops=5, scroll=False)
         self.highlight('a[rel="prev"]', loops=1, scroll=False)
         self.highlight('a[href*="random"]', loops=1, scroll=False)
diff --git a/examples/translations/chinese_test_1.py b/examples/translations/chinese_test_1.py
@@ -1,5 +1,6 @@
 # Chinese Language Test
 from seleniumbase.translate.chinese import 硒测试用例
+硒测试用例.main(__name__, __file__)
 
 
 class 我的测试类(硒测试用例):
diff --git a/examples/translations/dutch_test_1.py b/examples/translations/dutch_test_1.py
@@ -1,5 +1,6 @@
 # Dutch Language Test
 from seleniumbase.translate.dutch import Testgeval
+Testgeval.main(__name__, __file__)
 
 
 class MijnTestklasse(Testgeval):
diff --git a/examples/translations/english_test_1.py b/examples/translations/english_test_1.py
@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class MyTestClass(BaseCase):
diff --git a/examples/translations/french_test_1.py b/examples/translations/french_test_1.py
@@ -1,5 +1,6 @@
 # French Language Test
 from seleniumbase.translate.french import CasDeBase
+CasDeBase.main(__name__, __file__)
 
 
 class MaClasseDeTest(CasDeBase):
diff --git a/examples/translations/italian_test_1.py b/examples/translations/italian_test_1.py
@@ -1,5 +1,6 @@
 # Italian Language Test
 from seleniumbase.translate.italian import CasoDiProva
+CasoDiProva.main(__name__, __file__)
 
 
 class MiaClasseDiTest(CasoDiProva):
diff --git a/examples/translations/japanese_test_1.py b/examples/translations/japanese_test_1.py
@@ -1,5 +1,6 @@
 # Japanese Language Test
 from seleniumbase.translate.japanese import セレニウムテストケース
+セレニウムテストケース.main(__name__, __file__)
 
 
 class 私のテストクラス(セレニウムテストケース):
diff --git a/examples/translations/korean_test_1.py b/examples/translations/korean_test_1.py
@@ -1,5 +1,6 @@
 # Korean Language Test
 from seleniumbase.translate.korean import 셀레늄_테스트_케이스
+셀레늄_테스트_케이스.main(__name__, __file__)
 
 
 class 테스트_클래스(셀레늄_테스트_케이스):
diff --git a/examples/translations/portuguese_test_1.py b/examples/translations/portuguese_test_1.py
@@ -1,5 +1,6 @@
 # Portuguese Language Test
 from seleniumbase.translate.portuguese import CasoDeTeste
+CasoDeTeste.main(__name__, __file__)
 
 
 class MinhaClasseDeTeste(CasoDeTeste):
diff --git a/examples/translations/russian_test_1.py b/examples/translations/russian_test_1.py
@@ -1,5 +1,6 @@
 # Russian Language Test
 from seleniumbase.translate.russian import ТестНаСелен
+ТестНаСелен.main(__name__, __file__)
 
 
 class МойТестовыйКласс(ТестНаСелен):
diff --git a/examples/translations/spanish_test_1.py b/examples/translations/spanish_test_1.py
@@ -1,5 +1,6 @@
 # Spanish Language Test
 from seleniumbase.translate.spanish import CasoDePrueba
+CasoDePrueba.main(__name__, __file__)
 
 
 class MiClaseDePrueba(CasoDePrueba):
diff --git a/help_docs/method_summary.md b/help_docs/method_summary.md
@@ -78,6 +78,8 @@ self.is_element_enabled(selector, by="css selector")
 
 self.is_text_visible(text, selector="html", by="css selector")
 
+self.is_exact_text_visible(text, selector="html", by="css selector")
+
 self.is_attribute_present(selector, attribute, value=None, by="css selector")
 
 self.is_link_text_visible(link_text)
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.11.8"
+__version__ = "4.11.9"
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
@@ -2709,7 +2709,7 @@ def get_local_driver(
                                 cert = "unable to get local issuer certificate"
                                 uc_chrome_version = None
                                 if (
-                                    use_version.isnumeric
+                                    use_version.isnumeric()
                                     and int(use_version) >= 72
                                 ):
                                     uc_chrome_version = int(use_version)
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -1232,6 +1232,16 @@ def is_text_visible(self, text, selector="html", by="css selector"):
             self.driver, text, selector, by, self.browser
         )
 
+    def is_exact_text_visible(self, text, selector="html", by="css selector"):
+        self.wait_for_ready_state_complete()
+        time.sleep(0.01)
+        selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_shadow_selector(selector):
+            return self.__is_shadow_exact_text_visible(text, selector)
+        return page_actions.is_exact_text_visible(
+            self.driver, text, selector, by, self.browser
+        )
+
     def is_attribute_present(
         self, selector, attribute, value=None, by="css selector"
     ):
@@ -13073,6 +13083,22 @@ def __is_shadow_text_visible(self, text, selector):
         except Exception:
             return False
 
+    def __is_shadow_exact_text_visible(self, text, selector):
+        text = str(text)
+        try:
+            element = self.__get_shadow_element(selector, timeout=0.1)
+            if self.browser == "safari":
+                return (
+                    element.is_displayed()
+                    and text in element.get_attribute("innerText")
+                )
+            return (
+                element.is_displayed()
+                and text.strip() == element.text.strip()
+            )
+        except Exception:
+            return False
+
     def __is_shadow_attribute_present(self, selector, attribute, value=None):
         try:
             element = self.__get_shadow_element(selector, timeout=0.1)
diff --git a/seleniumbase/fixtures/page_actions.py b/seleniumbase/fixtures/page_actions.py
@@ -133,6 +133,43 @@ def is_text_visible(driver, text, selector, by="css selector", browser=None):
         return False
 
 
+def is_exact_text_visible(
+    driver,
+    text,
+    selector,
+    by="css selector",
+    browser=None
+):
+    """
+    Returns whether the exact text is visible in the given selector.
+    (Ignores leading and trailing whitespace)
+    @Params
+    driver - the webdriver object (required)
+    text - the text string to search for (required)
+    selector - the locator for identifying the page element (required)
+    by - the type of selector being used (Default: "css selector")
+    @Returns
+    Boolean (is text visible)
+    """
+    text = str(text)
+    try:
+        element = driver.find_element(by=by, value=selector)
+        element_text = element.text
+        if browser == "safari":
+            if element.tag_name.lower() in ["input", "textarea"]:
+                element_text = element.get_attribute("value")
+            else:
+                element_text = element.get_attribute("innerText")
+        elif element.tag_name.lower() in ["input", "textarea"]:
+            element_text = element.get_property("value")
+        return (
+            element.is_displayed()
+            and text.strip() == element_text.strip()
+        )
+    except Exception:
+        return False
+
+
 def is_attribute_present(
     driver, selector, attribute, value=None, by="css selector"
 ):
diff --git a/seleniumbase/translate/chinese.py b/seleniumbase/translate/chinese.py
@@ -161,6 +161,10 @@ def 文本是否显示(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def 确切文本是否显示(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def 元素是否可见(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/dutch.py b/seleniumbase/translate/dutch.py
@@ -161,6 +161,10 @@ def tekst_zichtbaar(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def exacte_tekst_zichtbaar(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def element_zichtbaar(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/french.py b/seleniumbase/translate/french.py
@@ -161,6 +161,10 @@ def est_texte_affiché(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def est_texte_exactement_affiché(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def est_un_élément_affiché(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/italian.py b/seleniumbase/translate/italian.py
@@ -161,6 +161,10 @@ def è_testo_visto(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def è_testo_esatto_visto(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def è_elemento_visto(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/japanese.py b/seleniumbase/translate/japanese.py
@@ -161,6 +161,10 @@ def テキストが表示されています(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def 正確なテキストが表示されています(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def 要素は表示されますか(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/korean.py b/seleniumbase/translate/korean.py
@@ -161,6 +161,10 @@ def 텍스트가_표시됩니다(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def 정확한_텍스트가_표시됩니다(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def 요소가_표시됩니다(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/master_dict.py b/seleniumbase/translate/master_dict.py
@@ -712,6 +712,18 @@ class MD:
     md["is_text_visible"][8] = "текст_виден"
     md["is_text_visible"][9] = "se_muestra_el_texto"
 
+    md["is_exact_text_visible"] = ["*"] * num_langs
+    md["is_exact_text_visible"][0] = "is_exact_text_visible"
+    md["is_exact_text_visible"][1] = "确切文本是否显示"
+    md["is_exact_text_visible"][2] = "exacte_tekst_zichtbaar"
+    md["is_exact_text_visible"][3] = "est_texte_exactement_affiché"
+    md["is_exact_text_visible"][4] = "è_testo_esatto_visto"
+    md["is_exact_text_visible"][5] = "正確なテキストが表示されています"
+    md["is_exact_text_visible"][6] = "정확한_텍스트가_표시됩니다"
+    md["is_exact_text_visible"][7] = "o_texto_exato_está_visível"
+    md["is_exact_text_visible"][8] = "точный_текст_виден"
+    md["is_exact_text_visible"][9] = "se_muestra_el_texto_exacto"
+
     md["is_element_visible"] = ["*"] * num_langs
     md["is_element_visible"][0] = "is_element_visible"
     md["is_element_visible"][1] = "元素是否可见"
diff --git a/seleniumbase/translate/portuguese.py b/seleniumbase/translate/portuguese.py
@@ -161,6 +161,10 @@ def o_texto_está_visível(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def o_texto_exato_está_visível(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def o_elemento_está_visível(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/russian.py b/seleniumbase/translate/russian.py
@@ -161,6 +161,10 @@ def текст_виден(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def точный_текст_виден(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def элемент_виден(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)
diff --git a/seleniumbase/translate/spanish.py b/seleniumbase/translate/spanish.py
@@ -161,6 +161,10 @@ def se_muestra_el_texto(self, *args, **kwargs):
         # is_text_visible(text, selector="html")
         return self.is_text_visible(*args, **kwargs)
 
+    def se_muestra_el_texto_exacto(self, *args, **kwargs):
+        # is_exact_text_visible(text, selector="html")
+        return self.is_exact_text_visible(*args, **kwargs)
+
     def se_muestra_el_elemento(self, *args, **kwargs):
         # is_element_visible(selector)
         return self.is_element_visible(*args, **kwargs)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from seleniumbase import BaseCase`
	`2`	`+BaseCase.main(__name__, __file__)`
`2`	`3`
`3`	`4`
`4`	`5`	`class MyTestClass(BaseCase):`