Skip to content

Commit a37c626

Browse files
rganinrganin
committed
Merge branch 'B2B-2116' of https://github.com/magento-arcticfoxes/magento2ce into af-prs-develop
2 parents 79ddb14 + 151e830 commit a37c626

File tree

33 files changed

+140
-5
lines changed

33 files changed

+140
-5
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyCreateCloseCreateCustomProductAttributeTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteCreatedAttribute">
3333
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabel.label}}"/>
3434
</actionGroup>
35+
<!-- Reindex after deleting product attribute -->
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3539
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
3640
</after>
3741
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyCreateCustomProductAttributeTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteCreatedAttribute">
3333
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabel.label}}"/>
3434
</actionGroup>
35+
<!-- Reindex after deleting product attribute -->
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3539
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
3640
</after>
3741
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckNoAppearDefaultOptionConfigurableProductTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
2626
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}" />
2727
</actionGroup>
28+
<!-- Reindex after deleting product attribute -->
29+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
30+
<argument name="indices" value=""/>
31+
</actionGroup>
2832
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
2933
</after>
3034

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument>
6060
<argument name="successMessage">You deleted the rule.</argument>
6161
</helper>
62+
<!-- Reindex after deleting product attribute -->
63+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
64+
<argument name="indices" value=""/>
65+
</actionGroup>
6266
<comment userInput="BIC workaround" stepKey="waitForCatalogRuleGridPageLoaded"/>
6367
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCatalogRuleGridFilters"/>
6468
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteProductAttribute">
4747
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
4848
</actionGroup>
49+
<!-- Reindex after deleting product attribute -->
50+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
51+
<argument name="indices" value=""/>
52+
</actionGroup>
4953
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
5054
</after>
5155
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
2929
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
3030
<fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
31-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
32-
<waitForElement selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="waitForShippingMethod"/>
31+
<waitForPageLoad stepKey="waitForLoadingMask"/>
32+
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="waitForShippingMethod"/>
3333
<click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
34-
<waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
34+
<waitForPageLoad stepKey="waitForShippingLoading"/>
35+
<waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
3536
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
36-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
37+
<waitForPageLoad stepKey="waitForPaymentLoading"/>
38+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
3739
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
3840
</actionGroup>
3941
</actionGroups>

‎app/code/Magento/ConfigurableImportExport/Test/Mftf/Test/AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@
8282
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabelImport1.label}}" />
8383
</actionGroup>
8484
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
85+
86+
<!-- Reindex after deleting product attribute -->
87+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
88+
<argument name="indices" value=""/>
89+
</actionGroup>
8590
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteProductImageDirectory">
8691
<argument name="path">var/import/images/{{ImportProduct_Configurable.name}}</argument>
8792
</helper>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
3232
</actionGroup>
3333

34+
<!-- Reindex after deleting product attribute -->
35+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
36+
<argument name="indices" value=""/>
37+
</actionGroup>
38+
3439
<!-- Log out -->
3540
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3641
</after>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminConfigurableProductCreateTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteProductAttribute">
5353
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
5454
</actionGroup>
55+
<!-- Reindex after deleting product attribute -->
56+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
57+
<argument name="indices" value=""/>
58+
</actionGroup>
5559
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
5660
</after>
5761

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductAddConfigurationTest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteProductAttribute">
5353
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}"/>
5454
</actionGroup>
55+
<!-- Reindex after deleting product attribute -->
56+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
57+
<argument name="indices" value=""/>
58+
</actionGroup>
5559
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
5660
</after>
5761

0 commit comments

Comments
 (0)