From 18a55c29528c30cdae5afb9bd28dfa4ea534600f Mon Sep 17 00:00:00 2001 From: Bill Seremetis Date: Tue, 9 Jul 2024 12:05:09 +0300 Subject: [PATCH 1/4] Update docker-compose.selenium-chrome.yaml Switch to official image --- docker-compose.selenium-chrome.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.selenium-chrome.yaml b/docker-compose.selenium-chrome.yaml index 2a1af73..0c1ae09 100644 --- a/docker-compose.selenium-chrome.yaml +++ b/docker-compose.selenium-chrome.yaml @@ -6,7 +6,7 @@ # services: selenium-chrome: - image: seleniarm/standalone-chromium:4.1.4-20220429 + image: selenium/standalone-chromium:126.0 container_name: ddev-${DDEV_SITENAME}-selenium-chrome expose: # The internal noVNC port, which operates over HTTP so it can be exposed From ba91c0449ab99005c03dae122d9d2c4c2289f101 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 21 Mar 2025 09:42:53 -0400 Subject: [PATCH 2/4] Bump Drupal core used in testing --- tests/test.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test.bats b/tests/test.bats index e501630..65b428a 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -7,10 +7,10 @@ setup() { export DDEV_NON_INTERACTIVE=true ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true cd "${TESTDIR}" - composer -n --no-install create-project 'drupal/recommended-project:^10' . + composer -n --no-install create-project 'drupal/recommended-project:^11' . composer -n config --no-plugins allow-plugins true - composer -n require 'drupal/core-dev:^10' 'drush/drush:^12' 'phpspec/prophecy-phpunit:^2' 'weitzman/drupal-test-traits:^2' - ddev config --project-name=${PROJNAME} --php-version=8.1 --web-environment-add SYMFONY_DEPRECATIONS_HELPER=disabled + composer -n require 'drupal/core-dev:^11' 'drush/drush:^13' 'weitzman/drupal-test-traits:^2' + ddev config --project-name=${PROJNAME} --php-version=8.3 --web-environment-add SYMFONY_DEPRECATIONS_HELPER=disabled ddev start -y >/dev/null } From 817eba48a2629e16032660c39cdfd955e8d76633 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 21 Mar 2025 13:56:46 -0400 Subject: [PATCH 3/4] Remove -v option to phpunit. Add a composer.json --- composer.json | 34 ++++++++++++++++++++++++++++++++++ tests/test.bats | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..98eae1e --- /dev/null +++ b/composer.json @@ -0,0 +1,34 @@ +{ + "name": "ddev/ddev-selenium-standalone-chrome", + "conflict": { + "drupal/core": "< 11.1" + }, + "require-dev": { + "drupal/core-dev": "^11.1", + "drupal/core-composer-scaffold": "^11.1", + "drupal/core-recommended": "^11.1", + "composer/installers": "^2" + }, + "extra": { + "installer-paths": { + "web/core": ["type:drupal-core"], + "web/libraries/{$name}": ["type:drupal-library"], + "web/modules/unish/{$name}": ["drupal/devel"], + "web/themes/unish/{$name}": ["drupal/empty_theme"], + "web/modules/contrib/{$name}": ["type:drupal-module"], + "web/profiles/contrib/{$name}": ["type:drupal-profile"], + "web/themes/contrib/{$name}": ["type:drupal-theme"] + } + }, + "config": { + "allow-plugins": { + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "drupal/core-composer-scaffold": true, + "drupal/core-project-message": true, + "php-http/discovery": true, + "phpstan/extension-installer": true, + "tbachert/spi": true + } + } +} diff --git a/tests/test.bats b/tests/test.bats index 65b428a..c10186b 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -30,7 +30,7 @@ teardown() { ddev exec ls ddev exec "curl -v selenium-chrome:4444/wd/hub/status" echo "Run a FunctionalJavascript test." >&3 - ddev exec -d /var/www/html/web "../vendor/bin/phpunit -v -c ./core/phpunit.xml.dist ./core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php" + ddev exec -d /var/www/html/web "../vendor/bin/phpunit -c ./core/phpunit.xml.dist ./core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php" echo "Run a Nightwatch test." >&3 ddev exec -d /var/www/html/web/core yarn install ddev exec -d /var/www/html/web/core touch .env From 04dac5cfa8768c367615bd1a519fae0943af7240 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 21 Mar 2025 14:38:18 -0400 Subject: [PATCH 4/4] Remove unwanted composer installer cruft --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index 98eae1e..0aad016 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,6 @@ "installer-paths": { "web/core": ["type:drupal-core"], "web/libraries/{$name}": ["type:drupal-library"], - "web/modules/unish/{$name}": ["drupal/devel"], - "web/themes/unish/{$name}": ["drupal/empty_theme"], "web/modules/contrib/{$name}": ["type:drupal-module"], "web/profiles/contrib/{$name}": ["type:drupal-profile"], "web/themes/contrib/{$name}": ["type:drupal-theme"]