Skip to content
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.

Sign up for GitHub

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

Use new headless mode in Google Chrome #215

Merged
merged 4 commits into from
Feb 7, 2025
+30 −22
Merged

Use new headless mode in Google Chrome #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96247f9
Upgrade Python requirements
replaceafill Jan 26, 2025
e5eb954
Upgrade pre-commit dependencies
replaceafill Jan 26, 2025
a17c3fd
Use new headless mode in Chrome
replaceafill Jan 26, 2025
28ace0d
Use the standard Google Chrome browser
replaceafill Feb 7, 2025
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ repos:
hooks:
- id: end-of-file-fixer
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.1
rev: v0.9.5
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.14.1
rev: v1.15.0
hooks:
- id: mypy
additional_dependencies:
Expand Down
16 changes: 12 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN set -ex \
ca-certificates \
curl \
git \
gnupg \
jq \
locales \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
Expand All @@ -43,10 +44,7 @@ RUN set -ex \
&& SELENIUM_MANAGER_DOWNLOAD_URL=$(curl -sL -o /dev/null -w '%{url_effective}' https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/latest | sed -e 's|/tag/\(.*\)|/download/\1/selenium-manager-linux|g') \
&& curl -o $SELENIUM_BIN/selenium-manager -L $SELENIUM_MANAGER_DOWNLOAD_URL \
&& chmod +x $SELENIUM_BIN/selenium-manager \
&& CHROME_OUTPUT=$($SELENIUM_BIN/selenium-manager --cache-path $SELENIUM_CACHE --browser chrome --output JSON) \
&& FIREFOX_OUTPUT=$($SELENIUM_BIN/selenium-manager --cache-path $SELENIUM_CACHE --browser firefox --output JSON) \
&& ln -s $(echo $CHROME_OUTPUT | jq -r '.result.browser_path') $SELENIUM_BIN/google-chrome \
&& ln -s $(echo $CHROME_OUTPUT | jq -r '.result.driver_path') $SELENIUM_BIN/chromedriver \
&& ln -s $(echo $FIREFOX_OUTPUT | jq -r '.result.browser_path') $SELENIUM_BIN/firefox \
&& ln -s $(echo $FIREFOX_OUTPUT | jq -r '.result.driver_path') $SELENIUM_BIN/geckodriver

Expand Down Expand Up @@ -94,14 +92,17 @@ ARG USER_ID=1000
ARG GROUP_ID=1000

ENV SE_MANAGER_PATH=${SELENIUM_DIR}/bin/selenium-manager
ENV SE_CHROME_PATH=${SELENIUM_DIR}/bin/google-chrome
ENV SE_CHROME_PATH=/usr/bin/google-chrome
ENV SE_FIREFOX_PATH=${SELENIUM_DIR}/bin/firefox

RUN set -ex \
&& curl -fSsL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg \
&& echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
&& apt-get -qqy update \
&& apt-get -qqy --no-install-recommends install \
bzip2 \
gnupg \
google-chrome-stable \
libasound2 \
libdbus-glib-1-2 \
libdrm2 \
Expand All @@ -124,6 +125,13 @@ COPY --chown=${USER_ID}:${GROUP_ID} --from=browsers-builder --link /selenium /se
COPY --chown=${USER_ID}:${GROUP_ID} --from=pyenv-builder --link /pyenv /pyenv
COPY --chown=${USER_ID}:${GROUP_ID} --link . /home/artefactual/acceptance-tests

# Download the ChromeDriver version that matches the recently installed version
# of Google Chrome.
RUN set -ex \
&& GOOGLE_CHROME_VERSION=$(google-chrome --version | cut --delimiter ' ' --fields 3) \
&& CHROME_OUTPUT=$($SELENIUM_DIR/bin/selenium-manager --cache-path $SELENIUM_DIR/cache --browser chrome --driver-version $GOOGLE_CHROME_VERSION --output JSON --avoid-browser-download) \
&& ln -s $(echo $CHROME_OUTPUT | jq -r '.result.driver_path') $SELENIUM_DIR/bin/chromedriver

RUN set -ex \
&& groupadd --gid ${GROUP_ID} artefactual \
&& useradd --uid ${USER_ID} --gid ${GROUP_ID} --create-home artefactual
Expand Down
2 changes: 1 addition & 1 deletion amuser/selenium_ability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_driver(self):
if self.driver_name == "Chrome":
options = webdriver.ChromeOptions()
if headless:
options.add_argument("--headless=old")
options.add_argument("--headless=new")
driver = webdriver.Chrome(options=options)
driver.set_window_size(1700, 900)
elif self.driver_name == "Firefox":
Expand Down
22 changes: 11 additions & 11 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
amclient==1.4.0
# via -r requirements.txt
attrs==24.3.0
attrs==25.1.0
# via
# -r requirements.txt
# outcome
Expand All @@ -15,9 +15,9 @@ behave==1.2.6
# via -r requirements.txt
build==1.2.2.post1
# via pip-tools
cachetools==5.5.0
cachetools==5.5.1
# via tox
certifi==2024.12.14
certifi==2025.1.31
# via
# -r requirements.txt
# requests
Expand All @@ -39,7 +39,7 @@ exceptiongroup==1.2.2
# -r requirements.txt
# trio
# trio-websocket
filelock==3.16.1
filelock==3.17.0
# via
# tox
# virtualenv
Expand All @@ -52,7 +52,7 @@ idna==3.10
# -r requirements.txt
# requests
# trio
importlib-metadata==8.5.0
importlib-metadata==8.6.1
# via build
lxml==5.3.0
# via
Expand Down Expand Up @@ -92,7 +92,7 @@ ptyprocess==0.7.0
# via
# -r requirements.txt
# pexpect
pyproject-api==1.8.0
pyproject-api==1.9.0
# via tox
pyproject-hooks==1.2.0
# via
Expand All @@ -106,9 +106,9 @@ requests==2.32.3
# via
# -r requirements.txt
# amclient
ruff==0.9.1
ruff==0.9.5
# via -r requirements-dev.in
selenium==4.27.1
selenium==4.28.1
# via -r requirements.txt
six==1.17.0
# via
Expand All @@ -131,7 +131,7 @@ tomli==2.2.1
# pip-tools
# pyproject-api
# tox
tox==4.23.2
tox==4.24.1
# via -r requirements-dev.in
trio==0.28.0
# via
Expand All @@ -153,7 +153,7 @@ urllib3[socks]==2.3.0
# amclient
# requests
# selenium
virtualenv==20.28.1
virtualenv==20.29.1
# via tox
websocket-client==1.8.0
# via
Expand All @@ -169,7 +169,7 @@ zipp==3.21.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
pip==24.3.1
pip==25.0
# via pip-tools
setuptools==75.8.0
# via pip-tools
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
amclient==1.4.0
# via -r requirements.in
attrs==24.3.0
attrs==25.1.0
# via
# outcome
# trio
behave==1.2.6
# via -r requirements.in
certifi==2024.12.14
certifi==2025.1.31
# via
# requests
# selenium
Expand Down Expand Up @@ -52,7 +52,7 @@ requests==2.32.3
# via
# -r requirements.in
# amclient
selenium==4.27.1
selenium==4.28.1
# via -r requirements.in
six==1.17.0
# via
Expand Down
2 changes: 1 addition & 1 deletion simplebrowsertest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def get_chrome_driver():
options = webdriver.ChromeOptions()
options.add_argument("--headless=old")
options.add_argument("--headless=new")
driver = webdriver.Chrome(options=options)
return driver

Expand Down