diff --git a/composer.json b/composer.json index 1ce48248e48bb2fa5f29ad63d7c232fed67199b6..95db85588fa745e5267ec85742f25577009d4cbd 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "php": ">=7.4", "cweagans/composer-patches": "^1.7", "drupal/core": "^9.2", + "drupal/daterange_compact": "^2.0", "drupal/twig_field_value": "^2.0", "openeuropa/composer-artifacts": "^1.0.0-alpha1", "openeuropa/oe_bootstrap_theme": "0.1.202206231430" diff --git a/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_only_short_month.yml b/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_only_short_month.yml new file mode 100644 index 0000000000000000000000000000000000000000..a3d7eb07cfc5331bf63119bb616d6fb6cbfd0268 --- /dev/null +++ b/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_only_short_month.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: { } +id: oe_whitelabel_date_only_short_month +label: 'Date only, short month' +default_pattern: 'j M Y' +default_separator: ' - ' +same_day_start_pattern: 'j M Y' +same_day_end_pattern: '' +same_day_separator: '' +same_month_start_pattern: '' +same_month_end_pattern: '' +same_month_separator: '' +same_year_start_pattern: '' +same_year_end_pattern: '' +same_year_separator: '' diff --git a/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_time_long.yml b/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_time_long.yml new file mode 100644 index 0000000000000000000000000000000000000000..4a1bc05f173f4db1efe2b4bf6bcc251d501c9164 --- /dev/null +++ b/modules/oe_whitelabel_helper/config/install/daterange_compact.format.oe_whitelabel_date_time_long.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: { } +id: oe_whitelabel_date_time_long +label: 'Date and time, long names' +default_pattern: 'l j F Y, H.i (T)' +default_separator: ' - ' +same_day_start_pattern: 'l j F Y, H.i' +same_day_end_pattern: 'H.i (T)' +same_day_separator: '-' +same_month_start_pattern: '' +same_month_end_pattern: '' +same_month_separator: '' +same_year_start_pattern: '' +same_year_end_pattern: '' +same_year_separator: '' diff --git a/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_only_short_month.yml b/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_only_short_month.yml new file mode 100644 index 0000000000000000000000000000000000000000..a3d7eb07cfc5331bf63119bb616d6fb6cbfd0268 --- /dev/null +++ b/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_only_short_month.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: { } +id: oe_whitelabel_date_only_short_month +label: 'Date only, short month' +default_pattern: 'j M Y' +default_separator: ' - ' +same_day_start_pattern: 'j M Y' +same_day_end_pattern: '' +same_day_separator: '' +same_month_start_pattern: '' +same_month_end_pattern: '' +same_month_separator: '' +same_year_start_pattern: '' +same_year_end_pattern: '' +same_year_separator: '' diff --git a/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_time_long.yml b/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_time_long.yml new file mode 100644 index 0000000000000000000000000000000000000000..4a1bc05f173f4db1efe2b4bf6bcc251d501c9164 --- /dev/null +++ b/modules/oe_whitelabel_helper/config/post_updates/00002_date_range_formats/daterange_compact.format.oe_whitelabel_date_time_long.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: { } +id: oe_whitelabel_date_time_long +label: 'Date and time, long names' +default_pattern: 'l j F Y, H.i (T)' +default_separator: ' - ' +same_day_start_pattern: 'l j F Y, H.i' +same_day_end_pattern: 'H.i (T)' +same_day_separator: '-' +same_month_start_pattern: '' +same_month_end_pattern: '' +same_month_separator: '' +same_year_start_pattern: '' +same_year_end_pattern: '' +same_year_separator: '' diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml index 210d21be2ad7fb4cdc8704053c6291c557a5acea..28581dbdfae273a2daf4903b8c8e4be0594ca6ae 100644 --- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml +++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml @@ -7,6 +7,7 @@ core_version_requirement: ^9.2 dependencies: - drupal:node - drupal:twig_field_value + - drupal:daterange_compact - oe_bootstrap_theme:oe_bootstrap_theme_helper - openeuropa:oe_corporate_blocks @@ -15,3 +16,5 @@ dependencies: config_devel: install: - core.entity_view_mode.node.oe_w_content_banner + - daterange_compact.format.oe_whitelabel_date_only_short_month + - daterange_compact.format.oe_whitelabel_date_time_long diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php index d82ac1650beefa35d6ce05d2717991f990bf6ec2..798912a96dac3e77a97da6a7f3aa20dd22c7064f 100644 --- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php +++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php @@ -19,3 +19,16 @@ function oe_whitelabel_helper_post_update_00001(): void { ]; ConfigImporter::importMultiple('module', 'oe_whitelabel_helper', '/config/post_updates/00001_content_banner', $configs, TRUE); } + +/** + * Create date range formats. + */ +function oe_whitelabel_helper_post_update_00002(): void { + \Drupal::service('module_installer')->install(['daterange_compact']); + + $configs = [ + 'daterange_compact.format.oe_whitelabel_date_only_short_month', + 'daterange_compact.format.oe_whitelabel_date_time_long', + ]; + ConfigImporter::importMultiple('module', 'oe_whitelabel_helper', '/config/post_updates/00002_date_range_formats', $configs, TRUE); +} diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/AbstractKernelTestBase.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/AbstractKernelTestBase.php index 437d1e649702dadc2a576cfd1ed7d2e3ae9c0706..cfdbd3761acc6870bcce6e015b8dcd9f865df4b7 100644 --- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/AbstractKernelTestBase.php +++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/AbstractKernelTestBase.php @@ -21,6 +21,7 @@ abstract class AbstractKernelTestBase extends KernelTestBase { */ protected static $modules = [ 'breakpoint', + 'daterange_compact', 'image', 'oe_bootstrap_theme_helper', 'oe_whitelabel_helper', diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml index 6ad2e19b4a71f0579a0b35ac5cb7087f03a1879c..ebe638c0dfdb14b307dbf6e6cac01a8ffdf76560 100755 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml @@ -11,7 +11,7 @@ dependencies: - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: - - datetime_range + - daterange_compact - oe_whitelabel_helper - text - user @@ -42,12 +42,10 @@ content: weight: 3 region: content oe_sc_event_dates: - type: daterange_default + type: daterange_compact label: inline settings: - timezone_override: '' - format_type: oe_whitelabel_starter_event_date - separator: to + daterange_compact_format: oe_whitelabel_date_time_long third_party_settings: { } weight: 1 region: content @@ -67,3 +65,4 @@ hidden: oe_content_short_title: true oe_featured_media: true oe_summary: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml index 6233984402ee68232bd4f5d50236783222a39d79..22910d1f2e64e793e4845856abd0c41de9dd3a82 100755 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml @@ -12,7 +12,7 @@ dependencies: - node.type.oe_sc_event module: - address - - datetime_range + - daterange_compact - text - user id: node.oe_sc_event.teaser @@ -21,12 +21,10 @@ bundle: oe_sc_event mode: teaser content: oe_sc_event_dates: - type: daterange_default + type: daterange_compact label: hidden settings: - timezone_override: '' - format_type: oe_whitelabel_starter_event_date - separator: to + daterange_compact_format: oe_whitelabel_date_only_short_month third_party_settings: { } weight: 4 region: content @@ -54,3 +52,4 @@ hidden: oe_content_short_title: true oe_documents: true oe_featured_media: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.full.yml new file mode 100755 index 0000000000000000000000000000000000000000..ebe638c0dfdb14b307dbf6e6cac01a8ffdf76560 --- /dev/null +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.full.yml @@ -0,0 +1,68 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.full + - field.field.node.oe_sc_event.body + - field.field.node.oe_sc_event.oe_documents + - field.field.node.oe_sc_event.oe_featured_media + - field.field.node.oe_sc_event.oe_sc_event_dates + - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_summary + - node.type.oe_sc_event + module: + - daterange_compact + - oe_whitelabel_helper + - text + - user +id: node.oe_sc_event.full +targetEntityType: node +bundle: oe_sc_event +mode: full +content: + body: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 0 + region: content + links: + settings: { } + third_party_settings: { } + weight: 4 + region: content + oe_documents: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 3 + region: content + oe_sc_event_dates: + type: daterange_compact + label: inline + settings: + daterange_compact_format: oe_whitelabel_date_time_long + third_party_settings: { } + weight: 1 + region: content + oe_sc_event_location: + type: oe_whitelabel_helper_address_inline + label: inline + settings: + delimiter: ', ' + third_party_settings: { } + weight: 2 + region: content +hidden: + langcode: true + oe_content_content_owner: true + oe_content_legacy_link: true + oe_content_navigation_title: true + oe_content_short_title: true + oe_featured_media: true + oe_summary: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.teaser.yml new file mode 100755 index 0000000000000000000000000000000000000000..22910d1f2e64e793e4845856abd0c41de9dd3a82 --- /dev/null +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_event_date_show_time/core.entity_view_display.node.oe_sc_event.teaser.yml @@ -0,0 +1,55 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.teaser + - field.field.node.oe_sc_event.body + - field.field.node.oe_sc_event.oe_documents + - field.field.node.oe_sc_event.oe_featured_media + - field.field.node.oe_sc_event.oe_sc_event_dates + - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_summary + - node.type.oe_sc_event + module: + - address + - daterange_compact + - text + - user +id: node.oe_sc_event.teaser +targetEntityType: node +bundle: oe_sc_event +mode: teaser +content: + oe_sc_event_dates: + type: daterange_compact + label: hidden + settings: + daterange_compact_format: oe_whitelabel_date_only_short_month + third_party_settings: { } + weight: 4 + region: content + oe_sc_event_location: + type: address_default + label: hidden + settings: { } + third_party_settings: { } + weight: 5 + region: content + oe_summary: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content +hidden: + body: true + langcode: true + links: true + oe_content_content_owner: true + oe_content_legacy_link: true + oe_content_navigation_title: true + oe_content_short_title: true + oe_documents: true + oe_featured_media: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php index fe1ab7d35472c1a327d9a702aa1496abf3880923..817165f1399380bd5b08ab557d513dcb4e96636a 100644 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php @@ -20,3 +20,14 @@ function oe_whitelabel_starter_event_post_update_00001(): void { ]; ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_event', '/config/post_updates/00001_content_banner', $configs, TRUE); } + +/** + * Add time to event dates. + */ +function oe_whitelabel_starter_event_post_update_00002(): void { + $configs = [ + 'core.entity_view_display.node.oe_sc_event.full', + 'core.entity_view_display.node.oe_sc_event.teaser', + ]; + ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_event', '/config/post_updates/00002_event_date_show_time', $configs); +} diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php index 4160c7349de9fa7bf04c0b2264fe92a9bd858ca6..68c3cf55151e648424704801fca7fc8a89d57026 100644 --- a/tests/src/Functional/ContentEventRenderTest.php +++ b/tests/src/Functional/ContentEventRenderTest.php @@ -22,72 +22,22 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'block', 'oe_whitelabel_starter_event', ]; /** - * Creates an example event node. - * - * @return \Drupal\node\NodeInterface - * Event node. + * {@inheritdoc} */ - protected function createExampleEvent(): NodeInterface { - // Create a sample media entity to be embedded. - File::create([ - 'uri' => $this->getTestFiles('image')[0]->uri, - ])->save(); - $media_image = Media::create([ - 'bundle' => 'image', - 'name' => 'Starter Image test', - 'oe_media_image' => [ - [ - 'target_id' => 1, - 'alt' => 'Starter Image test alt', - 'title' => 'Starter Image test title', - ], - ], - ]); - $media_image->save(); - - // Create a sample document media entity to be embedded. - File::create([ - 'uri' => $this->getTestFiles('text')[0]->uri, - ])->save(); - $media_document = Media::create([ - 'bundle' => 'document', - 'name' => 'Event document test', - 'oe_media_file_type' => 'local', - 'oe_media_file' => [ - [ - 'target_id' => 2, - 'alt' => 'Event document alt', - 'title' => 'Event document title', - ], - ], - ]); - $media_document->save(); - - /** @var \Drupal\node\Entity\Node $node */ - $node = \Drupal::entityTypeManager() - ->getStorage('node') - ->create([ - 'type' => 'oe_sc_event', - 'title' => 'Test event node', - 'oe_summary' => 'https://www.example.org is a web page', - 'body' => 'Event body', - 'oe_sc_event_dates' => [ - 'value' => '2022-02-09T20:00:00', - 'end_value' => '2022-02-09T22:00:00', - ], - 'uid' => 1, - 'status' => 1, - ]); - $node->set('oe_documents', [$media_document]); - $node->set('oe_featured_media', [$media_image]); - $node->save(); - return $node; + protected function setUp() { + parent::setUp(); + + // Set an explicit site timezone. + $this->config('system.date') + ->set('timezone.user.configurable', 0) + ->set('timezone.default', 'CET') + ->save(); } /** @@ -130,6 +80,24 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { trim($content_banner->filter('.oe-sc-event__oe-summary')->text()) ); + $date = $crawler->filter('dl > dd'); + + // Assert event dates starting and ending same day. + $this->assertEquals('Wednesday 9 February 2022, 21.00-23.00 (CET)', trim($date->text())); + + // Assert event dates starting and ending at different days. + $node->set('oe_sc_event_dates', [ + 'value' => '2022-02-07T08:00:00', + 'end_value' => '2022-02-22T18:00:00', + ]); + $node->save(); + + $this->drupalGet($node->toUrl()); + $crawler = $client->getCrawler(); + + $date = $crawler->filter('dl > dd'); + $this->assertEquals('Monday 7 February 2022, 09.00 (CET) - Tuesday 22 February 2022, 19.00 (CET)', trim($date->text())); + // Assert in-page navigation title. $this->assertEquals( 'Page content', @@ -189,6 +157,88 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { 'image-test.png', trim($image->attr('src')) ); + + $time = $crawler->filter('div > span.text-muted'); + $this->assertEquals('9 Feb 2022', trim($time->text())); + + // Assert event dates starting and ending at different days. + $node->set('oe_sc_event_dates', [ + 'value' => '2022-02-07T08:00:00', + 'end_value' => '2022-02-22T18:00:00', + ]); + $node->save(); + + $builder = \Drupal::entityTypeManager()->getViewBuilder('node'); + $build = $builder->view($node, 'teaser'); + $render = $this->container->get('renderer')->renderRoot($build); + $crawler = new Crawler((string) $render); + $this->drupalGet($node->toUrl()); + + $time = $crawler->filter('div > span.text-muted'); + $this->assertEquals('7 Feb 2022 - 22 Feb 2022', trim($time->text())); + } + + /** + * Creates an example event node. + * + * @return \Drupal\node\NodeInterface + * Event node. + */ + protected function createExampleEvent(): NodeInterface { + // Create a sample media entity to be embedded. + File::create([ + 'uri' => $this->getTestFiles('image')[0]->uri, + ])->save(); + $media_image = Media::create([ + 'bundle' => 'image', + 'name' => 'Starter Image test', + 'oe_media_image' => [ + [ + 'target_id' => 1, + 'alt' => 'Starter Image test alt', + 'title' => 'Starter Image test title', + ], + ], + ]); + $media_image->save(); + + // Create a sample document media entity to be embedded. + File::create([ + 'uri' => $this->getTestFiles('text')[0]->uri, + ])->save(); + $media_document = Media::create([ + 'bundle' => 'document', + 'name' => 'Event document test', + 'oe_media_file_type' => 'local', + 'oe_media_file' => [ + [ + 'target_id' => 2, + 'alt' => 'Event document alt', + 'title' => 'Event document title', + ], + ], + ]); + $media_document->save(); + + /** @var \Drupal\node\Entity\Node $node */ + $node = \Drupal::entityTypeManager() + ->getStorage('node') + ->create([ + 'type' => 'oe_sc_event', + 'title' => 'Test event node', + 'oe_summary' => 'https://www.example.org is a web page', + 'body' => 'Event body', + 'oe_sc_event_dates' => [ + 'value' => '2022-02-09T20:00:00', + 'end_value' => '2022-02-09T22:00:00', + ], + 'uid' => 1, + 'status' => 1, + ]); + $node->set('oe_documents', [$media_document]); + $node->set('oe_featured_media', [$media_image]); + $node->save(); + return $node; } } diff --git a/tests/src/FunctionalJavascript/ContentProjectRenderTest.php b/tests/src/FunctionalJavascript/ContentProjectRenderTest.php index 7e429f8d43ceb564f43959264bb201a11fdc5620..402bc469f68ea7c0e1a9acb1845ec3b3ae934e58 100644 --- a/tests/src/FunctionalJavascript/ContentProjectRenderTest.php +++ b/tests/src/FunctionalJavascript/ContentProjectRenderTest.php @@ -174,6 +174,7 @@ class ContentProjectRenderTest extends WebDriverTestBase { // Select the content column next to the in-page navigation. $project_content = $assert_session->elementExists('css', '.col-md-9'); + $this->assertProjectDates('10 May 2020', '15 May 2025'); $this->assertProjectStatusTimestampsAsDateStrings('2020-05-10 00:00:00', '2025-05-16 00:00:00'); $this->assertProjectStatusVisible(); @@ -253,6 +254,7 @@ class ContentProjectRenderTest extends WebDriverTestBase { $node->save(); $this->drupalGet($node->toUrl()); + $this->assertProjectDates('07 March 2019', '21 March 2019'); $this->assertProjectStatusTimestampsAsDateStrings('2019-03-07 00:00:00', '2019-03-22 00:00:00'); $this->assertProjectStatusVisible(); $this->assertProjectStatus('bg-dark', 'Closed'); @@ -415,4 +417,20 @@ class ContentProjectRenderTest extends WebDriverTestBase { } } + /** + * Assert the rendered dates in the project status area. + * + * @param string $expected_start_date + * The expected start date string. + * @param string $expected_end_date + * The expected end date string. + */ + protected function assertProjectDates(string $expected_start_date, string $expected_end_date): void { + $wrapper = $this->assertSession()->elementExists('css', '.bcl-project-status'); + $start_element = $this->assertSession()->elementExists('xpath', '//p[contains(text(), "Start")]//time', $wrapper); + $this->assertEquals($expected_start_date, trim($start_element->getText())); + $end_element = $this->assertSession()->elementExists('xpath', '//p[contains(text(), "End")]//time', $wrapper); + $this->assertEquals($expected_end_date, trim($end_element->getText())); + } + } diff --git a/tests/src/Kernel/AbstractKernelTestBase.php b/tests/src/Kernel/AbstractKernelTestBase.php index 25b39ba842e0c5d51e557d01050f3ba7c5b5e3b2..c994765e3cfe92818e99ef36a7667ea9a31dff61 100644 --- a/tests/src/Kernel/AbstractKernelTestBase.php +++ b/tests/src/Kernel/AbstractKernelTestBase.php @@ -5,19 +5,17 @@ declare(strict_types = 1); namespace Drupal\Tests\oe_whitelabel\Kernel; use Drupal\Tests\oe_bootstrap_theme\Kernel\AbstractKernelTestBase as BootstrapKernelTestBase; -use Drupal\Tests\oe_bootstrap_theme\Kernel\Traits\RenderTrait; /** * Base class for theme's kernel tests. */ abstract class AbstractKernelTestBase extends BootstrapKernelTestBase { - use RenderTrait; - /** * {@inheritdoc} */ protected static $modules = [ + 'daterange_compact', 'oe_whitelabel_helper', ]; diff --git a/tests/src/Kernel/ContentLanguageSwitcherTest.php b/tests/src/Kernel/ContentLanguageSwitcherTest.php index 49c72b792642ca7b70fc5614f2d389164e03b4f5..797bdaac951a7741366c4a45a9869c36e3771b2c 100644 --- a/tests/src/Kernel/ContentLanguageSwitcherTest.php +++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php @@ -17,9 +17,10 @@ class ContentLanguageSwitcherTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'block', 'content_translation', + 'daterange_compact', 'language', 'locale', 'node',