Skip to content

Commit 8f07562

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #8949 from magento-gl/ACQE-6611_mainline_deployment
[Bengals Team] Test Fixes and Automation Tasks
2 parents 71370a9 + d913d84 commit 8f07562

23 files changed

+688
-3
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminCreateProductAttributeWithSaveAndEditActionGroup" extends="CreateProductAttributeActionGroup">
12+
<annotations>
13+
<description>Clicks on 'Add New Attribute'. Fills in the Attribute Details (Label, Input Type and Value Required). Clicks on Save.</description>
14+
</annotations>
15+
<remove keyForRemoval="saveAttribute"/>
16+
<click stepKey="saveAndEditAttribute" selector="{{AttributePropertiesSection.SaveAndEdit}}"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
<element name="dropdownNthOptionDelete" type="button" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) button[title='Delete']" parameterized="true"/>
3434
<element name="attributeLabelValidationError" type="text" selector=".field-attribute_label .mage-error"/>
3535
<element name="AttributeCode" type="input" selector="#attribute_code"/>
36+
<element name="defaultRadioButton" type="radio" selector="//*[@id='swatch_window_option_option_{{position}}']/parent::td/parent::tr/td[@class='col-default']" parameterized="true"/>
3637
</section>
3738
</sections>

‎app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminInventoryProductStockOptionsConfigSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
<element name="maxSaleQtyInherit" type="checkbox" selector="#cataloginventory_item_options_max_sale_qty_inherit" timeout="30"/>
1313
<element name="maxSaleQty" type="input" selector="#cataloginventory_item_options_max_sale_qty"/>
1414
<element name="maxSaleQtyError" type="input" selector="#cataloginventory_item_options_max_sale_qty-error"/>
15+
<element name="notifyQty" type="input" selector="//input[@id='cataloginventory_item_options_notify_stock_qty']"/>
16+
<element name="saveConfig" type="button" selector="//span[text()='Save Config']"/>
17+
<element name="systemValue" type="input" selector="//input[@id='cataloginventory_item_options_notify_stock_qty_inherit']"/>
1518
</section>
1619
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@
4242
<item>United Kingdom</item>
4343
</array>
4444
</entity>
45+
<entity name="WesternEurope" type="countryArray">
46+
<array key="country">
47+
<item>Belgium</item>
48+
</array>
49+
</entity>
4550
</entities>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@
6969
<!-- Click next button to open payment section -->
7070
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNext"/>
7171
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForShipmentPageLoad"/>
72+
<waitForElementClickable selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="waitForElementSelectPaymentSolutionToBeClickable"/>
7273
<uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
7374

7475
<!-- Change the address -->
76+
<waitForElementClickable selector="{{CheckoutPaymentSection.editAddress}}" stepKey="waitForEditAddressElementToBeClickable"/>
7577
<click selector="{{CheckoutPaymentSection.editAddress}}" stepKey="editAddress"/>
7678
<waitForElementVisible selector="{{CheckoutPaymentSection.addressDropdown}}" stepKey="waitForDropDownToBeVisible"/>
7779
<see selector="{{CheckoutPaymentSection.addressDropdownSelected}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeDefaultBillingAddressStreet"/>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/UnselectStatesForStatesOptionsActionGroup.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="UnselectStatesForStatesOptionsActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'General'. Selects the provided States under 'State is Required for'. Clicks on the Save button.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="countries" type="entity"/>
17+
</arguments>
18+
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
19+
<conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
20+
<waitForAjaxLoad stepKey="waitForAjax"/>
21+
<scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
22+
<unselectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
23+
<click selector="#save" stepKey="saveConfig"/>
24+
<waitForPageLoad stepKey="waitForSavingConfig"/>
25+
</actionGroup>
26+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@
2222
<element name="numberOfAddresses" type="text" selector=".toolbar-number"/>
2323
<element name="shippingAddress" type="text" selector="//div[contains(@class,'box box-shipping-address')]//div/address"/>
2424
<element name="billingAddress" type="text" selector="//div[contains(@class,'box box-billing-address')]//div/address"/>
25+
<element name="changeBillingAddress" type="button" selector="//div[@class='box box-address-billing']//div[@class='box-actions']//a"/>
26+
<element name="changeShippingAddress" type="button" selector="//div[@class='box box-address-shipping']//div[@class='box-actions']//a"/>
2527
</section>
2628
</sections>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontPanelHeaderSection">
1212
<element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" />
13-
<element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
13+
<element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//div[@class='panel header']//li/a[contains(.,'Create an Account')]" timeout="30"/>
1414
<element name="notYouLink" type="button" selector=".greet.welcome span a"/>
1515
<element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
1616
<element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>

0 commit comments

Comments
 (0)