Merge pull request #117 from magento-arcticfoxes/B2B-1967

joanhe · web-flow · commit 7e914ee82f8c · 2021-12-10T13:31:02.000-06:00
B2B-1967: [AWS Aurora] [MFTF]: Investigate CE Build Test Failures
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml
@@ -18,6 +18,7 @@
         </arguments>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{section.backgroundType(index, 'video')}}" stepKey="waitForVideoBackground"/>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideo"/>
         <waitForElementVisible selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="waitForFallbackImageVisible"/>
         <grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="src" stepKey="fallbackImageSource"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml
@@ -17,6 +17,7 @@
             <argument name="index" defaultValue="1" type="string"/>
             <argument name="acceptableOffset" defaultValue="5" type="string"/>
         </arguments>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoBackgroundElement"/>
         <executeJS function="return document.evaluate(&quot;{{section.videoBackgroundVideoElement(index)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().width" stepKey="actualVideoWidth"/>
         <executeJS function="return document.evaluate(&quot;{{section.videoBackgroundVideoElement(index)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="actualVideoHeight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml
@@ -11,6 +11,7 @@
         <annotations>
             <description>Validates that the video in the video background is loaded but not playing for an element that is not visible.</description>
         </annotations>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
         <assertStringNotContainsString stepKey="assertVideoPlaying">
             <expectedResult type="string">transform: translate3d(</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml
@@ -17,6 +17,7 @@
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
         <waitForPageLoad stepKey="waitForPageLoad"/>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
         <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml
@@ -30,6 +30,7 @@
             <expectedResult type="string">{{backgroundColor}}</expectedResult>
             <actualResult type="variable">$backgroundColor</actualResult>
         </assertEquals>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
         <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml
@@ -27,6 +27,7 @@
             <expectedResult type="string">{{defaultBackgroundColor.rgb}}</expectedResult>
             <actualResult type="variable">grabBackgroundColorValue</actualResult>
         </assertEquals>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
         <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml
@@ -20,6 +20,7 @@
         <waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
         <pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForText userInput="{{content}}" stepKey="waitForContent"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
@@ -65,7 +65,7 @@
         <element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[contains(@class,'inline-wysiwyg')]//{{tag}}" parameterized="true"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]" parameterized="true"/>
-        <element name="videoBackgroundVideoElement" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video" parameterized="true"/>
+        <element name="videoBackgroundVideoElement" type="text" selector="((//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video)[last()]" parameterized="true"/>
         <element name="videoBackgroundVideoUrl" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]" parameterized="true"/>
         <element name="videoBackgroundOverlayElement" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[@data-element='video_overlay']" parameterized="true"/>
         <element name="videoBackgroundInfiniteLoop" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper'][@data-video-loop='{{infiniteLoopValue}}']" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml
@@ -60,7 +60,7 @@
         <element name="transparentOverlay" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true" deprecated="Styles are not inline"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]" parameterized="true"/>
-        <element name="videoBackgroundVideoElement" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]//video" parameterized="true"/>
+        <element name="videoBackgroundVideoElement" type="text" selector="((//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]//video)[last()]" parameterized="true"/>
         <element name="videoBackgroundVideoUrl" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]" parameterized="true"/>
         <element name="videoBackgroundOverlayElement" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[@data-element='video_overlay']" parameterized="true"/>
         <element name="videoBackgroundInfiniteLoop" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[@data-element='wrapper' and @data-video-loop='{{infiniteLoopValue}}']" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml
@@ -49,7 +49,7 @@
         <element name="parallaxJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[id*=jarallax-container] &gt; div')" parameterized="true"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]"/>
-        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video"/>
+        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="((//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video)[last()]"/>
         <element name="videoBackgroundVideoUrl" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]"/>
         <element name="videoBackgroundOverlayElement" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}]//div[@data-element='video_overlay']"/>
         <element name="videoBackgroundInfiniteLoop" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{rowIndex}}][@data-video-loop='{{infiniteLoopValue}}']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml
@@ -48,7 +48,7 @@
         <element name="parallaxJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[id*=jarallax-container] &gt; div')" parameterized="true"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]"/>
-        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video"/>
+        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="((//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video)[last()]"/>
         <element name="videoBackgroundVideoUrl" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]"/>
         <element name="videoBackgroundOverlayElement" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[@data-element='video_overlay']"/>
         <element name="videoBackgroundInfiniteLoop" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[@data-element='inner' and @data-video-loop='{{infiniteLoopValue}}']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml
@@ -37,7 +37,7 @@
         <element name="parallaxJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[id*=jarallax-container] &gt; div')" parameterized="true"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]"/>
-        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video"/>
+        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="((//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//video)[last()]"/>
         <element name="videoBackgroundVideoUrl" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]"/>
         <element name="videoBackgroundOverlayElement" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[@data-element='video_overlay']"/>
         <element name="videoBackgroundInfiniteLoop" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}][@data-video-loop='{{infiniteLoopValue}}']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml
@@ -53,7 +53,7 @@
         <element name="backgroundAttachment" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-attachment: {{backgroundAttachment}};')]" parameterized="true" deprecated="Styles are not inline"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]"/>
-        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//video"/>
+        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="((//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//video)[last()]"/>
         <element name="videoBackgroundVideoUrl" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]"/>
         <element name="videoBackgroundOverlayElement" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='video_overlay']"/>
         <element name="videoBackgroundInfiniteLoop" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-video-loop='{{infiniteLoopValue}}']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml
@@ -41,7 +41,7 @@
         <element name="backgroundAttachment" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-attachment: {{backgroundAttachment}};')]" parameterized="true" deprecated="Styles are not inline"/>
         <!-- Video Background -->
         <element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]"/>
-        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video"/>
+        <element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="((//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe)[last()]|((//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video)[last()]"/>
         <element name="videoBackgroundVideoUrl" type="text" parameterized="true" selector="(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'{{videoURL}}')]"/>
         <element name="videoBackgroundOverlayElement" type="text" parameterized="true" selector="(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[@data-element='video_overlay']"/>
         <element name="videoBackgroundInfiniteLoop" type="text" parameterized="true" selector="(//div[@data-slick-index and not(contains(@class, 'slick-cloned'))]//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper' and @data-video-loop='{{infiniteLoopValue}}']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml
@@ -30,9 +30,13 @@
             </createData>
         </before>
         <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Find created product in product grid and open edit product -->
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="findCreatedProductInGrid">
