Skip to content

Commit fecb059

Browse files
dhaeckerdhaecker
committed
B2B-2117: Prepare AWS Aurora Functional Test CI Build for Handing Off to GL Team
 - Fixing flaky tests
1 parent a0ac264 commit fecb059

9 files changed

+27
-3
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
3434
<waitForPageLoad stepKey="waitForPageLoad"/>
3535
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAtttributeBtn"/>
36-
<waitForLoadingMaskToDisappear stepKey="waitForLoading1"/>
36+
<waitForPageLoad stepKey="waitForLoading1"/>
3737
<click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAtttributeBtn"/>
38-
<waitForLoadingMaskToDisappear stepKey="waitForLoading2"/>
38+
<waitForPageLoad stepKey="waitForLoading2"/>
3939
<fillField selector="{{AdminProductFormSection.attributeLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
4040
<click selector="{{AdminProductFormSection.frontendInput}}" stepKey="openInputTypeDropdown"/>
4141
<see userInput="Page Builder" stepKey="seePageBuilderInputType"/>
4242
<selectOption selector="{{AdminProductFormSection.frontendInput}}" userInput="Page Builder" stepKey="selectOption1"/>
4343
<click selector="{{AdminProductFormSection.saveNewAttribute}}" stepKey="saveAttribute"/>
4444
<waitForElementNotVisible selector="{{AdminProductFormSection.saveNewAttribute}}" stepKey="waitForSlideOutCloses"/>
45-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
45+
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
4646
<click selector="{{AdminProductFormSection.attributeTab}}" stepKey="expandAttributeTab"/>
4747
<waitForElementVisible selector="{{PageBuilderProductAttribute.PageBuilderBtn(ProductAttributeFrontendLabel.label)}}" stepKey="waitForAttributeVisbile"/>
4848
<click selector="{{PageBuilderProductAttribute.PageBuilderBtn(ProductAttributeFrontendLabel.label)}}" stepKey="enablePageBuilder"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
3434
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3535
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3639
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3740
</after>
3841
<actionGroup ref="NavigateToCreatedProductAttributeActionGroup" stepKey="navigateToCreatedProductAttribute">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
</before>
3030
<after>
3131
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3336
</after>
3437
<actionGroup ref="NavigateToCreatedProductAttributeActionGroup" stepKey="navigateToCreatedProductAttribute">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
</before>
3030
<after>
3131
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3336
</after>
3437
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid1"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
</before>
3232
<after>
3333
<deleteData createDataKey="createWysiwygAttribute" stepKey="deletePreReqProductAttribute"/>
34+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
35+
<argument name="indices" value=""/>
36+
</actionGroup>
3437
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3538
</after>
3639
<!-- Update created attribute to enable Page Builder -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
</before>
3131
<after>
3232
<deleteData createDataKey="createTextAttribute" stepKey="deletePreReqProductAttribute"/>
33+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
34+
<argument name="indices" value=""/>
35+
</actionGroup>
3336
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3437
</after>
3538
<!-- Create a new product -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<after>
3636
<deleteData createDataKey="createPageBuilderAttribute1" stepKey="deleteAttribute1"/>
3737
<deleteData createDataKey="createPageBuilderAttribute2" stepKey="deleteAttribute2"/>
38+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
39+
<argument name="indices" value=""/>
40+
</actionGroup>
3841
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3942
<closeTab stepKey="closeTab"/>
4043
</after>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<deleteData createDataKey="createPageBuilderAttribute" stepKey="deleteAttribute1"/>
4949
<deleteData createDataKey="createTextAttribute" stepKey="deleteAttribute2"/>
5050
<deleteData createDataKey="relatedSimpleProduct" stepKey="deleteRelatedProduct"/>
51+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
52+
<argument name="indices" value=""/>
53+
</actionGroup>
5154
</after>
5255
<!-- Update created attribute to enable Page Builder -->
5356
<comment userInput="Update created attribute to enable Page Builder" stepKey="commentUpdateAttribute"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor" stepKey="selectTextEditor"/>
9696
<actionGroup ref="ConfirmChangeInputTypeModalActionGroup" stepKey="confirmChangeInputTypeModal"/>
9797
<actionGroup ref="SaveProductAttributeActionGroup" stepKey="saveAttribute"/>
98+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
99+
<argument name="indices" value=""/>
100+
</actionGroup>
98101
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
99102
<argument name="tags" value="full_page"/>
100103
</actionGroup>

0 commit comments

Comments
 (0)