From 9f2afb066c28f17927b28c83bd822226baf00b01 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 19 May 2022 19:19:08 +0200
Subject: [PATCH 01/15] OEL-1618: Upgrade BCL to 0.23.0.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index e0726563..71a8ea36 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "1.0.0-beta2"
+ "openeuropa/oe_bootstrap_theme": "0.1618.202205191818"
},
"require-dev": {
"composer/installers": "^1.11",
--
GitLab
From 2240772d090271f6e238a5af740e9658c4409d7f Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 20 May 2022 14:26:23 +0200
Subject: [PATCH 02/15] OEL-1618: Fix heading changes tests.
---
.../src/Kernel/Paragraphs/ContentRowTest.php | 10 +++----
.../Kernel/Paragraphs/FactsFiguresTest.php | 30 +++++++++----------
.../Paragraphs/ListingParagraphsTest.php | 4 +--
.../PatternAssertions/ListingAssertion.php | 6 ++--
.../src/Functional/ContentEventRenderTest.php | 2 +-
tests/src/Kernel/FacetsFormTest.php | 2 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
index bbd451ed..79daf6dd 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
@@ -147,8 +147,8 @@ class ContentRowTest extends ParagraphsTestBase {
$left = $crawler->filter('div.col-md-3.d-none.d-md-block');
$nav = $left->filter('nav.bcl-inpage-navigation');
$this->assertCount(1, $nav);
- $h5 = $nav->filter('h5');
- $this->assertSame('Page content', $h5->text());
+ $h3 = $nav->filter('h3');
+ $this->assertSame('Page content', $h3->text());
$ul = $left->filter('ul.nav.nav-pills.flex-column');
$this->assertCount(1, $ul);
$links = $ul->filter('li.nav-item a.nav-link');
@@ -161,15 +161,15 @@ class ContentRowTest extends ParagraphsTestBase {
$this->assertCount(1, $content);
$rich_text_title = $content->filter('h4.fw-bold.mb-4');
$this->assertSame('Title rich text test 1', trim($rich_text_title->text()));
- $links_block_title = $content->filter('h2.fw-bold.pb-3.mb-3.border-bottom');
+ $links_block_title = $content->filter('h2.bcl-heading');
$this->assertSame('Links block test', $links_block_title->text());
$facts_figures = $content->filter('div.bcl-fact-figures--default');
- $this->assertStringContainsString('Facts and Figures test', $facts_figures->filter('h2.fw-bold')->text());
+ $this->assertStringContainsString('Facts and Figures test', $facts_figures->filter('h2.bcl-heading')->text());
$blockquote_blockquote = $content->filter('blockquote.blockquote');
$this->assertStringContainsString('Maecenas id urna eleifend', $blockquote_blockquote->text());
$blockquote_footer = $content->filter('figcaption.blockquote-footer');
$this->assertSame('Quote 1', trim($blockquote_footer->text()));
- $social_media_title = $content->filter('h2.fw-bold.pb-3.mb-3.border-bottom')->eq(1);
+ $social_media_title = $content->filter('h2.bcl-heading')->eq(2);
$this->assertStringContainsString('Social media block', $social_media_title->text());
$accordion_items = $content->filter('.accordion-item');
$this->assertStringContainsString('Accordion item 1', $accordion_items->eq(0)->text());
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/FactsFiguresTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/FactsFiguresTest.php
index 23633bad..49daf942 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/FactsFiguresTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/FactsFiguresTest.php
@@ -80,11 +80,11 @@ class FactsFiguresTest extends ParagraphsTestBase {
$crawler = new Crawler($html);
$this->assertCount(1, $crawler->filter('div.bcl-fact-figures.bcl-fact-figures--default'));
- $this->assertCount(1, $crawler->filter('h2.fw-bold'));
+ $this->assertCount(1, $crawler->filter('h2.bcl-heading'));
$this->assertCount(1, $crawler->filter('div.row-cols-md-3.row'));
$this->assertCount(6, $crawler->filter('svg.bi.icon--l'));
- $this->assertCount(6, $crawler->filter('h4.fw-bold'));
- $this->assertCount(6, $crawler->filter('h5.fw-bold'));
+ $this->assertCount(6, $crawler->filter('div.fs-3'));
+ $this->assertCount(6, $crawler->filter('div.fs-5'));
$this->assertCount(6, $crawler->filter('div.col'));
$link = $crawler->filter('a[href="https://www.readmore.com"]');
@@ -93,12 +93,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$link->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(1) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(1) > div.fs-3');
$this->assertStringContainsString(
'1529 JIRA Ticket',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(1) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(1) > div.fs-5');
$this->assertStringContainsString(
'Jira Tickets',
$subtitle_fact->html()
@@ -109,12 +109,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$description_fact->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(2) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(2) > div.fs-3');
$this->assertStringContainsString(
'337 Features',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(2) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(2) > div.fs-5');
$this->assertStringContainsString(
'Feature tickets',
$subtitle_fact->html()
@@ -125,12 +125,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$description_fact->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(3) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(3) > div.fs-3');
$this->assertStringContainsString(
'107 Tests',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(3) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(3) > div.fs-5');
$this->assertStringContainsString(
'Test tickets',
$subtitle_fact->html()
@@ -141,12 +141,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$description_fact->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(4) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(4) > div.fs-3');
$this->assertStringContainsString(
'5670 Variants',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(4) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(4) > div.fs-5');
$this->assertStringContainsString(
'Test variants',
$subtitle_fact->html()
@@ -157,12 +157,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$description_fact->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(5) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(5) > div.fs-3');
$this->assertStringContainsString(
'345 Dev Ticket',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(5) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(5) > div.fs-5');
$this->assertStringContainsString(
'Jira ticket',
$subtitle_fact->html()
@@ -173,12 +173,12 @@ class FactsFiguresTest extends ParagraphsTestBase {
$description_fact->html()
);
- $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(6) > h4.text-capitalize.fw-bold');
+ $title_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(6) > div.fs-3');
$this->assertStringContainsString(
'43 Components',
$title_fact->html()
);
- $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(6) > h5.fw-bold');
+ $subtitle_fact = $crawler->filter('div.row-cols-md-3.row > div.col:nth-child(6) > div.fs-5');
$this->assertStringContainsString(
'Figma components',
$subtitle_fact->html()
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ListingParagraphsTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ListingParagraphsTest.php
index 2fe6ab37..f0e29187 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ListingParagraphsTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ListingParagraphsTest.php
@@ -132,7 +132,7 @@ class ListingParagraphsTest extends ParagraphsTestBase {
$assert->assertHighlightListingRendering($crawler, $image_file);
$this->assertCount(1, $crawler->filter('div.bcl-listing--highlight-2-col'));
$this->assertCount(1, $crawler->filter('div.row.row-cols-1.row-cols-md-2'));
- $this->assertCount(6, $crawler->filter('div.listing-item--highlight'));
+ $this->assertCount(6, $crawler->filter('article.listing-item--highlight'));
$this->assertCount(6, $crawler->filter('div.card-body'));
// Testing Highlight 3 col.
@@ -146,7 +146,7 @@ class ListingParagraphsTest extends ParagraphsTestBase {
$assert->assertHighlightListingRendering($crawler, $image_file);
$this->assertCount(1, $crawler->filter('div.bcl-listing--highlight-3-col'));
$this->assertCount(1, $crawler->filter('div.row.row-cols-1.row-cols-md-3'));
- $this->assertCount(6, $crawler->filter('div.listing-item--highlight'));
+ $this->assertCount(6, $crawler->filter('article.listing-item--highlight'));
$this->assertCount(6, $crawler->filter('div.card-body'));
}
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
index f032eb90..7837d99d 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
@@ -23,7 +23,7 @@ class ListingAssertion extends Assert {
* Image file added to the list item.
*/
public function assertDefaultListingRendering(Crawler $crawler, File $file): void {
- $this->assertCount(6, $crawler->filter('div.listing-item.border-bottom.border-md-0.border-0.card'));
+ $this->assertCount(6, $crawler->filter('article.listing-item.border-bottom.border-md-0.border-0.card'));
$this->assertCount(6, $crawler->filter('div.mw-listing-img'));
$this->assertCount(6, $crawler->filter('div.card-body.p-0.pb-md-0.pb-3'));
$text_element = $crawler->filter('div.card-text');
@@ -40,7 +40,7 @@ class ListingAssertion extends Assert {
* Image file added to the list item.
*/
public function assertHighlightListingRendering(Crawler $crawler, File $file): void {
- $this->assertCount(6, $crawler->filter('div.listing-item--highlight.border-0.bg-lighter.card'));
+ $this->assertCount(6, $crawler->filter('article.listing-item--highlight.border-0.bg-lighter.card'));
$text_element = $crawler->filter('div.card-text');
$this->assertCount(6, $text_element);
$this->assertImageRendering($crawler, $file);
@@ -57,7 +57,7 @@ class ListingAssertion extends Assert {
public function assertListingRendering(Crawler $crawler, int $nid): void {
$this->assertCount(1, $crawler->filter('div.bcl-listing'));
$this->assertCount(6, $crawler->filter('div.row-cols-1.g-4 > div.col'));
- $this->assertStringContainsString('Listing item block title', trim($crawler->filter('h2.fw-bold')->text()));
+ $this->assertStringContainsString('Listing item block title', trim($crawler->filter('h2.bcl-heading')->text()));
$this->assertCount(6, $crawler->filter('h5.card-title'));
$link_element = $crawler->filter('a.text-underline-hover');
$this->assertCount(6, $link_element);
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index 7f7d10b2..db62df16 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -133,7 +133,7 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
// Assert in-page navigation title.
$this->assertEquals(
'Page content',
- trim($crawler->filter('nav.bcl-inpage-navigation > h5')->text())
+ trim($crawler->filter('nav.bcl-inpage-navigation > h3')->text())
);
// Assert in-page navigation links.
diff --git a/tests/src/Kernel/FacetsFormTest.php b/tests/src/Kernel/FacetsFormTest.php
index 6b98be66..9ccfea9a 100644
--- a/tests/src/Kernel/FacetsFormTest.php
+++ b/tests/src/Kernel/FacetsFormTest.php
@@ -96,7 +96,7 @@ class FacetsFormTest extends KernelTestBase {
$offcanvas = $crawler->filter('div#bcl-offcanvas');
$header = $offcanvas->filter('div.offcanvas-header');
$this->assertCount(1, $header);
- $title = $header->filter('h4.offcanvas-title');
+ $title = $header->filter('h3.offcanvas-title');
$this->assertSame('Facets form', $title->text());
$button = $header->filter('button');
$this->assertSame('offcanvas', $button->attr('data-bs-dismiss'));
--
GitLab
From 39021216ccf07e5d5c1392bc3d4a26bfd50f9215 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 1 Jun 2022 18:34:34 +0200
Subject: [PATCH 03/15] OEL-1618: Update development release.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 71a8ea36..43eccf04 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1618.202205191818"
+ "openeuropa/oe_bootstrap_theme": "0.1618.202206011600"
},
"require-dev": {
"composer/installers": "^1.11",
--
GitLab
From 090da59c3f5737c20ed0957b9eac43f7efe45bf7 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 1 Jun 2022 18:35:11 +0200
Subject: [PATCH 04/15] OEL-1618: Remove duplicated article tag, now in BCL
component. Adapt heading to last changes and fix testing.
---
.../PatternAssertions/ListingAssertion.php | 4 ++--
.../node--oe-sc-event--teaser.html.twig | 21 +++++++++----------
.../node--oe-sc-news--teaser.html.twig | 21 +++++++++----------
.../src/Functional/ContentEventRenderTest.php | 7 +++++--
.../src/Functional/ContentNewsRenderTest.php | 11 ++++++----
5 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
index 7837d99d..5217906d 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/PatternAssertions/ListingAssertion.php
@@ -58,7 +58,7 @@ class ListingAssertion extends Assert {
$this->assertCount(1, $crawler->filter('div.bcl-listing'));
$this->assertCount(6, $crawler->filter('div.row-cols-1.g-4 > div.col'));
$this->assertStringContainsString('Listing item block title', trim($crawler->filter('h2.bcl-heading')->text()));
- $this->assertCount(6, $crawler->filter('h5.card-title'));
+ $this->assertCount(6, $crawler->filter('h1.card-title'));
$link_element = $crawler->filter('a.text-underline-hover');
$this->assertCount(6, $link_element);
$this->assertStringContainsString(
@@ -66,7 +66,7 @@ class ListingAssertion extends Assert {
$link_element->attr('href')
);
$text_element = $crawler->filter('div.card-text');
- $this->assertStringContainsString('Item title 1', trim($crawler->filter('h5.card-title > a.text-underline-hover')->text()));
+ $this->assertStringContainsString('Item title 1', trim($crawler->filter('h1.card-title > a.text-underline-hover')->text()));
$this->assertStringContainsString('Label 1 - 1', trim($crawler->filter('span.badge')->eq(0)->text()));
$this->assertStringContainsString('Label 2 - 1', trim($crawler->filter('span.badge')->eq(1)->text()));
$this->assertStringContainsString(
diff --git a/templates/content/node--oe-sc-event--teaser.html.twig b/templates/content/node--oe-sc-event--teaser.html.twig
index debd2d3e..cb24a700 100755
--- a/templates/content/node--oe-sc-event--teaser.html.twig
+++ b/templates/content/node--oe-sc-event--teaser.html.twig
@@ -8,15 +8,14 @@
<a class="standalone" href="{{ url }}">{{ label }}</a>
{% endset %}
{% block content %}
-<article{{attributes}}>
- {{ pattern('card', {
- variant: 'search',
- title: _title,
- text: content.oe_summary,
- image: image,
- meta: [
- content.oe_sc_event_dates|field_value,
- ],
- }) }}
-</article>
+{{ pattern('card', {
+ variant: 'search',
+ title: _title,
+ text: content.oe_summary,
+ image: image,
+ meta: [
+ content.oe_sc_event_dates|field_value,
+ ],
+ attributes: attributes,
+}) }}
{% endblock %}
diff --git a/templates/content/node--oe-sc-news--teaser.html.twig b/templates/content/node--oe-sc-news--teaser.html.twig
index 3556131a..9ba22fce 100644
--- a/templates/content/node--oe-sc-news--teaser.html.twig
+++ b/templates/content/node--oe-sc-news--teaser.html.twig
@@ -8,15 +8,14 @@
<a class="standalone" href="{{ url }}">{{ label }}</a>
{% endset %}
{% block content %}
-<article{{attributes}}>
- {{ pattern('card', {
- variant: 'search',
- title: _title,
- text: content.oe_summary,
- image: image,
- meta: [
- content.oe_publication_date|field_value
- ],
- }) }}
-</article>
+{{ pattern('card', {
+ variant: 'search',
+ title: _title,
+ text: content.oe_summary,
+ image: image,
+ meta: [
+ content.oe_publication_date|field_value
+ ],
+ attributes: attributes,
+}) }}
{% endblock %}
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index db62df16..4160c734 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -175,11 +175,14 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase {
$render = $this->container->get('renderer')->renderRoot($build);
$crawler = new Crawler((string) $render);
+ $article = $crawler->filter('article');
+ $this->assertCount(1, $article);
+
$this->assertEquals(
'Test event node',
- trim($crawler->filter('h5.card-title')->text())
+ trim($article->filter('h1.card-title')->text())
);
- $image = $crawler->filter('img');
+ $image = $article->filter('img');
$this->assertCount(1, $image);
$this->assertCount(1, $image->filter('.card-img-top'));
$this->assertStringContainsString(
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index ae0eef5d..56a2ba94 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -129,11 +129,14 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
$render = $this->container->get('renderer')->renderRoot($build);
$crawler = new Crawler((string) $render);
+ $article = $crawler->filter('article');
+ $this->assertCount(1, $article);
+
$this->assertEquals(
'Test news node',
- trim($crawler->filter('h5.card-title')->text())
+ trim($article->filter('h1.card-title')->text())
);
- $image = $crawler->filter('img');
+ $image = $article->filter('img');
$this->assertCount(1, $image);
$this->assertCount(1, $image->filter('.card-img-top'));
$this->assertStringContainsString(
@@ -142,11 +145,11 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
);
$this->assertEquals(
'https://www.example.org is a web page',
- trim($crawler->filter('div.card-text')->text())
+ trim($article->filter('div.card-text')->text())
);
$this->assertEquals(
'09 February 2022',
- trim($crawler->filter('div.card-body > div > span.text-muted')->text())
+ trim($article->filter('div.card-body > div > span.text-muted')->text())
);
}
--
GitLab
From 511faa67f0bb5b433eca7cb6853eb538f4714859 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 3 Jun 2022 12:37:12 +0200
Subject: [PATCH 05/15] OEL-1618: Removing fw-bold classes and add heading to
DescriptionList and ContentRow paragraphs.
---
.../tests/src/Kernel/Paragraphs/ContentRowTest.php | 6 +++---
.../tests/src/Kernel/Paragraphs/DescriptionListTest.php | 6 +++---
.../tests/src/Kernel/Paragraphs/RichTextTest.php | 2 +-
.../paragraphs/paragraph--oe-description-list.html.twig | 4 +++-
templates/paragraphs/paragraph--oe-rich-text.html.twig | 4 +++-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
index 79daf6dd..6c5734de 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php
@@ -159,9 +159,9 @@ class ContentRowTest extends ParagraphsTestBase {
// Assert the paragraphs where added into the right side column.
$content = $crawler->filter('div.col-md-9');
$this->assertCount(1, $content);
- $rich_text_title = $content->filter('h4.fw-bold.mb-4');
+ $rich_text_title = $content->filter('h2.bcl-heading')->eq(0);
$this->assertSame('Title rich text test 1', trim($rich_text_title->text()));
- $links_block_title = $content->filter('h2.bcl-heading');
+ $links_block_title = $content->filter('h2.bcl-heading')->eq(1);
$this->assertSame('Links block test', $links_block_title->text());
$facts_figures = $content->filter('div.bcl-fact-figures--default');
$this->assertStringContainsString('Facts and Figures test', $facts_figures->filter('h2.bcl-heading')->text());
@@ -169,7 +169,7 @@ class ContentRowTest extends ParagraphsTestBase {
$this->assertStringContainsString('Maecenas id urna eleifend', $blockquote_blockquote->text());
$blockquote_footer = $content->filter('figcaption.blockquote-footer');
$this->assertSame('Quote 1', trim($blockquote_footer->text()));
- $social_media_title = $content->filter('h2.bcl-heading')->eq(2);
+ $social_media_title = $content->filter('h2.bcl-heading')->eq(3);
$this->assertStringContainsString('Social media block', $social_media_title->text());
$accordion_items = $content->filter('.accordion-item');
$this->assertStringContainsString('Accordion item 1', $accordion_items->eq(0)->text());
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/DescriptionListTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/DescriptionListTest.php
index b1b1280a..162a3ed6 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/DescriptionListTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/DescriptionListTest.php
@@ -69,12 +69,12 @@ class DescriptionListTest extends ParagraphsTestBase {
$html = $this->renderParagraph($paragraph);
$crawler = new Crawler($html);
- $this->assertCount(1, $crawler->filter('h4'));
+ $this->assertCount(1, $crawler->filter('h2.bcl-heading'));
$this->assertCount(1, $crawler->filter('dl.d-md-grid.grid-3-9'));
$this->assertCount(2, $crawler->filter('dd'));
$this->assertCount(2, $crawler->filter('dt'));
- $title = $crawler->filter('h4.fw-bold.mb-4');
+ $title = $crawler->filter('h2.bcl-heading');
$this->assertEquals('Description list paragraph', $title->text());
$term_1 = $crawler->filter('dl > div:nth-child(1) > dt');
@@ -100,7 +100,7 @@ class DescriptionListTest extends ParagraphsTestBase {
$html = $this->renderParagraph($paragraph);
$crawler = new Crawler($html);
- $title = $crawler->filter('h4.fw-bold.mb-4');
+ $title = $crawler->filter('h2.bcl-heading');
$this->assertEquals('Description list paragraph', $title->text());
$term_1 = $crawler->filter('dl > dt:nth-child(1)');
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/RichTextTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/RichTextTest.php
index 609a5bb0..e195b7b4 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/RichTextTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/RichTextTest.php
@@ -45,7 +45,7 @@ class RichTextTest extends ParagraphsTestBase {
$html = $this->renderParagraph($paragraph);
$crawler = new Crawler($html);
- $title = $crawler->filter('h4');
+ $title = $crawler->filter('h2');
$this->assertCount(1, $title);
$this->assertStringContainsString(
'Rich text example',
diff --git a/templates/paragraphs/paragraph--oe-description-list.html.twig b/templates/paragraphs/paragraph--oe-description-list.html.twig
index a78c5d6e..d10b468d 100644
--- a/templates/paragraphs/paragraph--oe-description-list.html.twig
+++ b/templates/paragraphs/paragraph--oe-description-list.html.twig
@@ -8,7 +8,9 @@
#}
{% if title is not empty %}
- <h4 class="fw-bold mb-4">{{ title }}</h4>
+ {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+ title: title,
+ } only %}
{% endif %}
{{ pattern('description_list', {
diff --git a/templates/paragraphs/paragraph--oe-rich-text.html.twig b/templates/paragraphs/paragraph--oe-rich-text.html.twig
index 80246556..3547defa 100644
--- a/templates/paragraphs/paragraph--oe-rich-text.html.twig
+++ b/templates/paragraphs/paragraph--oe-rich-text.html.twig
@@ -6,5 +6,7 @@
* @see ./modules/contrib/paragraphs/templates/paragraph.html.twig
*/
#}
-<h4 class="fw-bold mb-4">{{ content.field_oe_title }}</h4>
+{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+ title: content.field_oe_title,
+} only %}
{{ content|without('field_oe_title') }}
--
GitLab
From a4c1ac7880fd20022d147588fab231b1d6b896cf Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 7 Jun 2022 13:09:37 +0200
Subject: [PATCH 06/15] OEL-1618: Add BCL headings instead custom.
---
.../field--node--body--oe-sc-event.html.twig | 25 +++++++++++--------
...-node--oe-documents--oe-sc-event.html.twig | 25 +++++++++++--------
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/templates/content/field--node--body--oe-sc-event.html.twig b/templates/content/field--node--body--oe-sc-event.html.twig
index 71643d71..463385ac 100644
--- a/templates/content/field--node--body--oe-sc-event.html.twig
+++ b/templates/content/field--node--body--oe-sc-event.html.twig
@@ -10,14 +10,6 @@
label_display == 'inline' ? 'd-flex',
]
%}
-{%
- set title_classes = [
- 'field__label',
- 'fw-bold',
- label_display == 'visually_hidden' ? 'visually-hidden',
-]
-%}
-
{% if label_hidden %}
{% if multiple %}
<div{{ attributes.addClass(classes) }}>
@@ -32,9 +24,20 @@
{% endif %}
{% else %}
<div{{ attributes.addClass(classes) }}>
- <h3{{ title_attributes.addClass(title_classes) }}>
- {{ label }}{% if label_display == 'inline' %}<span class="me-1">:</span>{% endif %}
- </h3>
+ {%- set _label -%}
+ {{- label -}}
+ {%- if label_display == 'inline' -%}
+ <span class="me-1">:</span>
+ {%- endif -%}
+ {%- endset -%}
+ {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+ title: _label,
+ title_tag: 'h3',
+ attributes: create_attribute().addClass([
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ])
+ } only %}
{% if multiple %}
<div class="field__items">
{% endif %}
diff --git a/templates/content/field--node--oe-documents--oe-sc-event.html.twig b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
index 71643d71..463385ac 100644
--- a/templates/content/field--node--oe-documents--oe-sc-event.html.twig
+++ b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
@@ -10,14 +10,6 @@
label_display == 'inline' ? 'd-flex',
]
%}
-{%
- set title_classes = [
- 'field__label',
- 'fw-bold',
- label_display == 'visually_hidden' ? 'visually-hidden',
-]
-%}
-
{% if label_hidden %}
{% if multiple %}
<div{{ attributes.addClass(classes) }}>
@@ -32,9 +24,20 @@
{% endif %}
{% else %}
<div{{ attributes.addClass(classes) }}>
- <h3{{ title_attributes.addClass(title_classes) }}>
- {{ label }}{% if label_display == 'inline' %}<span class="me-1">:</span>{% endif %}
- </h3>
+ {%- set _label -%}
+ {{- label -}}
+ {%- if label_display == 'inline' -%}
+ <span class="me-1">:</span>
+ {%- endif -%}
+ {%- endset -%}
+ {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+ title: _label,
+ title_tag: 'h3',
+ attributes: create_attribute().addClass([
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ])
+ } only %}
{% if multiple %}
<div class="field__items">
{% endif %}
--
GitLab
From 8fc00b5fdbd4ff1fccc924a56d17f6220332e182 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 7 Jun 2022 13:23:10 +0200
Subject: [PATCH 07/15] OEL-1618: Update bootstrap_theme with a new tmp
release.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 43eccf04..4986b77b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1618.202206011600"
+ "openeuropa/oe_bootstrap_theme": "0.1618.202206071320"
},
"require-dev": {
"composer/installers": "^1.11",
--
GitLab
From 350e5c144c634f6d1c5ce4bb27125cb72e529526 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 10 Jun 2022 09:46:01 +0200
Subject: [PATCH 08/15] OEL-1618: Update composer to a recent oebt release.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 4986b77b..63cb2ee3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1618.202206071320"
+ "openeuropa/oe_bootstrap_theme": "0.1618.202206100945"
},
"require-dev": {
"composer/installers": "^1.11",
--
GitLab
From 45471b7e53228eae025b82ee8020063c6d2eb663 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 10 Jun 2022 13:16:19 +0200
Subject: [PATCH 09/15] OEL-1618: Fixing tests after rebasing.
---
.../tests/src/Functional/ListPagesTest.php | 2 +-
tests/src/PatternAssertions/CardAssert.php | 16 ++++++++--------
.../PatternAssertions/InPageNavigationAssert.php | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
index 678be237..f2f60f72 100644
--- a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
+++ b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
@@ -54,7 +54,7 @@ class ListPagesTest extends WhitelabelBrowserTestBase {
// Assert offcanvas.
$offcanvas = $left_column->find('css', 'div.bcl-offcanvas');
- $title = $offcanvas->find('css', 'h4.offcanvas-title');
+ $title = $offcanvas->find('css', 'h3.offcanvas-title');
$this->assertSame('Filter options', $title->getText());
$offcanvas->hasField('Title');
$offcanvas->hasButton('Search');
diff --git a/tests/src/PatternAssertions/CardAssert.php b/tests/src/PatternAssertions/CardAssert.php
index 00afdb6c..e2e7eff3 100644
--- a/tests/src/PatternAssertions/CardAssert.php
+++ b/tests/src/PatternAssertions/CardAssert.php
@@ -33,7 +33,7 @@ class CardAssert extends BasePatternAssert {
],
'description' => [
[$this, 'assertElementText'],
- '.card-text',
+ '.card-text p',
],
'badges' => [
[$this, 'assertBadgesElements'],
@@ -56,13 +56,13 @@ class CardAssert extends BasePatternAssert {
* The DomCrawler where to check the element.
*/
protected function assertCardImage($expected_image, string $variant, Crawler $crawler): void {
- if ($variant == 'search') {
- $image_div = $crawler->filter('.row .col-md-3.mw-listing-img img.card-img-top');
+ if ($variant === 'search') {
+ $image_div = $crawler->filter('.row .col-md-3 img.card-img-top');
self::assertEquals($expected_image['alt'], $image_div->attr('alt'));
self::assertStringContainsString($expected_image['src'], $image_div->attr('src'));
}
else {
- $image_div = $crawler->filter('div.card img');
+ $image_div = $crawler->filter('article.card img');
self::assertEquals($expected_image['alt'], $image_div->attr('alt'));
self::assertStringContainsString($expected_image['src'], $image_div->attr('src'));
}
@@ -82,7 +82,7 @@ class CardAssert extends BasePatternAssert {
// There's no wrapping element in content that can be targeted,
// so we are checking that the expected items are present.
foreach ($expected_items as $expected_item) {
- if ($variant == 'search') {
+ if ($variant === 'search') {
self::assertStringContainsString($expected_item, $crawler->filter('.row .col-md-9')->html());
}
else {
@@ -112,10 +112,10 @@ class CardAssert extends BasePatternAssert {
protected function getBaseItemClass(string $variant): string {
switch ($variant) {
case 'search':
- return 'div.listing-item.card';
+ return 'article.listing-item.card';
default:
- return 'div.card';
+ return 'article.card';
}
}
@@ -124,7 +124,7 @@ class CardAssert extends BasePatternAssert {
*/
protected function getPatternVariant(string $html): string {
$crawler = new Crawler($html);
- if ($crawler->filter('div.listing-item')->count() > 0) {
+ if ($crawler->filter('article.listing-item')->count() > 0) {
return 'search';
}
return 'default';
diff --git a/tests/src/PatternAssertions/InPageNavigationAssert.php b/tests/src/PatternAssertions/InPageNavigationAssert.php
index b2d9bdf9..a367f489 100644
--- a/tests/src/PatternAssertions/InPageNavigationAssert.php
+++ b/tests/src/PatternAssertions/InPageNavigationAssert.php
@@ -18,7 +18,7 @@ class InPageNavigationAssert extends BasePatternAssert {
return [
'title' => [
[$this, 'assertElementText'],
- 'h5',
+ 'h3',
],
'links' => [
[$this, 'assertList'],
--
GitLab
From 34e0c15e0b7cbecbed42351b8b5ea518739b7a6e Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Fri, 10 Jun 2022 16:46:50 +0200
Subject: [PATCH 10/15] OEL-1618: Fixing ListPages tests after rebasing.
---
.../tests/src/Functional/ListPagesTest.php | 2 +-
templates/list_pages/oe-list-pages-selected-facet.html.twig | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
index f2f60f72..477b6f07 100644
--- a/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
+++ b/modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php
@@ -166,7 +166,7 @@ class ListPagesTest extends WhitelabelBrowserTestBase {
*/
protected function assertListing(int $expected_count, ElementInterface $container): void {
$listing = $container->find('css', 'div.bcl-listing');
- $this->assertSession()->elementsCount('css', 'div.listing-item', $expected_count, $listing);
+ $this->assertSession()->elementsCount('css', 'article.listing-item', $expected_count, $listing);
}
/**
diff --git a/templates/list_pages/oe-list-pages-selected-facet.html.twig b/templates/list_pages/oe-list-pages-selected-facet.html.twig
index ed4102d6..7c2b32c0 100644
--- a/templates/list_pages/oe-list-pages-selected-facet.html.twig
+++ b/templates/list_pages/oe-list-pages-selected-facet.html.twig
@@ -1,8 +1,9 @@
+{{ dump() }}
{%- for item in items -%}
{{ pattern('badge', {
'background': 'light',
'label': item.label,
- 'url': item.url,
+ 'url': item.url.toString(),
'dismissible': true,
'attributes': create_attribute({'class': ['me-2', 'fs-6']}),
}) }}
--
GitLab
From afec2ac2374b23dde4fe953b0cfbb3d4f96ad83e Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 15 Jun 2022 12:05:06 +0200
Subject: [PATCH 11/15] OEL-1618: Event fields heading. Recover title_classes
and change heading to h2.
---
.../field--node--body--oe-sc-event.html.twig | 21 ++++++++++---------
...-node--oe-documents--oe-sc-event.html.twig | 21 ++++++++++---------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/templates/content/field--node--body--oe-sc-event.html.twig b/templates/content/field--node--body--oe-sc-event.html.twig
index 463385ac..b4d99539 100644
--- a/templates/content/field--node--body--oe-sc-event.html.twig
+++ b/templates/content/field--node--body--oe-sc-event.html.twig
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Default template for a field.
+ * Template for event body field.
*/
#}
{%
@@ -10,6 +10,13 @@
label_display == 'inline' ? 'd-flex',
]
%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+]
+%}
+
{% if label_hidden %}
{% if multiple %}
<div{{ attributes.addClass(classes) }}>
@@ -25,18 +32,12 @@
{% else %}
<div{{ attributes.addClass(classes) }}>
{%- set _label -%}
- {{- label -}}
- {%- if label_display == 'inline' -%}
- <span class="me-1">:</span>
- {%- endif -%}
+ {{- label -}}{%- if label_display == 'inline' -%}<span class="me-1">:</span>{%- endif -%}
{%- endset -%}
{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
title: _label,
- title_tag: 'h3',
- attributes: create_attribute().addClass([
- 'field__label',
- label_display == 'visually_hidden' ? 'visually-hidden',
- ])
+ title_tag: 'h2',
+ attributes: create_attribute().addClass(title_classes)
} only %}
{% if multiple %}
<div class="field__items">
diff --git a/templates/content/field--node--oe-documents--oe-sc-event.html.twig b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
index 463385ac..ce292f8c 100644
--- a/templates/content/field--node--oe-documents--oe-sc-event.html.twig
+++ b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Default template for a field.
+ * Template for event documents field.
*/
#}
{%
@@ -10,6 +10,13 @@
label_display == 'inline' ? 'd-flex',
]
%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+]
+%}
+
{% if label_hidden %}
{% if multiple %}
<div{{ attributes.addClass(classes) }}>
@@ -25,18 +32,12 @@
{% else %}
<div{{ attributes.addClass(classes) }}>
{%- set _label -%}
- {{- label -}}
- {%- if label_display == 'inline' -%}
- <span class="me-1">:</span>
- {%- endif -%}
+ {{- label -}}{%- if label_display == 'inline' -%}<span class="me-1">:</span>{%- endif -%}
{%- endset -%}
{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
title: _label,
- title_tag: 'h3',
- attributes: create_attribute().addClass([
- 'field__label',
- label_display == 'visually_hidden' ? 'visually-hidden',
- ])
+ title_tag: 'h2',
+ attributes: create_attribute().addClass(title_classes)
} only %}
{% if multiple %}
<div class="field__items">
--
GitLab
From a26da52409ba0d1dbdf7b16eff2cdbe4eaeac8cf Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 15 Jun 2022 12:05:32 +0200
Subject: [PATCH 12/15] OEL-1618: Remove debug dump.
---
templates/list_pages/oe-list-pages-selected-facet.html.twig | 1 -
1 file changed, 1 deletion(-)
diff --git a/templates/list_pages/oe-list-pages-selected-facet.html.twig b/templates/list_pages/oe-list-pages-selected-facet.html.twig
index 7c2b32c0..20cfe2c4 100644
--- a/templates/list_pages/oe-list-pages-selected-facet.html.twig
+++ b/templates/list_pages/oe-list-pages-selected-facet.html.twig
@@ -1,4 +1,3 @@
-{{ dump() }}
{%- for item in items -%}
{{ pattern('badge', {
'background': 'light',
--
GitLab
From 588f0f576f1c3cfe80f6a0ce94225042e49a89f2 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 16 Jun 2022 16:45:36 +0200
Subject: [PATCH 13/15] OEL-1618: Remove title_tag when default 'h2'.
---
templates/content/field--node--body--oe-sc-event.html.twig | 1 -
.../content/field--node--oe-documents--oe-sc-event.html.twig | 1 -
2 files changed, 2 deletions(-)
diff --git a/templates/content/field--node--body--oe-sc-event.html.twig b/templates/content/field--node--body--oe-sc-event.html.twig
index b4d99539..ba689deb 100644
--- a/templates/content/field--node--body--oe-sc-event.html.twig
+++ b/templates/content/field--node--body--oe-sc-event.html.twig
@@ -36,7 +36,6 @@
{%- endset -%}
{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
title: _label,
- title_tag: 'h2',
attributes: create_attribute().addClass(title_classes)
} only %}
{% if multiple %}
diff --git a/templates/content/field--node--oe-documents--oe-sc-event.html.twig b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
index ce292f8c..f5074979 100644
--- a/templates/content/field--node--oe-documents--oe-sc-event.html.twig
+++ b/templates/content/field--node--oe-documents--oe-sc-event.html.twig
@@ -36,7 +36,6 @@
{%- endset -%}
{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
title: _label,
- title_tag: 'h2',
attributes: create_attribute().addClass(title_classes)
} only %}
{% if multiple %}
--
GitLab
From ef3a5aff05deea2ed4559f7ff45627d567355312 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 23 Jun 2022 14:52:49 +0200
Subject: [PATCH 14/15] OEL-1618: Add new oe_bootstrap_theme dev release after
BCL upgrade.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 63cb2ee3..1ce48248 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1618.202206100945"
+ "openeuropa/oe_bootstrap_theme": "0.1.202206231430"
},
"require-dev": {
"composer/installers": "^1.11",
--
GitLab
From eae03c30419f0f298ecd75e2751856777c19a068 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 23 Jun 2022 15:21:51 +0200
Subject: [PATCH 15/15] OEL-1618: Fixing heading test in featured_media
paragraph.
---
.../src/Kernel/Paragraphs/MediaParagraphsTest.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php
index b434cda9..225bfe9a 100644
--- a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php
+++ b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php
@@ -73,7 +73,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(0, $crawler->filter('h3'));
+ $this->assertCount(0, $crawler->filter('h2'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$figure = $crawler->filter('figure');
@@ -95,7 +95,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(1, $crawler->filter('h3'));
+ $this->assertCount(1, $crawler->filter('h2'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$figure = $crawler->filter('figure');
@@ -119,7 +119,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(1, $crawler->filter('h3'));
+ $this->assertCount(1, $crawler->filter('h2'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$figure = $crawler->filter('figure');
@@ -162,7 +162,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(0, $crawler->filter('h3'));
+ $this->assertCount(0, $crawler->filter('h2'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$this->assertCount(1, $crawler->filter('div.ratio.ratio-16x9'));
@@ -189,7 +189,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(1, $crawler->filter('h3'));
+ $this->assertCount(1, $crawler->filter('h2'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$this->assertCount(1, $crawler->filter('div.ratio.ratio-16x9'));
@@ -218,7 +218,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(1, $crawler->filter('h3'));
+ $this->assertCount(1, $crawler->filter('h2'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$this->assertCount(1, $crawler->filter('div.ratio.ratio-16x9'));
@@ -252,7 +252,7 @@ class MediaParagraphsTest extends ParagraphsTestBase {
$this->assertCount(1, $crawler->filter('div.row'));
$this->assertCount(0, $crawler->filter('div.col-12.col-md-4'));
- $this->assertCount(1, $crawler->filter('h3'));
+ $this->assertCount(1, $crawler->filter('h2'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-1'));
$this->assertCount(1, $crawler->filter('div.col-12.col-md-6.order-md-2'));
$this->assertCount(1, $crawler->filter('div.ratio.ratio-16x9'));
--
GitLab