Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #712

Merged
merged 1 commit into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- telephone
- text
_core:
default_config_hash: gN3l4zK06RMpcSsvWP2mzlDDk2Rik_T-jtUHAHx07RM
default_config_hash: wdJwarmtiJ0vb01WKk2D0Ze8oSHKTf0ni1WKSnYpfvE
id: tpr_unit.tpr_unit.default
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -128,6 +128,22 @@ content:
third_party_settings: { }
weight: 23
region: content
latitude:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 24
region: content
longitude:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 23
region: content
name:
type: string
label: hidden
Expand Down Expand Up @@ -228,9 +244,7 @@ hidden:
field_unit_type: true
hide_description: true
langcode: true
latitude: true
links: true
longitude: true
other_info: true
price_info: true
search_api_excerpt: true
Expand Down
16 changes: 11 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
# DOCKERHOST: host.docker.internal
# Use drush server to run functional tests, so we don't have to care about
# permission or SSL issues.
SIMPLETEST_BASE_URL: "http://127.0.0.1:8888"
SIMPLETEST_BASE_URL: "http://app:8888"
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
Expand Down Expand Up @@ -120,16 +120,22 @@ services:
artemis:
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
image: quay.io/artemiscloud/activemq-artemis-broker
ports:
- "8161:8161"
- "61616:61616"
- "5672:5672"
environment:
AMQ_EXTRA_ARGS: "--nio --user admin --password admin"
depends_on:
- app
networks:
- internal
profiles:
- queue
chromium:
# @todo Update this to newer version once minkphp supports Selenium 4.
# @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
image: selenium/standalone-chrome:106.0
networks:
- internal
profiles:
- testing
networks:
internal:
external: false
Expand Down
22 changes: 13 additions & 9 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./public/core/tests/bootstrap.php" colors="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutChangesToGlobalState="true"
beStrictAboutCoversAnnotation="false"
printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutChangesToGlobalState="true"
beStrictAboutCoversAnnotation="false"
failOnRisky="true"
failOnWarning="true"
failOnSkipped="true"
verbose="true"
printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter"
>
<php>
<!-- Set error reporting to E_ALL. -->
<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"]' />
<env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://127.0.0.1:4444"]'/>
<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}' />
<env name="DTT_API_URL" value="http://127.0.0.1:9222"/>
<env name="DTT_BASE_URL" value="http://127.0.0.1:8888"/>
<env name="DTT_API_URL" value="http://chromium:9222"/>
<env name="DTT_BASE_URL" value="http://app:8888"/>
</php>
<testsuites>
<testsuite name="unit">
Expand Down
19 changes: 16 additions & 3 deletions public/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ function drupal_get_env(string|array $variables) : mixed {
}
$routes[] = 'http://127.0.0.1';

if ($simpletest_base_url = getenv('SIMPLETEST_BASE_URL')) {
$routes[] = $simpletest_base_url;
}

if ($drush_options_uri = getenv('DRUSH_OPTIONS_URI')) {
$routes[] = $drush_options_uri;
}
Expand Down Expand Up @@ -127,8 +131,14 @@ function drupal_get_env(string|array $variables) : mixed {
'driver' => 'helfi_azure',
'config' => [
'name' => $blob_storage_name,
'key' => getenv('AZURE_BLOB_STORAGE_KEY'),
'token' => getenv('AZURE_BLOB_STORAGE_SAS_TOKEN'),
'key' => drupal_get_env([
'AZURE_BLOB_STORAGE_KEY',
'BLOBSTORAGE_ACCOUNT_KEY',
]),
'token' => drupal_get_env([
'AZURE_BLOB_STORAGE_SAS_TOKEN',
'BLOBSTORAGE_SAS_TOKEN',
]),
'container' => getenv('AZURE_BLOB_STORAGE_CONTAINER'),
'endpointSuffix' => 'core.windows.net',
'protocol' => 'https',
Expand Down Expand Up @@ -230,7 +240,10 @@ function drupal_get_env(string|array $variables) : mixed {
$config['helfi_proxy.settings']['robots_header_enabled'] = (bool) $robots_header_enabled;
}

$artemis_destination = drupal_get_env(['ARTEMIS_DESTINATION', 'NON_EXISTENT_TEST']);
$artemis_destination = drupal_get_env([
'ARTEMIS_DESTINATION',
'PROJECT_NAME',
]);

if ($artemis_brokers = getenv('ARTEMIS_BROKERS') && $artemis_destination) {
$settings['stomp']['default'] = [
Expand Down