Merge pull request #512 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Oct 11, 2023 · 057b7aa · 057b7aa
2 parents 03023dd + 9f96e8c
commit 057b7aa
Show file tree

Hide file tree

Showing 32 changed files with 5,398 additions and 458 deletions.
diff --git a/.env b/.env
@@ -9,20 +9,16 @@ PROJECT_NAME=strategia
 # OpenShift project name
 OC_PROJECT_NAME=hki-kanslia-strategia-talous-test
 
-STAGE_FILE_PROXY_ORIGIN="https://helfikaupunkijahallinto.blob.core.windows.net"
+STAGE_FILE_PROXY_ORIGIN=
 STAGE_FILE_PROXY_ORIGIN_DIR=
 
 # Local hostname
 DRUPAL_HOSTNAME=strategia.docker.so
 
 # Docker image
-DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.1
+DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2
 
-# Default source @alias where to sync database and files from
-DRUPAL_SYNC_SOURCE=main
+COMPOSE_PROFILES=queue
 
 # Public webroot
 DRUPAL_WEBROOT=public
-
-# Don't sync files
-DRUPAL_SYNC_FILES=no
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,11 +5,13 @@ on:
 name: CI
 env:
   SYMFONY_DEPRECATIONS_HELPER: disabled
+  SIMPLETEST_BASE_URL: http://app:8888
 jobs:
   tests:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
+      options: --hostname app
 
     services:
       db:
@@ -31,7 +33,7 @@ jobs:
         run: composer install --no-interaction
 
       - name: Scan security updates
-        run: drush pm:security
+        run: composer audit
 
       - name: Check that subtheme is not built with dev mode
         run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi
@@ -53,16 +55,13 @@ jobs:
 
       - name: Start services
         run: |
-          drush runserver $SIMPLETEST_BASE_URL > /dev/null 2>&1 &
-          chromedriver --port=4444 > /dev/null 2>&1 &
-          # Chromium browser is required to run 'functional-javascript' and
-          # 'existing-site-javascript' tests.
-          chromium-browser --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 &
+          drush runserver $SIMPLETEST_BASE_URL --dns > /dev/null 2>&1 &
 
           # Wait for drush server to start.
           for i in {1..5}; do RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done
 
       - name: Run PHPUnit tests
         run: |
           composer test-php public/modules/custom
-          [ -d "tests/" ] && composer test-php tests/ || echo "No DTT tests found. Ignoring..."
+          if [ -d "tests/" ]; then composer test-php tests/; else echo "No DTT tests found. Ignoring..."; fi
+
diff --git a/.github/workflows/test.yml.dist b/.github/workflows/test.yml.dist
diff --git a/azure-pipelines-master.yml.dist b/azure-pipelines-master.yml.dist
diff --git a/azure-pipelines-pull-request.yml.dist b/azure-pipelines-pull-request.yml.dist
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
diff --git a/azure-pipelines-release.yml.dist b/azure-pipelines-release.yml.dist
diff --git a/composer.json b/composer.json
@@ -30,7 +30,8 @@
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^9.1",
         "phpspec/prophecy-phpunit": "^2",
-        "phpunit/phpunit": "^9.6"
+        "phpunit/phpunit": "^9.6",
+        "weitzman/drupal-test-traits": "^2.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -44,6 +45,9 @@
             "cweagans/composer-patches": true,
             "drupal/core-composer-scaffold": true,
             "php-http/discovery": false
+        },
+        "audit": {
+            "abandoned": "report"
         }
     },
     "extra": {