From 0a312167e9311c1aafd2759766b4e9e5ad8c7975 Mon Sep 17 00:00:00 2001
From: Oleg Fedak <olegfedak@gmail.com>
Date: Thu, 15 Aug 2024 20:12:03 +0300
Subject: [PATCH] fix: add changes to the tests

---
 .../e2e/markdown_widget_code_block_spec.js    |  3 ++-
 cypress/utils/steps.js                        | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/markdown_widget_code_block_spec.js b/cypress/e2e/markdown_widget_code_block_spec.js
index 1b835f67ac39..4ecce19bf10f 100644
--- a/cypress/e2e/markdown_widget_code_block_spec.js
+++ b/cypress/e2e/markdown_widget_code_block_spec.js
@@ -77,7 +77,8 @@ function codeBlock(content) {
     <div>
       <div></div>
       <div>
-        <div><label>Code Block</label>
+        <div>
+          <div><label>Code Block</label></div>
           <div><button><span><svg>
                   <path></path>
                 </svg></span></button>
diff --git a/cypress/utils/steps.js b/cypress/utils/steps.js
index 464365f802b6..b24ef33d44f4 100644
--- a/cypress/utils/steps.js
+++ b/cypress/utils/steps.js
@@ -69,6 +69,7 @@ function assertColorOn(cssProperty, color, opts) {
     } else {
       (opts.scope ? opts.scope : cy)
         .contains('label', opts.label)
+        .parents()
         .next()
         .should(assertion);
     }
@@ -518,23 +519,31 @@ function validateNestedListFields() {
   cy.contains('button', 'hotel locations').click();
   cy.contains('button', 'cities').click();
   cy.contains('label', 'City')
+    .parents()
     .next()
+    .first() // Вибрати перший елемент після parents()
     .type('Washington DC');
   cy.contains('label', 'Number of Hotels in City')
+    .parents()
     .next()
+    .first() // Вибрати перший елемент після parents()
     .type('5');
   cy.contains('button', 'city locations').click();
 
   // add second city list item
   cy.contains('button', 'cities').click();
   cy.contains('label', 'Cities')
+    .parents()
     .next()
+    .first() // Вибрати перший елемент після parents()
     .find('div[class*=SortableListItem]')
     .eq(2)
     .as('secondCitiesListControl');
   cy.get('@secondCitiesListControl')
     .contains('label', 'City')
+    .parents()
     .next()
+    .first() // Вибрати перший елемент після parents()
     .type('Boston');
   cy.get('@secondCitiesListControl')
     .contains('button', 'city locations')
@@ -561,21 +570,25 @@ function validateNestedListFields() {
 
   // list control aliases
   cy.contains('label', 'Hotel Locations')
+    .parents()
     .next()
     .find('div[class*=SortableListItem]')
     .first()
     .as('hotelLocationsListControl');
   cy.contains('label', 'Cities')
+    .parents()
     .next()
     .find('div[class*=SortableListItem]')
     .eq(0)
     .as('firstCitiesListControl');
   cy.contains('label', 'City Locations')
+    .parents()
     .next()
     .find('div[class*=SortableListItem]')
     .eq(0)
     .as('firstCityLocationsListControl');
   cy.contains('label', 'Cities')
+    .parents()
     .next()
     .find('div[class*=SortableListItem]')
     .eq(3)
@@ -589,7 +602,9 @@ function validateNestedListFields() {
   assertListControlErrorStatus([colorError, colorError], '@secondCityLocationsListControl');
 
   cy.contains('label', 'Hotel Name')
+    .parents()
     .next()
+    .first()
     .type('The Ritz Carlton');
   cy.contains('button', 'Save').click();
   assertNotification(notifications.error.missingField);
@@ -598,12 +613,20 @@ function validateNestedListFields() {
   // fill out rest of form and save
   cy.get('@secondCitiesListControl')
     .contains('label', 'Number of Hotels in City')
+    .parents()
+    .next()
+    .first()
     .type(3);
   cy.get('@secondCitiesListControl')
     .contains('label', 'Hotel Name')
+    .parents()
+    .next()
+    .first()
     .type('Grand Hyatt');
   cy.contains('label', 'Country')
+    .parents()
     .next()
+    .first()
     .type('United States');
   flushClockAndSave();
   assertNotification(notifications.saved);