Merge pull request #249 from UN-OCHA/tests/consistency

tests: adjust for consistency

.github/workflows/composer-update.yml

@@ -17,5 +17,4 @@ jobs:
         patch_branch: 'develop'
         patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
-        slack_channel_name: ${{ secrets.SLACK_CHANNEL }}
-        flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }}
+        slack_channel_name: ${{ vars.SLACK_CHANNEL }}

.github/workflows/run-tests.yml

@@ -197,7 +197,7 @@ jobs:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            ### Build output
+            ### Test run output
             #### Composer Validate `${{ steps.validate.outcome }}`
             #### PHP Lint `${{ steps.lint.outcome }}`
             #### Docker Build `${{ steps.build.outcome }}`
@@ -208,6 +208,27 @@ jobs:
             <details><summary>Software Versions</summary>
             <code>${{ steps.versions.outputs.stdout }}</code>
             </details>
+
+            <details><summary>Composer Validate</summary>
+            <code>${{ steps.validate.outputs.stdout }}</code>
+            <code>${{ steps.validate.outputs.stderr }}</code>
+            </details>
+
+            <details><summary>PHP Lint</summary>
+            <code>${{ steps.lint.outputs.stdout }}</code>
+            <code>${{ steps.lint.outputs.stderr }}</code>
+            </details>
+
+            <details><summary>PHPCS</summary>
+            <code>${{ steps.phpcs.outputs.stdout }}</code>
+            <code>${{ steps.phpcs.outputs.stderr }}</code>
+            </details>
+
+            <details><summary>Tests</summary>
+            <code>${{ steps.tests.outputs.stdout }}</code>
+            <code>${{ steps.tests.outputs.stderr }}</code>
+            </details>
+
             <details><summary>Drupal Logs</summary>
             <code>${{ steps.dblog.outputs.stdout }}</code>
             </details>
@@ -220,7 +241,7 @@ jobs:
         if: ${{ !env.ACT && success() }}
         uses: slackapi/[email protected]
         with:
-          channel-id: '${{ secrets.SLACK_CHANNEL }}'
+          channel-id: '${{ vars.SLACK_CHANNEL }}'
           payload: |
             {
               "text": "Tests passed for a pull request on ${{ github.repository }}",
@@ -247,7 +268,7 @@ jobs:
         if: ${{ !env.ACT && failure() }}
         uses: slackapi/[email protected]
         with:
-          channel-id: '${{ secrets.SLACK_CHANNEL }}'
+          channel-id: '${{ vars.SLACK_CHANNEL }}'
           payload: |
             {
               "text": "Tests failed for a pull request on ${{ github.repository }}",
@@ -275,6 +296,6 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker compose -f tests/docker-compose.yml down
+            docker compose -f tests/docker-compose.yml down --rmi local -v
         env:
           fail-fast: true

composer.json

@@ -63,6 +63,7 @@
         "drupal/coder": "^8.3",
         "drupal/config_filter": "^2.2",
         "drupal/devel": "^5.0",
+        "drupal/stage_file_proxy": "^2.1",
         "kint-php/kint": "^5",
         "mikey179/vfsstream": "^1.6",
         "phpcompatibility/php-compatibility": "^9.3",