Merge pull request #586 from seleniumbase/many-changes-are-coming

Add/Update translations and more

Author: mdmintz

README.md

@@ -726,29 +726,29 @@ self.click("a.analytics")  # Clicks the generated button
 ```
 (Due to popular demand, this traffic generation example has been baked into SeleniumBase with the ``self.generate_referral(start_page, end_page)`` and the ``self.generate_traffic(start_page, end_page, loops)`` methods.)
 
-<h4>Using delayed asserts:</h4>
+<h4>Using deferred asserts:</h4>
 
-Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where delayed asserts come in. Here's the example:
+Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where deferred asserts come in. Here's the example:
 
 ```python
 from seleniumbase import BaseCase
 
 class MyTestClass(BaseCase):
 
-    def test_delayed_asserts(self):
+    def test_deferred_asserts(self):
         self.open('https://xkcd.com/993/')
         self.wait_for_element('#comic')
-        self.delayed_assert_element('img[alt="Brand Identity"]')
-        self.delayed_assert_element('img[alt="Rocket Ship"]')  # Will Fail
-        self.delayed_assert_element('#comicmap')
-        self.delayed_assert_text('Fake Item', '#middleContainer')  # Will Fail
-        self.delayed_assert_text('Random', '#middleContainer')
-        self.delayed_assert_element('a[name="Super Fake !!!"]')  # Will Fail
-        self.process_delayed_asserts()
+        self.deferred_assert_element('img[alt="Brand Identity"]')
+        self.deferred_assert_element('img[alt="Rocket Ship"]')  # Will Fail
+        self.deferred_assert_element('#comicmap')
+        self.deferred_assert_text('Fake Item', '#middleContainer')  # Will Fail
+        self.deferred_assert_text('Random', '#middleContainer')
+        self.deferred_assert_element('a[name="Super Fake !!!"]')  # Will Fail
+        self.process_deferred_asserts()
 ```
 
-``delayed_assert_element()`` and ``delayed_assert_text()`` will save any exceptions that would be raised.
-To flush out all the failed delayed asserts into a single exception, make sure to call ``self.process_delayed_asserts()`` at the end of your test method. If your test hits multiple pages, you can call ``self.process_delayed_asserts()`` at the end of all your delayed asserts for a single page. This way, the screenshot from your log file will have the location where the delayed asserts were made.
+``deferred_assert_element()`` and ``deferred_assert_text()`` will save any exceptions that would be raised.
+To flush out all the failed deferred asserts into a single exception, make sure to call ``self.process_deferred_asserts()`` at the end of your test method. If your test hits multiple pages, you can call ``self.process_deferred_asserts()`` before navigating to a new page so that the screenshot from your log files matches the URL where the deferred asserts were made.
 
 <h4>Accessing raw WebDriver</h4>
 

docs/requirements.txt

@@ -1,5 +1,5 @@
 mkdocs==1.1.2
-mkdocs-material==5.2.1
+mkdocs-material==5.2.2
 mkdocs-simple-hooks==0.1.1
 mkdocs-material-extensions==1.0
 mkdocs-minify-plugin==0.3.0

examples/gui_test_runner.py

@@ -63,11 +63,11 @@ def __init__(self, master):
             fg="red").pack()
         self.title7 = Label(
             frame,
-            text="Run a Failing Test with Delayed Asserts:",
+            text="Run a Failing Test with Deferred Asserts:",
             fg="blue").pack()
         self.run7 = Button(
             frame, command=self.run_7,
-            text=("pytest test_delayed_asserts.py --browser=chrome"),
+            text=("pytest test_deferred_asserts.py --browser=chrome"),
             fg="red").pack()
         self.end_title = Label(frame, text="", fg="black").pack()
         self.quit = Button(frame, text="QUIT", command=frame.quit).pack()
@@ -98,7 +98,7 @@ def run_6(self):
 
     def run_7(self):
         os.system(
-            'pytest test_delayed_asserts.py --browser=chrome')
+            'pytest test_deferred_asserts.py --browser=chrome')
 
 
 if __name__ == "__main__":

examples/handle_alert_test.py

@@ -6,12 +6,12 @@ class MyTestClass(BaseCase):
     def test_alerts(self):
         self.open("about:blank")
         self.execute_script('window.alert("ALERT!!!")')
-        self.sleep(1.2)  # Not needed (Lets you see the alert pop up)
-        self.wait_for_and_accept_alert()
-        self.sleep(0.8)  # Not needed (Lets you see the alert go away)
+        self.sleep(1)  # Not needed (Lets you see the alert pop up)
+        self.accept_alert()
+        self.sleep(1)  # Not needed (Lets you see the alert go away)
         self.execute_script('window.prompt("My Prompt","defaultText");')
-        self.sleep(1.2)  # Not needed (Lets you see the alert pop up)
-        alert = self.wait_for_and_switch_to_alert(timeout=2)
-        self.assert_equal(alert.text, "My Prompt")  # Not the input field
-        self.wait_for_and_dismiss_alert()
-        self.sleep(0.8)  # Not needed (Lets you see the alert go away)
+        self.sleep(1)  # Not needed (Lets you see the alert pop up)
+        alert = self.switch_to_alert()
+        self.assert_equal(alert.text, "My Prompt")  # Not input field
+        self.dismiss_alert()
+        self.sleep(1)  # Not needed (Lets you see the alert go away)

examples/offline_examples/handle_alert_test.py

@@ -0,0 +1,19 @@
+import pytest
+from seleniumbase import BaseCase
+
+
+@pytest.mark.offline  # Can be run with: "pytest -m offline"
+class OfflineTestClass(BaseCase):
+
+    def test_alerts(self):
+        self.open("data:,")
+        self.execute_script('window.alert("ALERT!!!")')
+        self.sleep(1)  # Not needed (Lets you see the alert pop up)
+        self.accept_alert()
+        self.sleep(1)  # Not needed (Lets you see the alert go away)
+        self.execute_script('window.prompt("My Prompt","defaultText");')
+        self.sleep(1)  # Not needed (Lets you see the alert pop up)
+        alert = self.switch_to_alert()
+        self.assert_equal(alert.text, "My Prompt")  # Not input field
+        self.dismiss_alert()
+        self.sleep(1)  # Not needed (Lets you see the alert go away)

examples/offline_examples/test_demo_page.py

@@ -7,9 +7,10 @@
 class OfflineTestClass(BaseCase):
 
     def test_demo_page(self):
-        # Load a local html file into the browser
-        dir_name = os.path.dirname(os.path.abspath(__file__))
-        self.load_html_file(dir_name + "/demo_page.html")
+        # Load a local html file into the web browser
+        dir_path = os.path.dirname(os.path.abspath(__file__))
+        file_path = dir_path + "/demo_page.html"
+        self.load_html_file(file_path)
 
         # Assert the title of the current web page
         self.assert_title("Web Testing Page")

examples/test_deferred_asserts.py

@@ -0,0 +1,22 @@
+"""
+This test demonstrates the use of deferred asserts.
+Deferred asserts won't raise exceptions from failures until either
+process_deferred_asserts() is called, or the test reaches the tearDown() step.
+"""
+import pytest
+from seleniumbase import BaseCase
+
+
+class MyTestClass(BaseCase):
+
+    @pytest.mark.expected_failure
+    def test_deferred_asserts(self):
+        self.open('https://xkcd.com/993/')
+        self.wait_for_element('#comic')
+        self.deferred_assert_element('img[alt="Brand Identity"]')
+        self.deferred_assert_element('img[alt="Rocket Ship"]')  # Will Fail
+        self.deferred_assert_element('#comicmap')
+        self.deferred_assert_text('Fake Item', '#middleContainer')  # Will Fail
+        self.deferred_assert_text('Random', '#middleContainer')
+        self.deferred_assert_element('a[name="Super Fake !!!"]')  # Will Fail
+        self.process_deferred_asserts()

examples/test_delayed_asserts.py

@@ -9,11 +9,11 @@ def test_exemple_1(self):
         self.vérifier_texte("Wikipédia")  # noqa
         self.vérifier_élément('[title="Visiter la page d’accueil"]')
         self.modifier_texte("#searchInput", "Crème brûlée")
-        self.cliquez_sur("#searchButton")
+        self.cliquer("#searchButton")
         self.vérifier_texte("Crème brûlée", "#firstHeading")
         self.vérifier_élément('img[alt*="Crème brûlée"]')
         self.modifier_texte("#searchInput", "Jardin des Tuileries")
-        self.cliquez_sur("#searchButton")
+        self.cliquer("#searchButton")
         self.vérifier_texte("Jardin des Tuileries", "#firstHeading")
         self.vérifier_élément('img[alt*="Jardin des Tuileries"]')
         self.retour()

examples/translations/french_test_1.py

@@ -460,23 +460,29 @@ self.assert_text_not_visible(text, selector="html", by=By.CSS_SELECTOR, timeout=
 
 ############
 
-self.wait_for_and_accept_alert(timeout=None)
+self.accept_alert(timeout=None)
+# Duplicates: self.wait_for_and_accept_alert(timeout=None)
 
-self.wait_for_and_dismiss_alert(timeout=None)
+self.dismiss_alert(timeout=None)
+# Duplicates: self.wait_for_and_dismiss_alert(timeout=None)
 
-self.wait_for_and_switch_to_alert(timeout=None)
+self.switch_to_alert(timeout=None)
+# Duplicates: self.wait_for_and_switch_to_alert(timeout=None)
 
 ############
 
 self.check_window(name="default", level=0, baseline=False)
 
 ############
 
-self.delayed_assert_element(selector, by=By.CSS_SELECTOR, timeout=None)
+self.deferred_assert_element(selector, by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.delayed_assert_element(selector, by=By.CSS_SELECTOR, timeout=None)
 
-self.delayed_assert_text(text, selector="html", by=By.CSS_SELECTOR, timeout=None)
+self.deferred_assert_text(text, selector="html", by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.delayed_assert_text(text, selector="html", by=By.CSS_SELECTOR, timeout=None)
 
-self.process_delayed_asserts()
+self.process_deferred_asserts(print_only=False)
+# Duplicates: self.process_delayed_asserts(print_only=False)
 
 ############