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.

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

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
10 changes: 5 additions & 5 deletions tests/test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading