Skip to content

Commit da9019c

Browse files
authored
Merge pull request #8459 from magento-commerce/stability_control_org
Logout customer before deleting
2 parents 8d5f7c3 + f2b1101 commit da9019c

File tree

324 files changed

+688
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+688
-45
lines changed

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
3636
<magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
3737
<!-- Delete customer -->
38+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3839
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3940

4041
<!-- Delete category -->

app/code/Magento/Backend/Test/Mftf/Test/AdminCheckDashboardWithChartsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<argument name="tags" value="config full_page"/>
5252
</actionGroup>
5353
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
54+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
5455
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5556
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5657
</after>

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
4343
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
4444
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
45+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4546
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4647
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4748
</after>

app/code/Magento/Bundle/Test/Mftf/Test/AdminCheckingBundleSKUsCreationTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
8282
<deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
8383
<deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/>
84+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
8485
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
8586
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
8687
</after>

app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
5858
</before>
5959
<after>
60+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
6061
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
6162
<!-- Delete the simple product -->
6263
<deleteData createDataKey="SimpleProduct1" stepKey="DeleteSimpleProduct1"/>

app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<after>
8686
<!--Remove default flat rate shipping method settings-->
8787
<comment userInput="config:set DisableFlatRateConfigData.path DisableFlatRateConfigData.value" stepKey="disableFlatRate"/>
88+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
8889
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
8990
<deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
9091

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithMultipleOptionsSuccessTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
2929
<deleteData createDataKey="firstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
3030
<deleteData createDataKey="secondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
31+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3132
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3233
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3334
</after>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithVirtualAndSimpleChildrenTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProductForBundleItem"/>
5656
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProductForBundleItem"/>
5757
<deleteData createDataKey="createFixedBundleProduct" stepKey="deleteBundleProduct"/>
58+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
5859
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5960
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
6061
<waitForPageLoad stepKey="waitForClearProductsGridFilters"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<deleteData createDataKey="createFirstProduct" stepKey="deleteSimpleProductForBundleItem"/>
6161
<deleteData createDataKey="createSecondProduct" stepKey="deleteVirtualProductForBundleItem"/>
6262
<deleteData createDataKey="createFixedBundleProduct" stepKey="deleteBundleProduct"/>
63+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
6364
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
6465
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
6566
<waitForPageLoad stepKey="waitForClearProductsGridFilters"/>

app/code/Magento/BundleImportExport/Test/Mftf/Test/AdminImportBundleProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<after>
5151
<!-- Delete Data -->
5252
<deleteData createDataKey="createImportCategory" stepKey="deleteImportCategory"/>
53+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
5354
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5455
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteProductImageDirectory">
5556
<argument name="path">var/import/images/{{ImportProduct_Bundle.name}}</argument>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaChangeCustomerPasswordTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
4040
<argument name="tags" value="config full_page"/>
4141
</actionGroup>
42+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4243
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4344
</after>
4445

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaCheckoutWithEnabledCaptchaTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<after>
3535
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3636
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
37-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
37+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3838
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3939
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength"/>
4040
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols"/>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<argument name="tags" value="config full_page"/>
4545
</actionGroup>
4646

47+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4748
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4849
</after>
4950

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaLoginOnCheckoutWithEnabledCaptchaTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<after>
3535
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3636
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
37-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
37+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3838
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3939
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength"/>
4040
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols"/>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnApplyingCouponCodesFormsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4343
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4444
<deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
45-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
45+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4646
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4747
<magentoCLI command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}" stepKey="disableBankTransferPayment"/>
4848
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength"/>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
3838
<argument name="tags" value="config full_page"/>
3939
</actionGroup>
40+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4041
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4142
</after>
4243

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="DeleteProductAttributeByCodeActionGroup">
12+
<annotations>
13+
<description>Delete a Product Attribute from the Product Attribute creation/edit page by code.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attribute_code" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
19+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
20+
<fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{attribute_code}}" stepKey="setAttributeCode"/>
21+
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
22+
<click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
23+
<waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" time="30"/>
24+
<click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
25+
<click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickOnConfirmOk"/>
26+
<waitForPageLoad stepKey="waitForViewProductAttributePageLoad"/>
27+
</actionGroup>
28+
</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyChangePriceForConfigurableProductWithAssignedSimpleProductsTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<severity value="MAJOR"/>
1616
<testCaseId value="AC-2031"/>
1717
<group value="Catalog"/>
18+
<group value="AllIndexerBySchedule" />
1819
</annotations>
1920

2021
<before>
@@ -89,6 +90,8 @@
8990

9091
<!-- Assert first product in category -->
9192
<magentoCron stepKey="runCron"/>
93+
<magentoCron stepKey="runCron1"/>
94+
9295
<amOnPage url="{{StorefrontCategoryPage.url($$firstSimpleCategory.custom_attributes[url_key]$$)}}" stepKey="goToFirstCategoryPageStorefront"/>
9396
<waitForPageLoad stepKey="waitForFirstCategoryPageLoad"/>
9497

@@ -113,7 +116,7 @@
113116
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
114117

115118
<!-- Assert first product in category -->
116-
<magentoCron stepKey="runCron1"/>
119+
<magentoCron stepKey="runCron2"/>
117120
<wait time="60" stepKey="waitForUpdateStarts"/>
118121

119122
<amOnPage url="{{StorefrontCategoryPage.url($$firstSimpleCategory.custom_attributes[url_key]$$)}}" stepKey="goToFirstCategoryPageStorefront1"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
</createData>
2929
</before>
3030
<after>
31+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3132
<deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
3233
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
3334
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/StoreFrontDeleteProductImagesAssignedDifferentRolesTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
</before>
8686
<after>
8787
<deleteData createDataKey="testCategory" stepKey="deleteCategory"/>
88+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
8889
<deleteData createDataKey="simpleProductOne" stepKey="deleteCustomer"/>
8990
</after>
9091

app/code/Magento/Catalog/Test/Mftf/Test/AdminChecksIfOnlyOneQuantityConfigurationIsDisplayedForBundleProductWhileCreatingAnOrderTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
2727
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
2828
<!--Delete customer-->
29+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
2930
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3031
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3132
</after>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateTwoSimpleProductTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
3434
<argument name="sku" value="{{_defaultProduct.sku}}"/>
3535
</actionGroup>
36-
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
36+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
37+
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
3738
<argument name="customerEmail" value="Simple_US_Customer.email"/>
3839
</actionGroup>
3940
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
</before>
2727
<after>
2828
<deleteData createDataKey="categoryEntity" stepKey="deleteSimpleSubCategory"/>
29+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
2930
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
3031
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteVirtualProduct">
3132
<argument name="product" value="virtualProductGeneralGroup"/>

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
<deleteData createDataKey="product3" stepKey="deleteProduct3"/>
323323
<deleteData createDataKey="product4" stepKey="deleteProduct4"/>
324324
<deleteData createDataKey="category" stepKey="deleteCategory"/>
325+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
325326
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
326327
<createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
327328
<actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">

app/code/Magento/Catalog/Test/Mftf/Test/SpecialPriceCheckOnWishListPageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<after>
3636
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteSimpleProduct"/>
3737
<deleteData createDataKey="createCategory" stepKey="deleteSimpleCategory"/>
38+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3839
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3940
</after>
4041
<!-- Login into Admin Panel-->

app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontAddRelatedandUpsellstoCartfromproductpageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<deleteData createDataKey="productU" stepKey="deleteVirtualProductU"/>
6666
<deleteData createDataKey="productV" stepKey="deleteVirtualProductV"/>
6767
<deleteData createDataKey="productW" stepKey="deleteVirtualProductW"/>
68+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
6869
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
6970

7071
</after>

app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontAssertProductFinalPriceChangesDynamicallyOnProductPageWithTierPricesConfiguredTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<after>
2727
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
2828
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
29+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
2930
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3031
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
3132
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterProduct"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontEnsureThatAccordionAnchorIsVisibleOnViewportOnceClickedTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<actionGroup ref="AdminDeleteReviewsByUserNicknameActionGroup" stepKey="deleteCustomerReview"/>
6262

6363
<!-- Delete customer -->
64+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
6465
<actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
6566
<argument name="email" value="{{CustomerEntityOne.email}}"/>
6667
</actionGroup>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@
101101
<click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
102102
<click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
103103
<click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue1"/>
104+
<waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" stepKey="waitForOptionValueTitle1" />
104105
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" userInput="option1" stepKey="fillOptionValueTitle1"/>
105106
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/>
106107

107108
<!-- Update Product with Option Value 1 DropDown 1-->
108109

109110
<click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Custom Options 1')}}" stepKey="clickAddValue2"/>
111+
<waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '0')}}" stepKey="waitForOptionValueTitle2" />
110112
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '1')}}" userInput="option2" stepKey="fillOptionValueTitle2"/>
111113
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '1')}}" userInput="50" stepKey="fillOptionValuePrice2"/>
112114
<selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType('Custom Options 1', '1')}}" userInput="percent" stepKey="clickSelectPriceType"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<after>
3333
<!--Delete create data-->
3434
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
35+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3536
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3637

3738
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

0 commit comments

Comments
 (0)