Issue #265: Upgrade Selenium images (#663)

* Issue #265: Upgrade Selenium images * Fix MINK_DRIVER_ARGS * Switch to lullabot/mink-selenium2-driver
Lullabot · Aug 20, 2024 · 4ca055c · 4ca055c
1 parent 02bc6a1
commit 4ca055c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml
@@ -124,7 +124,7 @@ jobs:
           ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
           ddev composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
-          ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits behat/mink-selenium2-driver --dev --with-all-dependencies
+          ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits lullabot/mink-selenium2-driver --dev --with-all-dependencies
           # Restart is required to enable the provided Selenium containers
           ddev restart
 

diff --git a/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml b/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml
@@ -3,7 +3,7 @@ version: '3.6'
 services:
   chrome:
     container_name: ddev-${DDEV_SITENAME}-chrome
-    image: seleniarm/standalone-chromium:4.1.2-20220227
+    image: selenium/standalone-chromium:127.0-20240820
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: $DDEV_APPROOT
@@ -29,7 +29,7 @@ services:
 
   firefox:
     container_name: ddev-${DDEV_SITENAME}-firefox
-    image: seleniarm/standalone-firefox:4.1.2-20220227
+    image: selenium/standalone-firefox:129.0-20240820
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: $DDEV_APPROOT

diff --git a/scaffold/phpunit-testtraits.xml b/scaffold/phpunit-testtraits.xml
@@ -32,10 +32,10 @@
     -->
     <env name="BROWSERTEST_OUTPUT_BASE_URL" value=""/>
     <!-- Example for changing the driver args to webdriver tests MINK_DRIVER_ARGS_WEBDRIVER value: '["chrome", { "chromeOptions": { "w3c": false } }, "http://localhost:4444/wd/hub"]' For using the Firefox browser, replace "chrome" with "firefox" -->
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["---no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost"]}}, "http://chrome:4444/wd/hub"]'/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--disable-dev-shm-usage", "--dns-prefetch-disable"]}}, "http://chrome:4444"]'/>
     <!-- DTT settings https://gitlab.com/weitzman/drupal-test-traits -->
     <env name="DTT_BASE_URL" value="http://web"/>
-    <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["---no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost"]}}, "http://chrome:4444/wd/hub"]'/>
+    <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--disable-dev-shm-usage", "--dns-prefetch-disable"]}}, "http://chrome:4444"]'/>
   </php>
   <extensions>
     <!-- Functional tests HTML output logging. -->

diff --git a/scaffold/phpunit.xml b/scaffold/phpunit.xml
@@ -32,7 +32,7 @@
     -->
     <env name="BROWSERTEST_OUTPUT_BASE_URL" value=""/>
     <!-- Example for changing the driver args to webdriver tests MINK_DRIVER_ARGS_WEBDRIVER value: '["chrome", { "chromeOptions": { "w3c": false } }, "http://localhost:4444/wd/hub"]' For using the Firefox browser, replace "chrome" with "firefox" -->
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["---no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost"]}}, "http://chrome:4444/wd/hub"]'/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","goog:chromeOptions":{"w3c": true, "args":["---no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--disable-dev-shm-usage", "--dns-prefetch-disable"]}}, "http://chrome:4444"]'/>
   </php>
   <extensions>
     <!-- Functional tests HTML output logging. -->