Skip to content

Continue #49 - use official images #58

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Continue #49 - use official images #58

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
18a55c2
Update docker-compose.selenium-chrome.yaml
bserem Jul 9, 2024
ba91c04
Bump Drupal core used in testing
weitzman Mar 21, 2025
817eba4
Remove -v option to phpunit. Add a composer.json
weitzman Mar 21, 2025
04dac5c
Remove unwanted composer installer cruft
weitzman Mar 21, 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
32 changes: 32 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"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/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
}
}
}
2 changes: 1 addition & 1 deletion docker-compose.selenium-chrome.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/test.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
Expand Down
Loading