Merge pull request #1385 from seleniumbase/refactoring-3d-apis-and-dependencies

Refactoring, optimizations, dependencies, and docs

Author: mdmintz

.github/workflows/python-package.yml

@@ -86,9 +86,12 @@ jobs:
     - name: Run pytest examples/test_inspect_html.py --browser=chrome --headless
       run: |
         pytest examples/test_inspect_html.py --browser=chrome --headless -v -s --junit-xml=junit/test-results.xml
-    - name: Run pytest examples/my_first_test.py --browser=firefox --headless
+    - name: Run pytest examples/test_mfa_login.py --browser=firefox --headless
       run: |
-        pytest examples/my_first_test.py --browser=firefox --headless -v -s --junit-xml=junit/test-results.xml
+        pytest examples/test_mfa_login.py --browser=firefox --headless -v -s --junit-xml=junit/test-results.xml
+    - name: Run pytest examples/test_mfa_login.py --browser=firefox --xvfb
+      run: |
+        pytest examples/test_mfa_login.py --browser=firefox --xvfb -v -s --junit-xml=junit/test-results.xml
     - name: Run behave examples/behave_bdd/features/calculator.feature -D rs -D crumbs -D xvfb
       run: |
         behave examples/behave_bdd/features/calculator.feature -D rs -D crumbs -D xvfb -T -k

examples/translations/japanese_test_1.py

@@ -6,16 +6,16 @@ class 私のテストクラス(セレニウムテストケース):
     def test_例1(self):
         self.を開く("https://ja.wikipedia.org/wiki/")
         self.テキストを確認する("ウィキペディア")
-        self.要素を確認する('[title="メインページに移動する"]')
-        self.入力("#searchInput", "アニメ")
-        self.クリックして("#searchButton")
+        self.要素を確認する('[title*="メインページに移動する"]')
+        self.JS入力('input[name="search"]', "アニメ")
+        self.クリックして("#searchform button")
         self.テキストを確認する("アニメ", "#firstHeading")
-        self.入力("#searchInput", "寿司")
-        self.クリックして("#searchButton")
+        self.JS入力('input[name="search"]', "寿司")
+        self.クリックして("#searchform button")
         self.テキストを確認する("寿司", "#firstHeading")
         self.要素を確認する('img[alt="握り寿司"]')
         self.入力("#searchInput", "レゴランド・ジャパン")
-        self.クリックして("#searchButton")
+        self.クリックして("div.suggestions span.highlight")
         self.要素を確認する('img[alt*="LEGOLAND JAPAN"]')
         self.リンクテキストを確認する("名古屋城")
         self.リンクテキストをクリックします("テーマパーク")

help_docs/syntax_formats.md

@@ -372,16 +372,16 @@ class 私のテストクラス(セレニウムテストケース):
     def test_例1(self):
         self.を開く("https://ja.wikipedia.org/wiki/")
         self.テキストを確認する("ウィキペディア")
-        self.要素を確認する('[title="メインページに移動する"]')
-        self.入力("#searchInput", "アニメ")
-        self.クリックして("#searchButton")
+        self.要素を確認する('[title*="メインページに移動する"]')
+        self.JS入力('input[name="search"]', "アニメ")
+        self.クリックして("#searchform button")
         self.テキストを確認する("アニメ", "#firstHeading")
-        self.入力("#searchInput", "寿司")
-        self.クリックして("#searchButton")
+        self.JS入力('input[name="search"]', "寿司")
+        self.クリックして("#searchform button")
         self.テキストを確認する("寿司", "#firstHeading")
         self.要素を確認する('img[alt="握り寿司"]')
         self.入力("#searchInput", "レゴランド・ジャパン")
-        self.クリックして("#searchButton")
+        self.クリックして("div.suggestions span.highlight")
         self.要素を確認する('img[alt*="LEGOLAND JAPAN"]')
         self.リンクテキストを確認する("名古屋城")
         self.リンクテキストをクリックします("テーマパーク")

requirements.txt

@@ -32,13 +32,15 @@ jedi==0.18.1;python_version>="3.6"
 idna==2.10;python_version<"3.6"
 idna==3.3;python_version>="3.6"
 chardet==3.0.4;python_version<"3.5"
-chardet==4.0.0;python_version>="3.5"
-charset-normalizer==2.0.12;python_version>="3.5"
+chardet==4.0.0;python_version>="3.5" and python_version<"3.7"
+chardet==5.0.0;python_version>="3.7"
+charset-normalizer==2.0.12;python_version>="3.5" and python_version<"3.7"
+charset-normalizer==2.1.0;python_version>="3.7"
 urllib3==1.26.9
 requests==2.27.1;python_version<"3.5"
 requests==2.25.1;python_version>="3.5" and python_version<"3.6"
 requests==2.27.1;python_version>="3.6" and python_version<"3.7"
-requests==2.28.0;python_version>="3.7"
+requests==2.28.1;python_version>="3.7"
 nose==1.3.7
 sniffio==1.2.0;python_version>="3.7"
 h11==0.13.0;python_version>="3.7"
@@ -117,7 +119,7 @@ pymysql==1.0.2;python_version>="3.6"
 pyotp==2.3.0;python_version<"3.5"
 pyotp==2.6.0;python_version>="3.5"
 boto==2.49.0
-cffi==1.15.0
+cffi==1.15.1
 toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "3.3.3"
+__version__ = "3.3.4"

seleniumbase/behave/behave_helper.py

@@ -22,9 +22,7 @@ def generate_gherkin(srt_actions):
             elif "'" not in action[2]:
                 sb_actions.append("Open '%s'" % action[2])
             else:
-                sb_actions.append(
-                    'Open "%s"' % action[2].replace('"', '\\"')
-                )
+                sb_actions.append('Open "%s"' % action[2].replace('"', '\\"'))
         elif action[0] == "f_url":
             if "%" in action[2] and python3:
                 try:
@@ -73,27 +71,17 @@ def generate_gherkin(srt_actions):
                 method = "js_type"
             text = action[2].replace("\n", "\\n")
             if '"' not in action[1] and '"' not in text:
-                sb_actions.append(
-                    'Into "%s" type "%s"' % (action[1], text)
-                )
+                sb_actions.append('Into "%s" type "%s"' % (action[1], text))
             elif '"' not in action[1] and '"' in text:
-                sb_actions.append(
-                    'Into "%s" type \'%s\'' % (action[1], text)
-                )
+                sb_actions.append('Into "%s" type \'%s\'' % (action[1], text))
             elif '"' in action[1] and '"' not in text:
-                sb_actions.append(
-                    'Into \'%s\' type "%s"' % (action[1], text)
-                )
+                sb_actions.append('Into \'%s\' type "%s"' % (action[1], text))
             elif '"' in action[1] and '"' in text:
-                sb_actions.append(
-                    "Into '%s' type '%s'" % (action[1], text)
-                )
+                sb_actions.append("Into '%s' type '%s'" % (action[1], text))
         elif action[0] == "e_mfa":
             text = action[2].replace("\n", "\\n")
             if '"' not in action[1] and '"' not in text:
-                sb_actions.append(
-                    'Into "%s" do MFA "%s"' % (action[1], text)
-                )
+                sb_actions.append('Into "%s" do MFA "%s"' % (action[1], text))
             elif '"' not in action[1] and '"' in text:
                 sb_actions.append(
                     'Into "%s" do MFA \'%s\'' % (action[1], text)
@@ -103,9 +91,7 @@ def generate_gherkin(srt_actions):
                     'Into \'%s\' do MFA "%s"' % (action[1], text)
                 )
             elif '"' in action[1] and '"' in text:
-                sb_actions.append(
-                    "Into '%s' do MFA '%s'" % (action[1], text)
-                )
+                sb_actions.append("Into '%s' do MFA '%s'" % (action[1], text))
         elif action[0] == "h_clk":
             if '"' not in action[1] and '"' not in action[2]:
                 sb_actions.append(
@@ -271,9 +257,7 @@ def generate_gherkin(srt_actions):
             if not dest:
                 sb_actions.append('%s "%s" to downloads' % (method, file_url))
             else:
-                sb_actions.append(
-                    '%s "%s" to "%s"' % (method, file_url, dest)
-                )
+                sb_actions.append('%s "%s" to "%s"' % (method, file_url, dest))
         elif action[0] == "as_at":
             if ('"' not in action[1][0]) and action[1][2]:
                 sb_actions.append(
@@ -337,13 +321,9 @@ def generate_gherkin(srt_actions):
                     )
             else:
                 if '"' not in action[1][0]:
-                    sb_actions.append(
-                        '%s "%s"' % (method, action[1][0])
-                    )
+                    sb_actions.append('%s "%s"' % (method, action[1][0]))
                 else:
-                    sb_actions.append(
-                        "%s '%s'" % (method, action[1][0])
-                    )
+                    sb_actions.append("%s '%s'" % (method, action[1][0]))
         elif action[0] == "da_el":
             method = "Deferred assert element"
             if '"' not in action[1]:

seleniumbase/behave/behave_sb.py

@@ -636,7 +636,7 @@ def get_configured_sb(context):
             sb.proxy_bypass_list = proxy_bypass_list
             continue
         # Handle: -D proxy-pac-url=URL / proxy-pac-url=USERNAME:PASSWORD@URL
-        if low_key in ["proxy-pac-url", "proxy_pac_url", "pac-url", "pac_url"]:
+        if low_key in ["proxy-pac-url", "pac-url"]:
             proxy_pac_url = userdata[key]
             if proxy_pac_url == "true":
                 proxy_pac_url = sb.proxy_pac_url  # revert to default

seleniumbase/console_scripts/sb_behave_gui.py

@@ -84,10 +84,7 @@ def do_behave_run(
             total_selected_tests += 1
 
     full_run_command = "behave"
-    if (
-        total_selected_tests == 0
-        or total_tests == total_selected_tests
-    ):
+    if total_selected_tests == 0 or total_tests == total_selected_tests:
         if command_string:
             full_run_command += " "
             full_run_command += command_string
@@ -192,27 +189,19 @@ def create_tkinter_gui(tests, command_string):
     question_menu.pack()
 
     qmx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Quiet Mode  (--quiet)", variable=qmx
-    )
+    chk = tk.Checkbutton(root, text="Quiet Mode  (--quiet)", variable=qmx)
     chk.pack()
 
     dmx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Demo Mode  (-D demo)", variable=dmx
-    )
+    chk = tk.Checkbutton(root, text="Demo Mode  (-D demo)", variable=dmx)
     chk.pack()
 
     mmx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Mobile Mode  (-D mobile)", variable=mmx
-    )
+    chk = tk.Checkbutton(root, text="Mobile Mode  (-D mobile)", variable=mmx)
     chk.pack()
 
     dbx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Dashboard  (-D dashboard)", variable=dbx
-    )
+    chk = tk.Checkbutton(root, text="Dashboard  (-D dashboard)", variable=dbx)
     chk.pack()
     chk.select()
 

seleniumbase/console_scripts/sb_commander.py

@@ -83,10 +83,7 @@ def do_pytest_run(
             total_selected_tests += 1
 
     full_run_command = "pytest"
-    if (
-        total_selected_tests == 0
-        or total_tests == total_selected_tests
-    ):
+    if total_selected_tests == 0 or total_tests == total_selected_tests:
         if command_string:
             full_run_command += " "
             full_run_command += command_string
@@ -195,28 +192,20 @@ def create_tkinter_gui(tests, command_string):
     question_menu.pack()
 
     vox = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Verbose Output  (-v)", variable=vox
-    )
+    chk = tk.Checkbutton(root, text="Verbose Output  (-v)", variable=vox)
     chk.pack()
     chk.select()
 
     dmx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Demo Mode  (--demo)", variable=dmx
-    )
+    chk = tk.Checkbutton(root, text="Demo Mode  (--demo)", variable=dmx)
     chk.pack()
 
     mmx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Mobile Mode  (--mobile)", variable=mmx
-    )
+    chk = tk.Checkbutton(root, text="Mobile Mode  (--mobile)", variable=mmx)
     chk.pack()
 
     dbx = tk.IntVar()
-    chk = tk.Checkbutton(
-        root, text="Dashboard  (--dashboard)", variable=dbx
-    )
+    chk = tk.Checkbutton(root, text="Dashboard  (--dashboard)", variable=dbx)
     chk.pack()
     chk.select()
 

seleniumbase/console_scripts/sb_recorder.py

@@ -60,7 +60,7 @@ def show_already_recording_warning():
     messagebox.showwarning(
         "SeleniumBase Recorder: Already Running!",
         "Please finalize the active recording from the terminal\n"
-        'where you opened the Recorder: Type "c" and hit Enter.'
+        'where you opened the Recorder: Type "c" and hit Enter.',
     )
 
 
@@ -175,7 +175,7 @@ def do_playback(file_name, use_chrome, window, demo_mode=False):
         messagebox.showwarning(
             "SeleniumBase Recorder: Already Running!",
             "Please finalize the active recording from the terminal\n"
-            'where you opened the Recorder: Type "c" and hit Enter.'
+            'where you opened the Recorder: Type "c" and hit Enter.',
         )
     send_window_to_front(window)
 
@@ -278,7 +278,7 @@ def show_still_running_warning():
         "SeleniumBase Recorder: Still Running!",
         "Please finalize the active recording from the terminal\n"
         'where you opened the Recorder: Type "c" and hit Enter.\n'
-        "(Then you can safely close this alert.)"
+        "(Then you can safely close this alert.)",
     )