Skip to content

Commit 811b181

Browse files
khalimakhalima
authored
Merge pull request #669 from City-of-Helsinki/UHF-12179
UHF-12179: Latest changes to main
2 parents 5d2fca7 + 1d54e56 commit 811b181

7 files changed

Lines changed: 357 additions & 348 deletions

File tree

‎.deprecation-ignore.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This file contains patterns to be ignored while testing for use of
2+
# deprecated code.
3+
# See https://www.drupal.org/node/3285162 for more details.

‎.platform/schema‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24
1+
25

‎composer.lock‎

Lines changed: 300 additions & 250 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎conf/cmi/csp.settings.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ enforce:
1717
flags:
1818
- report-sample
1919
- unsafe-inline
20-
- unsafe-eval
2120
- wasm-unsafe-eval
2221
style-src:
2322
base: self

‎conf/cmi/search_api.index.embeddings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ field_settings:
2222
type: string
2323
title:
2424
label: Title
25-
datasource_id: 'uuid_entity:node'
25+
datasource_id: 'entity:node'
2626
property_path: title
2727
type: string
2828
dependencies:

‎phpunit.platform.xml‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎phpunit.xml.dist‎

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,43 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="./public/core/tests/bootstrap.php" colors="true"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
bootstrap="./public/core/tests/bootstrap.php"
4+
colors="true"
35
beStrictAboutTestsThatDoNotTestAnything="true"
46
beStrictAboutOutputDuringTests="true"
57
beStrictAboutChangesToGlobalState="true"
6-
beStrictAboutCoversAnnotation="false"
78
failOnRisky="true"
89
failOnWarning="true"
9-
failOnSkipped="true"
10-
verbose="true"
11-
printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter"
12-
>
13-
<php>
14-
<!-- Set error reporting to E_ALL. -->
15-
<ini name="error_reporting" value="32767"/>
10+
displayDetailsOnTestsThatTriggerErrors="true"
11+
displayDetailsOnTestsThatTriggerWarnings="true"
12+
displayDetailsOnTestsThatTriggerDeprecations="true"
13+
cacheResult="false"
14+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
15+
cacheDirectory=".phpunit.cache">
16+
<php>
17+
<!-- Set error reporting to E_ALL. -->
18+
<ini name="error_reporting" value="32767"/>
1619
<!-- Do not limit the amount of memory tests take to run. -->
17-
<ini name="memory_limit" value="-1"/>
18-
<env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox", "--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]' />
19-
<env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]'/>
20-
<env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
21-
<env name="DTT_API_URL" value="http://chromium:9222"/>
22-
<env name="DTT_BASE_URL" value="https://app"/>
23-
</php>
24-
<testsuites>
20+
<ini name="memory_limit" value="-1"/>
21+
<env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox", "--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]' />
22+
<env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]'/>
23+
<env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
24+
<env name="DTT_API_URL" value="http://chromium:9222"/>
25+
<env name="DTT_BASE_URL" value="https://app"/>
26+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="ignoreFile=../.deprecation-ignore.txt" />
27+
</php>
28+
<extensions>
29+
<!-- Functional tests HTML output logging. -->
30+
<bootstrap class="Drupal\TestTools\Extension\HtmlLogging\HtmlOutputLogger">
31+
<!-- By default browser tests print the individual links in the test run
32+
report. To avoid overcrowding the output in CI environments, you can
33+
set the "verbose" parameter or the "BROWSERTEST_OUTPUT_VERBOSE"
34+
environment variable to "false". In GitLabCI, the output is saved
35+
anyway as an artifact that can be browsed or downloaded from Gitlab.
36+
-->
37+
<parameter name="verbose" value="true"/>
38+
</bootstrap>
39+
<bootstrap class="DG\BypassFinals\PHPUnitExtension"/>
40+
</extensions><testsuites>
2541
<testsuite name="unit">
2642
<directory>./public/modules/custom/*/tests/src/Unit</directory>
2743
<directory>./public/themes/custom/*/tests/src/Unit</directory>
@@ -45,31 +61,29 @@
4561
<testsuite name="existing-site">
4662
<directory>./tests/dtt/src/ExistingSite</directory>
4763
<directory>./public/modules/custom/*/tests/src/ExistingSite</directory>
48-
<directory>./public/modules/contrib/*/tests/src/ExistingSite</directory>
64+
<directory>./public/themes/custom/*/tests/src/ExistingSite</directory>
65+
<directory>./public/profiles/custom/*/tests/src/ExistingSite</directory>
4966
</testsuite>
5067
<testsuite name="existing-site-javascript">
5168
<directory>./tests/dtt/src/ExistingSiteJavascript</directory>
5269
<directory>./public/modules/custom/*/tests/src/ExistingSiteJavascript</directory>
53-
<directory>./public/modules/contrib/*/tests/src/ExistingSiteJavascript</directory>
70+
<directory>./public/themes/custom/*/tests/src/ExistingSiteJavascript</directory>
71+
<directory>./public/profiles/custom/*/tests/src/ExistingSiteJavascript</directory>
5472
</testsuite>
5573
</testsuites>
56-
<listeners>
57-
<listener class="\Drupal\Tests\Listeners\DrupalListener">
58-
</listener>
59-
</listeners>
60-
<coverage processUncoveredFiles="true">
61-
<include>
62-
<directory suffix=".php">./public/modules/custom/*/src</directory>
63-
<directory suffix=".php">./public/themes/custom/*/src</directory>
64-
<directory suffix=".php">./public/profiles/custom/*/src</directory>
65-
<file>./public/modules/custom/*/*.module</file>
66-
<file>./public/themes/custom/*/*.theme</file>
67-
<file>./public/profiles/custom/*/*.profile</file>
68-
</include>
69-
<exclude>
70-
<directory>./public/modules/custom/*/src/Tests</directory>
71-
<directory>./public/themes/custom/*/src/Tests</directory>
72-
<directory>./public/profiles/custom/*/src/Tests</directory>
73-
</exclude>
74-
</coverage>
74+
<source ignoreSuppressionOfDeprecations="true">
75+
<include>
76+
<directory suffix=".php">./public/modules/custom/*/src</directory>
77+
<directory suffix=".php">./public/themes/custom/*/src</directory>
78+
<directory suffix=".php">./public/profiles/custom/*/src</directory>
79+
<file>./public/modules/custom/*/*.module</file>
80+
<file>./public/themes/custom/*/*.theme</file>
81+
<file>./public/profiles/custom/*/*.profile</file>
82+
</include>
83+
<exclude>
84+
<directory>./public/modules/custom/*/src/Tests</directory>
85+
<directory>./public/themes/custom/*/src/Tests</directory>
86+
<directory>./public/profiles/custom/*/src/Tests</directory>
87+
</exclude>
88+
</source>
7589
</phpunit>

0 commit comments

Comments
 (0)