Merge pull request #1714 from seleniumbase/choose-binary-location-and-more

Choose binary location and more

Author: mdmintz

Diff for: README.md

@@ -524,6 +524,7 @@ pytest my_first_test.py --pdb
 --firefox-pref=SET  # (Set a Firefox preference:value set, comma-separated.)
 --extension-zip=ZIP  # (Load a Chrome Extension .zip|.crx, comma-separated.)
 --extension-dir=DIR  # (Load a Chrome Extension directory, comma-separated.)
+--binary-location=PATH  # (Set path of the Chromium browser binary to use.)
 --sjw  # (Skip JS Waits for readyState to be "complete" or Angular to load.)
 --pls=PLS  # (Set pageLoadStrategy on Chrome: "normal", "eager", or "none".)
 --headless  # (Run tests in headless mode. The default arg on Linux OS.)

Diff for: examples/coffee_cart_tests.py

@@ -65,6 +65,7 @@ def test_remove_added_coffee(self):
         self.open("https://seleniumbase.io/coffee/")
         self.assert_exact_text("cart (0)", 'a[aria-label="Cart page"]')
         self.assert_exact_text("Total: $0.00", "button.pay")
+        self.wait_for_element('div[class="cup-body"]')
         self.click_visible_elements('div[class="cup-body"]', limit=6)
         self.assert_exact_text("cart (6)", 'a[aria-label="Cart page"]')
         self.assert_exact_text("Total: $74.00", 'button[data-test="checkout"]')

Diff for: examples/offline_examples/handle_alert_test.py

@@ -1,5 +1,6 @@
 import pytest
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 @pytest.mark.offline  # Can be run with: "pytest -m offline"

Diff for: examples/offline_examples/load_html_test.py

@@ -1,5 +1,6 @@
 import pytest
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 @pytest.mark.offline  # Can be run with: "pytest -m offline"

Diff for: examples/offline_examples/test_demo_page.py

@@ -1,6 +1,7 @@
 import os
 import pytest
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 @pytest.mark.offline  # Can be run with: "pytest -m offline"

Diff for: examples/offline_examples/user_agent_test.py

@@ -1,5 +1,6 @@
 import pytest
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 @pytest.mark.offline  # Can be run with: "pytest -m offline"
@@ -8,3 +9,31 @@ def test_get_user_agent(self):
         self.open("data:,")
         user_agent = self.get_user_agent()
         print('\nUser Agent = "%s"' % user_agent)
+
+        # Now change the user-agent using "execute_cdp_cmd()"
+        if not self.is_chromium():
+            msg = "\n* execute_cdp_cmd() is only for Chromium browsers"
+            print(msg)
+            self.skip(msg)
+        print("\n--------------------------")
+        try:
+            self.driver.execute_cdp_cmd(
+                "Network.setUserAgentOverride",
+                {
+                    "userAgent": "Mozilla/5.0 "
+                    "(Nintendo Switch; WifiWebAuthApplet) "
+                    "AppleWebKit/606.4 (KHTML, like Gecko) "
+                    "NF/6.0.1.15.4 NintendoBrowser/5.1.0.20393"
+                },
+            )
+            new_user_agent = self.get_user_agent()
+            print('\nOverrided User Agent = "%s"' % new_user_agent)
+        finally:
+            # Reset the user-agent back to the original
+            self.driver.execute_cdp_cmd(
+                "Network.setUserAgentOverride",
+                {"userAgent": user_agent},
+            )
+        print("\n--------------------------")
+        user_agent = self.get_user_agent()
+        print('\nUser Agent = "%s"' % user_agent)

Diff for: examples/raw_parameter_script.py

@@ -102,6 +102,7 @@
     sb.dashboard = False
     sb._dash_initialized = False
     sb.message_duration = None
+    sb.binary_location = None
     sb.enable_3d_apis = False
     sb.block_images = False
     sb.do_not_track = False

Diff for: examples/test_agent.py

@@ -10,6 +10,7 @@
 class CoffeeCartTest(BaseCase):
     def test_coffee_cart(self):
         self.open("https://seleniumbase.io/coffee/")
+        self.assert_title("Coffee Cart")
         self.click('div[data-sb="Cappuccino"]')
         self.click('div[data-sb="Flat-White"]')
         self.click('div[data-sb="Cafe-Latte"]')

Diff for: examples/test_coffee_cart.py

@@ -113,6 +113,6 @@ def test_demo_site(self):
         self.highlight("h2")
 
         # Actions with Demo Mode enabled
-        self.demo_mode = True
+        self.activate_demo_mode()
         self.type("input", "Have a Nice Day!")
         self.assert_text("SeleniumBase", "h2")

Diff for: examples/test_demo_site.py

@@ -4,9 +4,7 @@
 
 class DocsSiteTests(BaseCase):
     def test_docs(self):
-        self.open("https://seleniumbase.io/examples/ReadMe/")
-        self.assert_text("Running Example Tests", "h1")
-        self.js_click('a[href="../../help_docs/customizing_test_runs/"]')
+        self.open("https://seleniumbase.io/help_docs/customizing_test_runs/")
         self.assert_text("Command Line Options", "h1")
         self.js_click('a[href="../../examples/example_logs/ReadMe/"]')
         self.assert_text("Dashboard / Reports", "h1")

Diff for: examples/test_docs_site.py

@@ -1,5 +1,6 @@
 """Test drag_and_drop() on different pages."""
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class DragAndDropTests(BaseCase):
@@ -12,6 +13,7 @@ def test_drag_and_drop(self):
 
     def test_w3schools_drag_and_drop(self):
         self.open("https://seleniumbase.io/w3schools/drag_drop")
+        self.assert_url_contains("drag_drop")
         self.click("button#runbtn")
         self.switch_to_frame("iframeResult")
         self.assert_element_not_visible("#div1 img#drag1")

Diff for: examples/test_drag_and_drop.py

@@ -1,6 +1,7 @@
 # "sb" pytest fixture test in a method with no class
 def test_sb_fixture_with_no_class(sb):
     sb.open("https://google.com/ncr")
+    sb.remove_elements("iframe")
     sb.type('input[title="Search"]', "SeleniumBase GitHub\n")
     sb.click('a[href*="github.com/seleniumbase/SeleniumBase"]')
     sb.click('a[title="seleniumbase"]')
@@ -10,6 +11,7 @@ def test_sb_fixture_with_no_class(sb):
 class Test_SB_Fixture:
     def test_sb_fixture_inside_class(self, sb):
         sb.open("https://google.com/ncr")
+        sb.remove_elements("iframe")
         sb.type('input[title="Search"]', "SeleniumBase GitHub\n")
         sb.click('a[href*="github.com/seleniumbase/SeleniumBase"]')
         sb.click('a[title="seleniumbase"]')

Diff for: examples/test_sb_fixture.py

@@ -17,6 +17,6 @@ def test_voorbeeld_1(self):
         self.controleren_tekst("Rijksmuseum", "#firstHeading")
         self.controleren_element('img[src*="Rijksmuseum"]')
         self.terug()
-        self.controleren_ware("Stroopwafel" in self.huidige_url_ophalen())
+        self.controleren_url_bevat("Stroopwafel")
         self.vooruit()
-        self.controleren_ware("Rijksmuseum" in self.huidige_url_ophalen())
+        self.controleren_url_bevat("Rijksmuseum")

Diff for: examples/translations/dutch_test_1.py

@@ -17,6 +17,6 @@ def test_exemple_1(self):
         self.vérifier_texte("Jardin des Tuileries", "#firstHeading")
         self.vérifier_élément('img[alt*="Jardin des Tuileries"]')
         self.retour()
-        self.vérifier_vrai("brûlée" in self.obtenir_url_actuelle())
+        self.vérifier_url_contient("brûlée")
         self.en_avant()
-        self.vérifier_vrai("Jardin" in self.obtenir_url_actuelle())
+        self.vérifier_url_contient("Jardin")

Diff for: examples/translations/french_test_1.py

@@ -17,6 +17,6 @@ def test_esempio_1(self):
         self.verificare_testo("Colosseo", "#firstHeading")
         self.verificare_elemento('img[alt*="Colosse"]')
         self.indietro()
-        self.verificare_vero("Pizza" in self.ottenere_url_corrente())
+        self.verificare_url_contiene("Pizza")
         self.avanti()
-        self.verificare_vero("Colosseo" in self.ottenere_url_corrente())
+        self.verificare_url_contiene("Colosseo")

Diff for: examples/translations/italian_test_1.py

@@ -17,9 +17,9 @@ def test_exemplo_1(self):
         self.verificar_texto("Florianópolis", "h1#firstHeading")
         self.verificar_elemento('td:contains("Avenida Beira-Mar")')
         self.voltar()
-        self.verificar_verdade("João" in self.obter_url_atual())
+        self.verificar_url_contém("João_Pessoa")
         self.atualizar_a_página()
-        self.digitar("#searchform input", "Teatro Amazonas")
+        self.js_digitar("#searchform input", "Teatro Amazonas")
         self.clique("#searchform button")
         self.verificar_texto("Teatro Amazonas", "#firstHeading")
         self.verificar_texto_do_link("Festival Amazonas de Ópera")

Diff for: examples/translations/portuguese_test_1.py

@@ -17,6 +17,6 @@ def test_пример_1(self):
         self.подтвердить_текст("Операция «Ы» и другие приключения Шурика")
         self.подтвердить_элемент('img[alt="Постер фильма"]')
         self.назад()
-        self.подтвердить_правду("университет" in self.получить_текущий_URL())
+        self.подтвердить_URL_содержит("университет")
         self.вперед()
-        self.подтвердить_правду("Шурика" in self.получить_текущий_URL())
+        self.подтвердить_URL_содержит("Шурика")

Diff for: examples/translations/russian_test_1.py

@@ -17,6 +17,6 @@ def test_ejemplo_1(self):
         self.verificar_texto("Palma de Mallorca", "#firstHeading")
         self.verificar_elemento('img[alt*="Palma"]')
         self.volver()
-        self.verificar_verdad("Tibidabo" in self.obtener_url_actual())
+        self.verificar_url_contiene("Tibidabo")
         self.adelante()
-        self.verificar_verdad("Mallorca" in self.obtener_url_actual())
+        self.verificar_url_contiene("Mallorca")

Diff for: examples/translations/spanish_test_1.py

@@ -4,25 +4,26 @@
 
 class UserAgentTests(BaseCase):
     def test_user_agent(self):
-        self.open("https://www.whatsmyua.info/")
-        user_agent_detected = self.get_text("#custom-ua-string")
+        self.open("http://whatsmyuseragent.org/")
+        user_agent_detected = self.get_text(".user-agent p")
         original_user_agent = user_agent_detected
         if not self.user_agent:
             # Using the built-in user-agent string
-            print("\n\nUser-Agent = %s\n" % user_agent_detected)
+            print("\n\nUser-Agent: %s" % user_agent_detected)
         else:
             # User-agent was overridden using: --agent=STRING
-            print("\n\nUser-Agent override = %s\n" % user_agent_detected)
+            print("\n\nUser-Agent override: %s" % user_agent_detected)
+        print("\n" + self.get_text(".ip-address p"))
         if not (self.headless or self.headless2 or self.xvfb):
             self.sleep(3)
+
+        # Now change the user-agent using "execute_cdp_cmd()"
         if not self.is_chromium():
-            # Skip the rest of the test if not using a Chromium browser
             msg = "\n* execute_cdp_cmd() is only for Chromium browsers"
             print(msg)
             self.skip(msg)
+        print("\n--------------------------")
         try:
-            # Now change the user-agent using "execute_cdp_cmd()"
-            print("--------------------------")
             self.driver.execute_cdp_cmd(
                 "Network.setUserAgentOverride",
                 {
@@ -32,9 +33,10 @@ def test_user_agent(self):
                     "NF/6.0.1.15.4 NintendoBrowser/5.1.0.20393"
                 },
             )
-            self.open("https://www.whatsmyua.info/")
-            user_agent_detected = self.get_text("#custom-ua-string")
-            print("\nUser-Agent override = %s\n" % user_agent_detected)
+            self.open("http://whatsmyuseragent.org/")
+            user_agent_detected = self.get_text(".user-agent p")
+            print("\nUser-Agent override: %s" % user_agent_detected)
+            print("\n" + self.get_text(".ip-address p") + "\n")
             if not (self.headless or self.headless2 or self.xvfb):
                 self.sleep(3)
         finally:

Diff for: examples/user_agent_test.py

@@ -132,6 +132,7 @@ pytest my_first_test.py --settings-file=custom_settings.py
 --firefox-pref=SET  # (Set a Firefox preference:value set, comma-separated.)
 --extension-zip=ZIP  # (Load a Chrome Extension .zip|.crx, comma-separated.)
 --extension-dir=DIR  # (Load a Chrome Extension directory, comma-separated.)
+--binary-location=PATH  # (Set path of the Chromium browser binary to use.)
 --sjw  # (Skip JS Waits for readyState to be "complete" or Angular to load.)
 --pls=PLS  # (Set pageLoadStrategy on Chrome: "normal", "eager", or "none".)
 --headless  # (Run tests in headless mode. The default arg on Linux OS.)

Diff for: help_docs/customizing_test_runs.md

@@ -713,8 +713,9 @@ self.find_text(text, selector="html", by="css selector", timeout=None)
 # Duplicates: self.wait_for_text(text, selector="html", by="css selector", timeout=None)
 #             self.wait_for_text_visible(text, selector="html", by="css selector", timeout=None)
 
-self.wait_for_exact_text_visible(
-    text, selector="html", by="css selector", timeout=None)
+self.find_exact_text(text, selector="html", by="css selector", timeout=None)
+# Duplicates: self.wait_for_exact_text(text, selector="html", by="css selector", timeout=None)
+#             self.wait_for_exact_text_visible(text, selector="html", by="css selector", timeout=None)
 
 self.assert_text(text, selector="html", by="css selector", timeout=None)
 # Duplicates: self.assert_text_visible(text, selector="html", by="css selector", timeout=None)
@@ -762,8 +763,12 @@ self.assert_element_not_visible(selector, by="css selector", timeout=None)
 
 self.wait_for_text_not_visible(text, selector="html", by="css selector", timeout=None)
 
+self.wait_for_exact_text_not_visible(text, selector="html", by="css selector", timeout=None)
+
 self.assert_text_not_visible(text, selector="html", by="css selector", timeout=None)
 
+self.assert_exact_text_not_visible(text, selector="html", by="css selector", timeout=None)
+
 ############
 
 self.wait_for_attribute_not_present(