Merge pull request #1606 from seleniumbase/improve-mac-m1-and-m2-compatibility

mdmintz · web-flow · commit 54e24fc038b5 · 2022-11-11T14:48:11.000-05:00
Improve Mac M1 and M2 compatibility
diff --git a/examples/hack_the_planet.py b/examples/hack_the_planet.py
@@ -10,7 +10,6 @@ def test_all_your_base_are_belong_to_us(self):
         aybabtu = "%s %s" % (ayb, abtu)
         sb_banner_logo = "//seleniumbase.io/cdn/img/sb_logo_10.png"
         sb_dashboard_logo = "//seleniumbase.io/img/dash_pie_3.png"
-        yt_chip = "#chips yt-chip-cloud-chip-renderer:nth-of-type"
         wiki = "https://en.wikipedia.org/wiki/All_your_base_are_belong_to_us"
 
         self.open(wiki)
@@ -100,29 +99,6 @@ def test_all_your_base_are_belong_to_us(self):
             self.highlight('a[href*="w/signup"] span', loops=6, scroll=False)
             self.highlight('a[href*="w/signup"]', loops=6, scroll=False)
 
-        self.open("https://www.youtube.com/")
-        self.set_text_content("%s(1)" % yt_chip, "ALL")
-        self.set_text_content("%s(2)" % yt_chip, "YOUR")
-        self.set_text_content("%s(3)" % yt_chip, "BASE")
-        self.set_text_content("%s(4)" % yt_chip, "ARE")
-        self.set_text_content("%s(5)" % yt_chip, "BELONG")
-        self.set_text_content("%s(6)" % yt_chip, "TO")
-        self.set_text_content("%s(7)" % yt_chip, "US")
-        self.set_text_content("%s(8)" % yt_chip, "!")
-        self.set_text_content("%s(9)" % yt_chip, "!")
-        self.set_text_content("%s(10)" % yt_chip, "!")
-        self.click_if_visible("#dismiss-button")
-        self.click_if_visible('button[aria-label="Close"]')
-        self.highlight("#scroll-container", loops=5, scroll=False)
-        self.highlight("%s(1)" % yt_chip, loops=1, scroll=False)
-        self.highlight("%s(2)" % yt_chip, loops=1, scroll=False)
-        self.highlight("%s(3)" % yt_chip, loops=3, scroll=False)
-        self.highlight("%s(4)" % yt_chip, loops=1, scroll=False)
-        self.highlight("%s(5)" % yt_chip, loops=1, scroll=False)
-        self.highlight("%s(6)" % yt_chip, loops=1, scroll=False)
-        self.highlight("%s(7)" % yt_chip, loops=3, scroll=False)
-        self.highlight("#scroll-container", loops=7, scroll=False)
-
         self.open("https://github.com/features/actions")
         self.set_text_content('a[href="/team"]', ayb)
         self.set_text_content('a[href="/enterprise"]', abtu)
diff --git a/examples/old_wordle_script.py b/examples/old_wordle_script.py
@@ -101,7 +101,10 @@ def test_wordle(self):
             self.click(keyboard_base + button)
             row = 'game-app::shadow game-row[letters="%s"]::shadow ' % word
             tile = row + "game-tile:nth-of-type(%s)"
-            self.wait_for_element(tile % "5" + '::shadow [data-state*="e"]')
+            self.wait_for_element(tile % "5" + '::shadow [data-state$="t"]')
+            self.wait_for_element(
+                tile % "5" + '::shadow [data-animation="idle"]'
+            )
             letter_status = []
             for i in range(1, 6):
                 letter_eval = self.get_attribute(tile % str(i), "evaluation")
diff --git a/examples/wordle_test.py b/examples/wordle_test.py
@@ -50,18 +50,14 @@ def modify_word_list(self, word, letter_status):
                 self.word_list = new_word_list
                 new_word_list = []
 
-    def skip_if_headless_mode(self):
-        if self.headless:
-            message = "Skip this test in headless mode!"
-            print(message)
-            self.skip(message)
-
     def test_wordle(self):
-        self.skip_if_headless_mode()
+        if self.headless:
+            self.skip("Skip this test in headless mode!")
         self.open("https://www.nytimes.com/games/wordle/index.html")
         self.click_if_visible('svg[data-testid="icon-close"]', timeout=2)
         self.remove_elements("div.place-ad")
         self.initialize_word_list()
+        random.seed()
         word = random.choice(self.word_list)
         num_attempts = 0
         found_word = False
@@ -74,15 +70,14 @@ def test_wordle(self):
                 button = 'button[data-key="%s"]' % letter
                 self.click(button)
             button = 'button[class*="oneAndAHalf"]'
-            self.wait_for_ready_state_complete()
             self.click(button)
             row = (
                 'div[class*="lbzlf"] div[class*="Row-module"]:nth-of-type(%s) '
                 % num_attempts
             )
             tile = row + 'div:nth-child(%s) div[class*="module_tile__3ayIZ"]'
-            self.wait_for_element(tile % "5" + '[data-state*="e"]')
-            self.wait_for_ready_state_complete()
+            self.wait_for_element(tile % "5" + '[data-state$="t"]')
+            self.wait_for_element(tile % "5" + '[data-animation="idle"]')
             letter_status = []
             for i in range(1, 6):
                 letter_eval = self.get_attribute(tile % str(i), "data-state")
diff --git a/mkdocs_build/requirements.txt b/mkdocs_build/requirements.txt
@@ -29,7 +29,7 @@ cssselect2==0.7.0
 tinycss2==1.2.1
 defusedxml==0.7.1
 mkdocs==1.4.2
-mkdocs-material==8.5.9
+mkdocs-material==8.5.10
 mkdocs-exclude-search==0.6.4
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1
diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ tomli>=1.2.3;python_version>="3.6" and python_version<"3.7"
 tomli>=2.0.1;python_version>="3.7"
 tqdm>=4.64.1
 wheel>=0.37.1;python_version<"3.7"
-wheel>=0.38.3;python_version>="3.7"
+wheel>=0.38.4;python_version>="3.7"
 attrs>=21.4.0;python_version<"3.6"
 attrs>=22.1.0;python_version>="3.6"
 PyYAML>=6.0;python_version>="3.6"
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.8.2"
+__version__ = "4.8.3"
diff --git a/seleniumbase/console_scripts/sb_install.py b/seleniumbase/console_scripts/sb_install.py
@@ -229,7 +229,11 @@ def main(override=None, intel_for_uc=None):
             else:
                 invalid_run_command()
         if "darwin" in sys_plat:
-            if "arm" in platform.processor().lower() and not intel_for_uc:
+            if (
+                "arm" in platform.processor().lower()
+                and not intel_for_uc
+                and int(use_version) > 105
+            ):
                 file_name = "chromedriver_mac_arm64.zip"
             else:
                 file_name = "chromedriver_mac64.zip"
@@ -396,7 +400,10 @@ def main(override=None, intel_for_uc=None):
             file_name = "edgedriver_win32.zip"
             suffix = "WINDOWS"
         elif "darwin" in sys_plat:
-            if "arm" in platform.processor().lower():
+            if (
+                "arm" in platform.processor().lower()
+                and int(use_version) > 104
+            ):
                 file_name = "edgedriver_mac64_m1.zip"
             else:
                 file_name = "edgedriver_mac64.zip"
diff --git a/seleniumbase/translate/chinese.py b/seleniumbase/translate/chinese.py
@@ -32,10 +32,19 @@ def 如果可见请单击(self, *args, **kwargs):
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def JS如果存在请单击(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def 单击链接文本(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def 鼠标点击偏移(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def 更新文本(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def 等待属性(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def 等待页面加载完成(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def 睡(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/dutch.py b/seleniumbase/translate/dutch.py
@@ -32,10 +32,19 @@ def klik_indien_zichtbaar(self, *args, **kwargs):
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def js_klik_indien_aanwezig(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def klik_linktekst(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def klik_op_locatie(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def tekst_bijwerken(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def wachten_op_attribuut(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def wacht_tot_de_pagina_is_geladen(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def slapen(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/french.py b/seleniumbase/translate/french.py
@@ -32,10 +32,19 @@ def cliquer_si_affiché(self, *args, **kwargs):  # noqa
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def js_cliquer_si_présent(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def cliquer_texte_du_lien(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def cliquer_emplacement(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def modifier_texte(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def attendre_un_attribut(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def attendre_que_la_page_se_charge(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def dormir(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/italian.py b/seleniumbase/translate/italian.py
@@ -32,10 +32,19 @@ def clic_se_visto(self, *args, **kwargs):
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def js_clic_se_presente(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def clic_testo_del_collegamento(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def clic_su_posizione(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def aggiornare_testo(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def attendere_un_attributo(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def attendere_il_caricamento_della_pagina(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def dormire(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/japanese.py b/seleniumbase/translate/japanese.py
@@ -32,10 +32,19 @@ def 表示されている場合はクリック(self, *args, **kwargs):
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def 存在する場合はJSクリック(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def リンクテキストをクリックします(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def オフセットでクリック(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def テキストを更新(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def 属性を待つ(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def ページがロードされるのを待ちます(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def 眠る(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/korean.py b/seleniumbase/translate/korean.py
@@ -32,10 +32,19 @@ def 보이는_경우_클릭(self, *args, **kwargs):
         # click_if_visible(selector, by=By.CSS_SELECTOR)
         return self.click_if_visible(*args, **kwargs)
 
+    def JS_존재하는지_경우_클릭(self, *args, **kwargs):
+        # js_click_if_present(selector, by=By.CSS_SELECTOR)
+        return self.js_click_if_present(*args, **kwargs)
+
     def 링크_텍스트를_클릭합니다(self, *args, **kwargs):
         # click_link_text(link_text)
         return self.click_link_text(*args, **kwargs)
 
+    def 위치를_클릭(self, *args, **kwargs):
+        # click_with_offset(selector, x, y, by=By.CSS_SELECTOR,
+        #                   mark=None, timeout=None, center=None)
+        return self.click_with_offset(*args, **kwargs)
+
     def 텍스트를_업데이트(self, *args, **kwargs):
         # update_text(selector, text)
         return self.update_text(*args, **kwargs)
@@ -180,6 +189,10 @@ def 특성_때까지_기다립니다(self, *args, **kwargs):
         # wait_for_attribute(selector, attribute, value)
         return self.wait_for_attribute(*args, **kwargs)
 
+    def 페이지가_로드될_때까지_기다립니다(self, *args, **kwargs):
+        # wait_for_ready_state_complete()
+        return self.wait_for_ready_state_complete(*args, **kwargs)
+
     def 잠을(self, *args, **kwargs):
         # sleep(seconds)
         return self.sleep(*args, **kwargs)
diff --git a/seleniumbase/translate/master_dict.py b/seleniumbase/translate/master_dict.py
@@ -341,6 +341,18 @@ class MD:
     md["click_if_visible"][8] = "нажмите_если_виден"
     md["click_if_visible"][9] = "clic_si_está_muestra"
 
+    md["js_click_if_present"] = ["*"] * num_langs
+    md["js_click_if_present"][0] = "js_click_if_present"
+    md["js_click_if_present"][1] = "JS如果存在请单击"
+    md["js_click_if_present"][2] = "js_klik_indien_aanwezig"
+    md["js_click_if_present"][3] = "js_cliquer_si_présent"
+    md["js_click_if_present"][4] = "js_clic_se_presente"
+    md["js_click_if_present"][5] = "存在する場合はJSクリック"
+    md["js_click_if_present"][6] = "JS_존재하는지_경우_클릭"
+    md["js_click_if_present"][7] = "js_clique_se_está_presente"
+    md["js_click_if_present"][8] = "JS_нажмите_если_присутствует"
+    md["js_click_if_present"][9] = "js_clic_si_está_presente"
+
     md["click_link"] = ["*"] * num_langs
     md["click_link"][0] = "click_link"
     md["click_link"][1] = "单击链接文本"
@@ -353,6 +365,18 @@ class MD:
     md["click_link"][8] = "нажмите_ссылку"
     md["click_link"][9] = "clic_texto_del_enlace"
 
+    md["click_with_offset"] = ["*"] * num_langs
+    md["click_with_offset"][0] = "click_with_offset"
+    md["click_with_offset"][1] = "鼠标点击偏移"
+    md["click_with_offset"][2] = "klik_op_locatie"
+    md["click_with_offset"][3] = "cliquer_emplacement"
+    md["click_with_offset"][4] = "clic_su_posizione"
+    md["click_with_offset"][5] = "オフセットでクリック"
+    md["click_with_offset"][6] = "위치를_클릭"
+    md["click_with_offset"][7] = "clique_com_deslocamento"
+    md["click_with_offset"][8] = "нажмите_на_местоположение"
+    md["click_with_offset"][9] = "clic_con_desplazamiento"
+
     md["update_text"] = ["*"] * num_langs
     md["update_text"][0] = "update_text"
     md["update_text"][1] = "更新文本"
@@ -773,6 +797,19 @@ class MD:
     md["wait_for_attribute"][8] = "ждать_атрибут"
     md["wait_for_attribute"][9] = "espera_el_atributo"
 
+    md["wait_for_ready_state_complete"] = ["*"] * num_langs
+    md["wait_for_ready_state_complete"][0] = "wait_for_ready_state_complete"
+    md["wait_for_ready_state_complete"][1] = "等待页面加载完成"
+    md["wait_for_ready_state_complete"][2] = "wacht_tot_de_pagina_is_geladen"
+    md["wait_for_ready_state_complete"][3] = "attendre_que_la_page_se_charge"
+    wfrsc_it = "attendere_il_caricamento_della_pagina"
+    md["wait_for_ready_state_complete"][4] = wfrsc_it
+    md["wait_for_ready_state_complete"][5] = "ページがロードされるのを待ちます"
+    md["wait_for_ready_state_complete"][6] = "페이지가_로드될_때까지_기다립니다"
+    md["wait_for_ready_state_complete"][7] = "aguardar_a_página_carregar"
+    md["wait_for_ready_state_complete"][8] = "ждать_загрузки_страницы"
+    md["wait_for_ready_state_complete"][9] = "esperar_a_que_cargue_la_página"
+
     md["sleep"] = ["*"] * num_langs
     md["sleep"][0] = "sleep"
     md["sleep"][1] = "睡"
diff --git a/seleniumbase/translate/portuguese.py b/seleniumbase/translate/portuguese.py
diff --git a/seleniumbase/translate/russian.py b/seleniumbase/translate/russian.py
diff --git a/seleniumbase/translate/spanish.py b/seleniumbase/translate/spanish.py
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# seleniumbase package`
`2`		`-__version__ = "4.8.2"`
	`2`	`+__version__ = "4.8.3"`