OEL-780: Fix assert contains selectors #139

escuriola · 2021-12-08T11:44:19Z

Jira issue(s):

https://citnet.tech.ec.europa.eu/CITnet/jira/browse/OEL-780

brummbar · 2021-12-10T17:06:59Z

tests/src/Kernel/fixtures/markup_rendering.yml

@@ -1,51 +1,51 @@
 form assertion:
  render:
    markup:
-      '#markup': Hello World!
+      '#markup': "Hello World!"


Let's make a bit of order for quotes. Let's use single quotes when needed, like for multiple words (even if it's not strictly needed). Use double quotes only when we need special characters like \n .

brummbar · 2021-12-10T17:07:53Z

tests/src/Kernel/fixtures/markup_rendering.yml

-    '#type': textarea
-    '#title': Textarea
-    '#value': Text
+    '#type': "textarea"


Why we quoted all of these?

brummbar · 2021-12-10T17:40:02Z

tests/src/Kernel/fixtures/markup_rendering_patterns/accordion.yml

@@ -27,7 +27,8 @@ accordion:
      'div.accordion-item:nth-child(1) button.accordion-button': "Accordion Item #1"
      'div.accordion-item:nth-child(2) button.accordion-button': "Accordion Item #2"
      'div.accordion-item:nth-child(3) button.accordion-button': "Accordion Item #3"
+


Let's remove this for consistency.

brummbar · 2021-12-10T17:41:39Z

tests/src/Kernel/fixtures/markup_rendering_patterns/accordion.yml

-      - "Bullfights. Bull hockey"
-      - "Advice on living, working or travelling in the EU"
-      - "Lorem ipsum dolor sit amet"
+      'div.accordion-item:nth-child(1) div.accordion-body': "Bullfights. Bull hockey"


Not related to the code, but let's not speak about animal violence here :) can you swap this text with a less "crude" one?

brummbar · 2021-12-10T17:42:24Z

tests/src/Kernel/fixtures/markup_rendering_patterns/accordion.yml

+      'div.accordion-item:nth-child(2) div.accordion-body': "Advice on living, working or travelling in the EU"
+      'div.accordion-item:nth-child(3) div.accordion-body': "Lorem ipsum dolor sit amet"


Let's change the 3 contains assertions with equals assertions, and check the full text is shown.

brummbar · 2021-12-13T14:13:41Z

tests/src/Kernel/fixtures/markup_rendering_patterns/navbar.yml

@@ -137,4 +137,4 @@ navbar_medium_dark_background_color_dark_with_disable_collapse:
      'label': "Search"
      'a.navbar-brand': "OpenEuropa Site"
    contains:
-      'a': "https://europa.eu/"
+      'nav div.container': "https://europa.eu/"


Same as above.

brummbar · 2021-12-13T14:13:47Z

tests/src/Kernel/fixtures/markup_rendering_patterns/offcanvas.yml

@@ -80,4 +80,4 @@ offcanvas_with_trigger_with_icon:
      'div.offcanvas-body': "This is the offcanvas body content."
    contains:
      'button[data-bs-toggle="offcanvas"]': "Toggle offcanvas"
-      'icon': 'bootstrap-icons.svg#filter'
+      'svg': 'bootstrap-icons.svg#filter'


Same as others.

brummbar · 2021-12-13T14:17:38Z

tests/src/Kernel/fixtures/markup_rendering_patterns/table.yml

+      'table > thead > tr td:nth-child(4)': '<b>Bold header</b>'
+      'table > tbody > tr:nth-child(3) td:nth-child(3)': '<b>Bold cell</b>'


Uniform with the ones above? Or uniform all of them to this one :)

brummbar · 2021-12-13T14:18:11Z

tests/src/Kernel/fixtures/markup_rendering_patterns/table.yml

-    contains:
-      'thead th:nth-child(1)': '<b>Bold header</b>'
-      'tbody tr:nth-child(3) td:nth-child(3)': '<b>Bold cell</b>'
+      'table > thead > tr td:nth-child(4)': '<b>Bold header</b>'


Same as above.

brummbar · 2021-12-13T14:35:30Z

tests/src/Kernel/fixtures/markup_rendering_patterns/table.yml

-    contains:
-      'thead th:nth-child(1)': '<b>Bold header</b>'
-      'tbody tr:nth-child(3) td:nth-child(3)': '<b>Bold cell</b>'
+      'table > thead > tr td:nth-child(4)': '<b>Bold header</b>'


Same as above.

brummbar

Some leftovers, didn't look through all of it, it's too much :)
Let's fix these 3 and merge it like this.

brummbar · 2021-12-22T09:00:01Z

tests/src/Kernel/fixtures/markup_rendering_patterns/carousel.yml

+      'div.carousel-item img[src="https://images.site.example1"]': 1
+      'div.carousel-item img[src="https://images.site.example2"]': 1
+      'div.carousel-item img[alt="alt image 1"]': 1
+      'div.carousel-item img[alt="alt image 2"]': 1


Can't we add :nth-child(N) too, so we check that images are actually in the correct order?

brummbar · 2021-12-22T09:00:10Z

tests/src/Kernel/fixtures/markup_rendering_patterns/carousel.yml

-      'img[src="https://images.site.example2"]': 1
-      'img[alt="alt image 1"]': 1
-      'img[alt="alt image 2"]': 1
+      'div.carousel-item img[src="https://images.site.example1"]': 1


Same as above.

brummbar · 2021-12-22T09:00:44Z

tests/src/Kernel/fixtures/markup_rendering_patterns/date_block.yml

-    contains:
-      'span__day': "26"
+      'span.pb-3.text-uppercase': 'May'
+      'span[class="bg-light w-100 text-center py-2 text-dark rounded-bottom mb-n1"]': '2021'


why [ instead of .

drishu · 2022-01-05T11:48:25Z

tests/src/Kernel/fixtures/markup_rendering_patterns/alert.yml

-      icon_name: "alarm"
+      heading: 'Well done!'
+      message: 'A simple alert. check it out!'
+      icons_path: '/assets/icons/bootstrap-icons.svg'


pls create a follow up ticket that sets this inside the pattern template and doesn't expose it as a parameter

Is already here: https://citnet.tech.ec.europa.eu/CITnet/jira/browse/OEL-779 @drishu

drishu · 2022-01-05T11:54:06Z

tests/src/Kernel/fixtures/markup_rendering_patterns/banner.yml

    '#fields':
      settings:
        'hero': false
        'shade': false
        'full_width': true
        'centered': true
-      'title': "EU Budget for the future"
-      'description': "Innovation, economy, environment and geopolitics"
+      'title': 'EU Budget for the future'


Suggested change

'title': 'EU Budget for the future'

title: 'EU Budget for the future'

we should use quotes for keys only when it would be invalid yml if not, like '#something' or 'div.something'
same for the others below

drishu · 2022-01-05T12:14:29Z

tests/src/Kernel/fixtures/markup_rendering_patterns/card.yml

+        '#type': 'pattern'
+        '#id': 'button'
+        '#fields':
+          'settings':


Suggested change

'settings':

settings:

brummbar requested changes Dec 13, 2021

View reviewed changes

escuriola force-pushed the OEL-780 branch from 156628b to 1f3f511 Compare December 15, 2021 08:54

escuriola added 17 commits December 15, 2021 17:14

OEL-780: Fixing markup assertion tests.

f96f505

OEL-780: Fix accordion tests.

0c9962b

OEL-780: Fix alert tests.

ad95473

OEL-780: Fix badge tests.

59adfef

OEL-780: Fix breadcrumb tests.

ebbda6e

OEL-780: Fix button tests.

5857211

OEL-780: Fix card tests.

7112a95

OEL-780: Fix card_layout tests.

6349a3b

OEL-780: Fix carousel tests.

a59655f

OEL-780: Fix date_block tests.

2ff3ff5

OEL-780: Fix dropdown tests.

0cf7e7f

OEL-780: Fix list_group tests.

9bbd201

OEL-780: Fix navbar tests.

835cf02

OEL-780: Fix offcanvas tests.

c4446b0

OEL-780: Fix table tests.

74efdd2

OEL-780: Fix assert contains.

38e7721

OEL-494: Single quotes everywhere. Improve some tests.

4ccffc9

escuriola force-pushed the OEL-780 branch from 2ffc129 to 4ccffc9 Compare December 15, 2021 16:14

brummbar requested changes Dec 22, 2021

View reviewed changes

OEL-780: Improve some tests.

d6b2e83

brummbar previously approved these changes Jan 4, 2022

View reviewed changes

drishu reviewed Jan 5, 2022

View reviewed changes

drishu requested changes Jan 5, 2022

View reviewed changes

OEL-780: Remove single quotes in yml keys.

6c39611

escuriola dismissed brummbar’s stale review via 6c39611 January 5, 2022 13:05

drishu approved these changes Jan 5, 2022

View reviewed changes

brummbar approved these changes Jan 6, 2022

View reviewed changes

drishu merged commit 091197c into 1.x Jan 6, 2022

drishu deleted the OEL-780 branch January 6, 2022 08:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OEL-780: Fix assert contains selectors #139

OEL-780: Fix assert contains selectors #139

escuriola commented Dec 8, 2021

brummbar Dec 10, 2021

brummbar Dec 10, 2021

brummbar Dec 10, 2021

brummbar Dec 10, 2021

brummbar Dec 10, 2021

brummbar Dec 13, 2021

brummbar Dec 13, 2021

brummbar Dec 13, 2021

brummbar Dec 13, 2021

brummbar Dec 13, 2021

brummbar left a comment

brummbar Dec 22, 2021

brummbar Dec 22, 2021

brummbar Dec 22, 2021

drishu Jan 5, 2022 •

edited

Loading

escuriola Jan 5, 2022

drishu Jan 5, 2022

drishu Jan 5, 2022

		'div.accordion-item:nth-child(2) div.accordion-body': "Advice on living, working or travelling in the EU"
		'div.accordion-item:nth-child(3) div.accordion-body': "Lorem ipsum dolor sit amet"

		'table > thead > tr td:nth-child(4)': '<b>Bold header</b>'
		'table > tbody > tr:nth-child(3) td:nth-child(3)': '<b>Bold cell</b>'

	'title': 'EU Budget for the future'
	title: 'EU Budget for the future'

OEL-780: Fix assert contains selectors #139

OEL-780: Fix assert contains selectors #139

Conversation

escuriola commented Dec 8, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brummbar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drishu Jan 5, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drishu Jan 5, 2022 •

edited

Loading