Merge pull request #27 from palantirnet/drupal11

update to drupal 11

Author: agentrickard

.ddev/commands/host/solrtail.example

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ## #ddev-generated
 ## Description: Tail the main solr log

.ddev/commands/solr/solrtail.example

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ## #ddev-generated
 ## Description: Tail the main solr log

.ddev/commands/web/eslint

@@ -31,4 +31,5 @@ echo "Running eslint against: /web/modules/contrib/$1"
 echo "======================"
 # Change directory to the project root folder
 cd "$DDEV_DOCROOT/modules/contrib/$1" || exit
-"$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@"
+CONFIG="$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/.eslintrc.passing.json"
+"$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core/node_modules/.bin/eslint" -c $CONFIG --no-error-on-unmatched-pattern --ignore-pattern="*.es6.js" --resolve-plugins-relative-to=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/core --ext=.js,.yml . "$@"

.ddev/commands/web/install

@@ -4,11 +4,17 @@
 ## Usage: install
 ## Example: "ddev install"
 
-drush site:install standard --account-name=admin --account-pass=admin --site-name="Drupal 10" -y
-drush en admin_toolbar admin_toolbar_tools config_inspector devel
-
+drush site:install standard --account-name=admin --account-pass=admin --site-name="Drupal 11 Development" -y
+drush theme:enable gin
+drush en admin_toolbar admin_toolbar_tools config_inspector devel gin_toolbar
+drush config:set system.theme admin gin -y
+drush config:set gin.settings classic_toolbar horizontal -y
 # Install eslint dependencies
-yarn --cwd $DDEV_DOCROOT/core install
+# The "--cwd" argument doesn't work with Yarn 4.4, because the global version
+# is returned as 1.22.22 when Yarn starts, before switching directories.
+cd $DDEV_DOCROOT/core
+yarn install
+cd -
 # Configure prettier
 test -e .prettierrc.json || ln -s $DDEV_DOCROOT/core/.prettierrc.json .
 test -e .prettierignore || echo '*.yml' > .prettierignore

.ddev/commands/web/test

@@ -3,7 +3,7 @@
 ## Description: Run tests on a specific module.
 ## Usage: test MODULE_NAME {TEST_TYPE} {TEST CLASS}
 ## Example: "ddev test admin_toolbar"
-## Example: "ddev test admin_toolbar Functional AdminToolbarAdminMenuTest"
+## Example: "ddev test admin_toolbar AdminToolbarAdminMenuTest"
 
 if [ $# -eq 0 ]
 then
@@ -32,13 +32,14 @@ then
 fi
 
 CONFIG='/var/www/html/phpunit.xml'
+TEST_FILE=`find -type f -name $2.php`
 
-if [ ! -z $3 ] && [ -f "web/modules/contrib/$1/tests/src/$2/$3.php" ]
+if [ ! -z $2 ] && [ ! -z $TEST_FILE ]
 then
   echo "============="
-  echo "Running test: /web/modules/contrib/$1/$2/$3"
+  echo "Running test: $TEST_FILE"
   echo "============="
-  vendor/bin/phpunit -c "$CONFIG" --testdox "web/modules/contrib/$1/tests/src/$2/$3.php"
+  vendor/bin/phpunit -c "$CONFIG" --testdox "$TEST_FILE"
 else
   echo "======================"
   echo "Running tests against: /web/modules/contrib/$1"

.ddev/commands/web/testb

@@ -3,7 +3,7 @@
 ## Description: Run tests on a specific module.
 ## Usage: testb MODULE_NAME {TEST_TYPE} {TEST CLASS}
 ## Example: "ddev testb admin_toolbar"
-## Example: "ddev testb admin_toolbar Functional AdminToolbarAdminMenuTest"
+## Example: "ddev testb admin_toolbar AdminToolbarAdminMenuTest"
 
 if [ $# -eq 0 ]
 then
@@ -32,13 +32,14 @@ then
 fi
 
 CONFIG='/var/www/html/phpunit.xml'
+TEST_FILE=`find -type f -name $2.php`
 
-if [ ! -z $3 ] && [ -f "web/modules/contrib/$1/tests/src/$2/$3.php" ]
+if [ ! -z $2 ] && [ ! -z $TEST_FILE ]
 then
   echo "============="
-  echo "Running test: /web/modules/contrib/$1/$2/$3"
+  echo "Running test: $TEST_FILE"
   echo "============="
-  vendor/bin/phpunit -c "$CONFIG" "web/modules/contrib/$1/tests/src/$2/$3.php"
+  vendor/bin/phpunit -c "$CONFIG" "$TEST_FILE"
 else
   echo "======================"
   echo "Running tests against: /web/modules/contrib/$1"

.ddev/config.selenium-standalone-chrome.yaml

@@ -12,7 +12,7 @@ web_environment:
   # Use disable-dev-shm-usage instead of setting shm_usage
   # https://developers.google.com/web/tools/puppeteer/troubleshooting#tips
   # The format of chromeOptions is defined at https://chromedriver.chromium.org/capabilities
-  - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
+  - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\", \"--no-sandbox\", \"--disable-dev-shm-usage\", \"--unsafely-treat-insecure-origin-as-secure=http://web\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
   # Nightwatch
   - DRUPAL_TEST_BASE_URL=http://web
   - DRUPAL_TEST_DB_URL=mysql://db:db@db/db
@@ -26,4 +26,4 @@ web_environment:
   - DRUPAL_NIGHTWATCH_OUTPUT=reports/nightwatch
   # DTT
   - DTT_BASE_URL=http://web
-  - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
+  - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\", \"--no-sandbox\", \"--disable-dev-shm-usage\", \"--unsafely-treat-insecure-origin-as-secure=http://web\"]}}, \"http://selenium-chrome:4444/wd/hub\"]