Merge branch 'develop' into release-versions/v3.4.10

UN-OCHA · Feb 5, 2024 · 96657d3 · 96657d3
2 parents 07896e6 + dbeea2b
commit 96657d3
Show file tree

Hide file tree

Showing 199 changed files with 3,360 additions and 6,453 deletions.
diff --git a/.github/tests/docker-compose.yml b/.github/tests/docker-compose.yml
@@ -58,6 +58,8 @@ services:
       - ENVIRONMENT=dev
       - NGINX_SERVERNAME=hpc-content-test-site,localhost,127.0.0.1
       - NGINX_OVERRIDE_PROTOCOL=HTTP,hpc-content-test-site,localhost,127.0.0.1
+      - NGINX_LIMIT_BOTS=2000r/m
+      - NGINX_LIMIT_HUMANS=2000r/s
       - DRUSH_OPTIONS_URI=http://hpc-content-test-site
       - DRUPAL_DB_DATABASE=hpc_content
       - DRUPAL_DB_USERNAME=hpc_content
@@ -71,6 +73,23 @@ services:
       - DTT_BASE_URL=http://127.0.0.1
       - SYMFONY_DEPRECATIONS_HELPER=disabled
     ports:
-    - "8081:80"
+      - "8081:80"
+    networks:
+      - default
+
+  browser:
+    hostname: hpc-content-test-browser
+    container_name: hpc-content-test-browser
+    # image: seleniarm/standalone-chromium:103.0
+    image: selenium/standalone-chrome:103.0
+    shm_size: 2gb
+    volumes:
+      # Workaround to avoid the browser crashing inside a docker container
+      # See https://github.com/SeleniumHQ/docker-selenium#quick-start
+      - /tmp:/dev/shm
+    environment:
+      - JAVA_OPTS=-Dwebdriver.chrome.whitelistedIps=
+    ports:
+      - "7900:7900"
     networks:
       - default
diff --git a/.github/tests/test.sh b/.github/tests/test.sh
@@ -34,7 +34,7 @@ docker-compose -f .github/tests/docker-compose.yml exec -T drupal mkdir -p /srv/
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/sites/simpletest/browser_output
 docker-compose -f .github/tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/simpletest/browser_output
-docker-compose -f .github/tests/docker-compose.yml exec -T -u appuser -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/tmp -e BROWSERTEST_OUTPUT_BASE_URL=http://127.0.0.1:8081 -e DTT_BASE_URL=http://127.0.0.1 -e SIMPLETEST_BASE_URL=http://127.0.0.1 -e SIMPLETEST_DB=mysql://hpc_content:hpc_content@mysql/hpc_content drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug -c /srv/www
+docker-compose -f .github/tests/docker-compose.yml exec -T -u appuser -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/tmp -e BROWSERTEST_OUTPUT_BASE_URL=http://hpc-content-test-site:8081 -e DTT_BASE_URL=http://hpc-content-test-site -e SIMPLETEST_BASE_URL=http://hpc-content-test-site -e SIMPLETEST_DB=mysql://hpc_content:hpc_content@mysql/hpc_content drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug -c /srv/www
 
 # Show logs.
 echo "Show logs."

diff --git a/compose.override.yaml b/compose.override.yaml
@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+###> symfony/mailer ###
+  mailer:
+    image: axllent/mailpit
+    ports:
+      - "1025"
+      - "8025"
+    environment:
+      MP_SMTP_AUTH_ACCEPT_ANY: 1
+      MP_SMTP_AUTH_ALLOW_INSECURE: 1
+###< symfony/mailer ###
diff --git a/composer.json b/composer.json
@@ -131,7 +131,8 @@
             "oomphinc/composer-installers-extender": true,
             "mglaman/composer-drupal-lenient": true,
             "phpstan/extension-installer": true,
-            "drupal-composer/preserve-paths": true
+            "drupal-composer/preserve-paths": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {