Skip to content

Commit 2a042da

Browse files
rganinrganin
committed
Merge branch 'B2B-2139-24-develop' of https://github.com/magento-arcticfoxes/magento2ce into B2B-2140
2 parents c9385a8 + 96bf118 commit 2a042da

12 files changed

+39
-8
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPage2ActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919

2020
<seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
2121
<waitForPageLoad stepKey="waitForPageLoad"/>
22-
<seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
22+
<waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
2323
</actionGroup>
2424
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
2121
<waitForPageLoad stepKey="waitForPageLoad"/>
22+
<waitForElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="waitForImage"/>
2223
<seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
2324
</actionGroup>
2425
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
1717
<click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<see userInput="You are signed out" stepKey="signOut"/>
19+
<waitForText userInput="You are signed out" stepKey="signOut"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="createNewCustomerAccount">
6363
<argument name="customer" value="Simple_US_Customer" />
6464
</actionGroup>
65-
<click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
66-
<waitForPageLoad stepKey="waitForCreateAccountButtonToLoad"/>
65+
<actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAccountButton"/>
66+
<comment userInput="BIC workaround" stepKey="waitForCreateAccountButtonToLoad"/>
6767

6868
<!--Assert customer information-->
6969
<see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageAndPriceInStorefrontProductActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
</arguments>
2020

2121
<selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
22-
<seeElement selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
22+
<waitForPageLoad stepKey="waitForOptionLoad"/>
23+
<waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
2324
<see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.price}}" stepKey="seeProductPrice"/>
2425
</actionGroup>
2526
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageInStorefrontProductPageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
2222
<waitForPageLoad stepKey="waitForPageLoad"/>
2323
<selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
24-
<seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
24+
<waitForPageLoad stepKey="waitForOptionLoad"/>
25+
<waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
2526
</actionGroup>
2627
</actionGroups>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,11 @@
212212
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$-Updated" stepKey="seeConfigurableProductName"/>
213213
<see userInput="{{productAttributeColor.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeColorAttributeName"/>
214214
<selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectFirstOption"/>
215+
<waitForPageLoad stepKey="waitForFirstOptionLoad"/>
215216
<see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertFirstOptionProductPrice"/>
216217
<seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeFirstImage"/>
217218
<selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectSecondOption"/>
219+
<waitForPageLoad stepKey="waitForSecondOptionLoad"/>
218220
<see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeSecondOptionProductPrice"/>
219221
<seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeSecondImage"/>
220222
</test>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
1717
<click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<see userInput="You are signed out" stepKey="signOut"/>
19+
<waitForText userInput="You are signed out" stepKey="signOut"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
</annotations>
2222
<before>
2323
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
24+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
25+
<argument name="indices" value="customer_grid"/>
26+
</actionGroup>
2427
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2528
</before>
2629
<after>

‎app/code/Magento/Theme/Test/Mftf/ActionGroup/AdminClickViewThemeByThemeActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminClickViewThemeBySpecifiedThemeActionGroup">
12+
<annotations>
13+
<description>Click the 'View' action of the specified theme on the themes grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="theme" defaultValue="{{MagentoBlankTheme.themeTitle}}" type="string"/>
17+
</arguments>
18+
<click selector="{{AdminThemeSection.viewActionByTheme(theme)}}" stepKey="clickViewTheme"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)