Merge pull request #339 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Apr 11, 2024 · 0fb64a3 · 0fb64a3
2 parents 8048c1c + 96c4a7a
commit 0fb64a3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,10 @@ public/sites/simpletest/
 
 # Ignore the folder created by PhpStorm
 .idea/*
+
+# Ignore local settings
 public/sites/default/local.settings.php
+public/sites/default/local.services.yml
 
 *.sql
 *.env.local

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.platform.xml b/phpunit.platform.xml
@@ -11,7 +11,6 @@
   <ini name="error_reporting" value="32767"/>
     <!-- Do not limit the amount of memory tests take to run. -->
   <ini name="memory_limit" value="-1"/>
-  <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="public/sites/simpletest"/>
   <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--disable-gpu","--headless", "--no-sandbox"]}}, "http://127.0.0.1:4444"]' />
 </php>
 <testsuites>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,7 +15,6 @@
   <ini name="error_reporting" value="32767"/>
     <!-- Do not limit the amount of memory tests take to run. -->
   <ini name="memory_limit" value="-1"/>
-  <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="public/sites/simpletest"/>
   <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"w3c": false}}, "http://chromium:4444"]' />
   <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://chromium:4444"]'/>
   <env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />