Skip to content

Updates and fixes #1829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions examples/tour_examples/bootstrap_google_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,18 @@ def test_google_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
4 changes: 2 additions & 2 deletions examples/tour_examples/bootstrap_xkcd_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ def test_bootstrap_tour(self):
self.add_tour_step("Learn about the author here.", 'a[rel="author"]')
self.add_tour_step("Click for a random comic.", 'a[href*="/random/"]')
self.add_tour_step("Thanks for taking this tour!")
self.export_tour(filename="bootstrap_xkcd_tour.js") # Exports the tour
self.play_tour() # Plays the tour
self.export_tour(filename="bootstrap_xkcd_tour.js")
self.play_tour()
17 changes: 12 additions & 5 deletions examples/tour_examples/driverjs_maps_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,18 @@ def test_create_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
17 changes: 12 additions & 5 deletions examples/tour_examples/google_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,18 @@ def test_google_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
17 changes: 12 additions & 5 deletions examples/tour_examples/hopscotch_google_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,18 @@ def test_google_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
17 changes: 12 additions & 5 deletions examples/tour_examples/introjs_google_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,18 @@ def test_google_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
17 changes: 12 additions & 5 deletions examples/tour_examples/maps_introjs_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,18 @@ def test_google_maps_tour(self):
self.add_tour_step(
"Or click here to zoom out.", "#widget-zoom-out", alignment="left"
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
17 changes: 12 additions & 5 deletions examples/tour_examples/shepherd_google_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,18 @@ def test_google_tour(self):
alignment="left",
theme="light",
)
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
if self.is_element_visible('button[jsaction*="settings.open;"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction*="settings.open;"]',
alignment="right",
)
elif self.is_element_visible('button[jsaction="navigationrail.more"]'):
self.add_tour_step(
"Use the Menu button to see more options.",
'button[jsaction="navigationrail.more"]',
alignment="right",
)
self.add_tour_step(
"Or click here to see more Google apps.",
'[title="Google apps"]',
Expand Down
4 changes: 2 additions & 2 deletions examples/tour_examples/xkcd_tour.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ def test_create_tour(self):
self.add_tour_step("Click here for the license.", 'a[rel="license"]')
self.add_tour_step("Click for a random comic.", 'a[href*="/random/"]')
self.add_tour_step("Thanks for taking this tour!")
self.export_tour(filename="xkcd_tour.js") # Exports the tour
self.play_tour() # Plays the tour
self.export_tour(filename="xkcd_tour.js")
self.play_tour()
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ nav:
- 🎞️ Presenter Demo: https://seleniumbase.io/other/presenter.html
- 📊 Chart Maker Demo: https://seleniumbase.io/other/chart_presentation.html
- ⚙️ Python Virtual Envs: https://seleniumbase.io/other/py_virtual_envs.html
- 🔰 Fundamentals Demo: https://seleniumbase.io/other/fundamentals.html
- Demo Pages:
- 🍵 Coffee Cart (Test App): https://seleniumbase.io/coffee/
- 📑 Demo Page (Test Page): https://seleniumbase.io/demo_page
Expand Down
6 changes: 3 additions & 3 deletions mkdocs_build/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Jinja2==3.1.2
click==8.1.3
ghp-import==2.1.0
readme-renderer==37.3
pymdown-extensions==9.10
importlib-metadata==6.1.0
pymdown-extensions==9.11
importlib-metadata==6.2.0
pipdeptree==2.7.0
bleach==6.0.0
lunr==0.6.2
Expand All @@ -27,7 +27,7 @@ cssselect2==0.7.0
tinycss2==1.2.1
defusedxml==0.7.1
mkdocs==1.4.2
mkdocs-material==9.1.4
mkdocs-material==9.1.6
mkdocs-exclude-search==0.6.5
mkdocs-simple-hooks==0.1.5
mkdocs-material-extensions==1.1.1
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pip>=23.0.1;python_version>="3.7"
packaging>=21.3;python_version<"3.7"
packaging>=23.0;python_version>="3.7"
setuptools>=59.6.0;python_version<"3.7"
setuptools>=67.6.0;python_version>="3.7"
setuptools>=67.6.1;python_version>="3.7"
keyring>=23.4.1;python_version<"3.8"
keyring>=23.13.1;python_version>="3.8"
tomli>=1.2.3;python_version<"3.7"
Expand All @@ -17,10 +17,11 @@ attrs>=22.2.0;python_version>="3.7"
PyYAML>=6.0
certifi>=2022.12.7
filelock>=3.4.1;python_version<"3.7"
filelock>=3.10.7;python_version>="3.7"
filelock>=3.11.0;python_version>="3.7"
platformdirs>=2.4.0;python_version<"3.7"
platformdirs>=3.2.0;python_version>="3.7"
pyparsing>=3.0.7;python_version<"3.7"
pyparsing>=3.0.9;python_version>="3.7"
zipp==3.6.0;python_version<"3.7"
zipp>=3.15.0;python_version>="3.7"
more-itertools==8.14.0;python_version<"3.7"
Expand All @@ -42,7 +43,6 @@ h11==0.14.0;python_version>="3.7"
outcome==1.2.0;python_version>="3.7"
trio==0.22.0;python_version>="3.7"
trio-websocket==0.10.2;python_version>="3.7"
websockets==10.4;python_version>="3.7"
pyopenssl==23.1.1;python_version>="3.7"
wsproto==1.2.0;python_version>="3.7"
selenium==3.141.0;python_version<"3.7"
Expand All @@ -59,7 +59,7 @@ iniconfig==2.0.0;python_version>="3.7"
pluggy==1.0.0
py==1.11.0
pytest==7.0.1;python_version<"3.7"
pytest==7.2.2;python_version>="3.7"
pytest==7.3.0;python_version>="3.7"
pytest-forked==1.4.0;python_version<"3.7"
pytest-forked==1.6.0;python_version>="3.7"
pytest-html==2.0.1
Expand All @@ -76,7 +76,7 @@ sbvirtualdisplay==1.2.0
behave==1.2.6
soupsieve==2.3.2.post1;python_version<"3.7"
soupsieve==2.4;python_version>="3.7"
beautifulsoup4==4.12.0
beautifulsoup4==4.12.2
cryptography==36.0.2;python_version<"3.7"
cryptography==40.0.1;python_version>="3.7"
pygments==2.14.0
Expand All @@ -103,7 +103,7 @@ rich==13.3.3;python_version>="3.7"
# ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

coverage==6.2;python_version<"3.7"
coverage==7.2.2;python_version>="3.7"
coverage==7.2.3;python_version>="3.7"
pytest-cov==4.0.0
flake8==5.0.4;python_version<"3.9"
flake8==6.0.0;python_version>="3.9"
Expand Down
2 changes: 1 addition & 1 deletion seleniumbase/__version__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# seleniumbase package
__version__ = "4.13.21"
__version__ = "4.13.22"
8 changes: 8 additions & 0 deletions seleniumbase/core/browser_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,14 @@ def _set_chrome_options(
chromium_arg_item = "-" + chromium_arg_item
else:
chromium_arg_item = "--" + chromium_arg_item
if "remote-debugging-port=" in chromium_arg_item:
try:
# Extra processing for UC Mode
chrome_options._remote_debugging_port = int(
chromium_arg_item.split("remote-debugging-port=")[1]
)
except Exception:
pass
if len(chromium_arg_item) >= 3:
chrome_options.add_argument(chromium_arg_item)
if devtools and not headless:
Expand Down
Loading