Skip to content

Commit

Permalink
EWPP-2016: Change delimiter for department field for full display.
Browse files Browse the repository at this point in the history
  • Loading branch information
sergepavle authored and upchuk committed Apr 6, 2022
1 parent 8ea0f97 commit 53ca49f
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* @see ./core/themes/stable/templates/field/field.html.twig
*/
#}
{% for item in items %}{{ item.content }}{% if not loop.last %} | {% endif %}{% endfor %}
{%- include 'field--multiple-values--comma-separated.html.twig' -%}
2 changes: 1 addition & 1 deletion tests/src/Functional/ContentCallForProposalsRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ public function testProposalRendering(): void {

$info_expected_values['items'][1] = [
'label' => 'Departments',
'body' => 'Audit Board of the European Communities | Associated African States and Madagascar',
'body' => 'Audit Board of the European Communities, Associated African States and Madagascar',
];
$field_list_assert->assertPattern($info_expected_values, $info_field_group->getHtml());

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/ContentCallForTendersRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public function testTenderRendering(): void {

$details_expected_values['items'][5] = [
'label' => 'Departments',
'body' => 'Audit Board of the European Communities | Associated African States and Madagascar',
'body' => 'Audit Board of the European Communities, Associated African States and Madagascar',
];
$field_list_assert->assertPattern($details_expected_values, $content_items[0]->getHtml());

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/ContentConsultationRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function testConsultationRendering(): void {
'body' => '28 February 2020, 01:00 (AEDT)',
], [
'label' => 'Departments',
'body' => 'Audit Board of the European Communities | Associated African States and Madagascar',
'body' => 'Audit Board of the European Communities, Associated African States and Madagascar',
],
];
$details_html = $content_items[0]->getHtml();
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/ContentNewsRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function testNewsRendering(): void {
$node->save();
$this->drupalGet($node->toUrl());
$details_expected_values['items'][3]['label'] = 'Departments';
$details_expected_values['items'][3]['body'] = 'Associated African States and Madagascar | Audit Board of the European Communities';
$details_expected_values['items'][3]['body'] = 'Associated African States and Madagascar, Audit Board of the European Communities';
$details_html = $details->getHtml();
$field_list_assert->assertPattern($details_expected_values, $details_html);

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/ContentPersonRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function testPersonRendering(): void {
'items' => [
[
'label' => 'Departments',
'body' => 'Audit Board of the European Communities | Arab Common Market',
'body' => 'Audit Board of the European Communities, Arab Common Market',
],
],
];
Expand Down
6 changes: 3 additions & 3 deletions tests/src/Functional/ContentPublicationRenderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public function testPublicationRendering(): void {

$details_expected_values['items'][2] = [
'label' => 'Related departments',
'body' => 'Audit Board of the European Communities | Associated African States and Madagascar',
'body' => 'Audit Board of the European Communities, Associated African States and Madagascar',
];
$field_list_assert->assertPattern($details_expected_values, $content_items[0]->getHtml());

Expand Down Expand Up @@ -435,7 +435,7 @@ public function testPublicationRendering(): void {
],
[
'label' => 'Related departments',
'body' => 'Audit Board of the European Communities | Associated African States and Madagascar',
'body' => 'Audit Board of the European Communities, Associated African States and Madagascar',
],
[
'label' => 'Countries',
Expand Down Expand Up @@ -481,7 +481,7 @@ public function testPublicationRendering(): void {
'label' => 'Part of collections',
'body' => 'Test Publication collection node 1 | ES Test Publication collection node 2',
];
$details_expected_values['items'][3]['body'] = 'Comisión de Control de las Comunidades Europeas | Estados africanos y malgache asociados';
$details_expected_values['items'][3]['body'] = 'Comisión de Control de las Comunidades Europeas, Estados africanos y malgache asociados';
$details_expected_values['items'][4]['body'] = 'Reino Unido, Francia';
$field_list_assert->assertPattern($details_expected_values, $content_items[0]->getHtml());

Expand Down

0 comments on commit 53ca49f

Please sign in to comment.