From 921d99b8107d9755badbc9e0c6a02b1589e25770 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 1d94216..081e154 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 8e7078cc1c58b6c2c82051827e01066e5a1e81f6 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 c8aea4f..441d096 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -33,11 +33,11 @@ setup() { 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' + composer -n require 'drupal/core-dev:^11' 'drush/drush:^13' 'weitzman/drupal-test-traits:^2' - run ddev config --project-name=${PROJNAME} --project-tld=ddev.site --php-version=8.1 --web-environment-add=SYMFONY_DEPRECATIONS_HELPER=disabled + run ddev config --project-name=${PROJNAME} --project-tld=ddev.site --php-version=8.3 --web-environment-add=SYMFONY_DEPRECATIONS_HELPER=disabled assert_success run ddev start -y assert_success From 8b653979cc777f92184ba137ec2b551f9dab4266 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 | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) 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 441d096..011931e 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -54,11 +54,11 @@ health_checks() { echo "Run a FunctionalJavascript test." >&3 - run ddev exec -d /var/www/html/web "../vendor/bin/phpunit -v -c ./core/phpunit.xml.dist ./core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php" + run ddev exec -d /var/www/html/web "../vendor/bin/phpunit -c ./core/phpunit.xml.dist ./core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php" assert_success echo "Ensure file uploads from browser works." >&3 - run ddev exec -d /var/www/html/web "../vendor/bin/phpunit -v -c ./core/phpunit.xml.dist ./core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php" + run ddev exec -d /var/www/html/web "../vendor/bin/phpunit -c ./core/phpunit.xml.dist ./core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php" assert_success echo "Run a Nightwatch test." >&3 From 3e7384a7057d93c8ac59835942cc8c5c3812a9e6 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"]