Skip to content

Commit 2ecc0ee

Browse files
tomreecetomreece
committed
Merge remote-tracking branch 'origin/mtf-eol' into MC-4789
2 parents 683d881 + b63827b commit 2ecc0ee

File tree

105 files changed

+1986
-3131
lines changed

Some content is hidden

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

105 files changed

+1986
-3131
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.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="SetWebsiteCountryOptionsToDefaultActionGroup">
12+
<conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
13+
<waitForElementVisible selector="{{CountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible3"/>
14+
<checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="setToDefault1"/>
15+
<checkOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="setToDefault2"/>
16+
<click selector="{{ContentManagementSection.Save}}" stepKey="saveDefaultConfig"/>
17+
<waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
18+
<see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="CountryOptionsSection">
12+
<element name="allowedCountries" type="select" selector="#general_country_allow"/>
13+
<element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
14+
<element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
15+
<element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
16+
<element name="generalCountryDefault" type="select" selector="#general_country_default"/>
17+
</section>
18+
</sections>

‎app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
*
1818
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1919
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
20+
*
21+
* @deprecated
22+
* @see \Magento\Catalog\Model\Product\Type\Price
2023
*/
2124
class FrontSpecialPrice extends Price
2225
{
@@ -66,6 +69,8 @@ public function __construct(
6669

6770
/**
6871
* @inheritdoc
72+
*
73+
* @deprecated
6974
*/
7075
protected function _applySpecialPrice($product, $finalPrice)
7176
{

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminAddMinimumAdvertisedPriceActionGroup">
10+
<arguments>
11+
<argument name="msrpData" type="entity"/>
12+
</arguments>
13+
<waitForPageLoad stepKey="waitForPageLoad"/>
14+
<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
15+
<waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitSpecialPrice"/>
16+
<fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="{{msrpData.msrp}}" stepKey="fillMinimumAdvertisedPrice"/>
17+
<selectOption selector="{{AdminProductFormAdvancedPricingSection.msrpType}}" userInput="{{msrpData.msrp_display_actual_price_type}}" stepKey="selectPriceType"/>
18+
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
19+
<waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForCloseModalWindow"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,13 @@
289289
<waitForPageLoad stepKey="waitForProductToLoad"/>
290290
<waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
291291
</actionGroup>
292+
293+
<actionGroup name="deleteProductsIfTheyExist">
294+
<conditionalClick selector="{{AdminProductGridSection.multicheckDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="openMulticheckDropdown"/>
295+
<conditionalClick selector="{{AdminProductGridSection.multicheckOption('Select All')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="selectAllProductInFilteredGrid"/>
296+
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
297+
<click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
298+
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
299+
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
300+
</actionGroup>
292301
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,28 @@
167167
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
168168
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
169169
</entity>
170+
<entity name="SimpleProductDisabled" type="product">
171+
<data key="sku" unique="suffix">simple_product_disabled</data>
172+
<data key="type_id">simple</data>
173+
<data key="attribute_set_id">4</data>
174+
<data key="name" unique="suffix">Simple Product Disabled</data>
175+
<data key="price">123.00</data>
176+
<data key="visibility">4</data>
177+
<data key="status">2</data>
178+
<data key="quantity">1001</data>
179+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
180+
</entity>
181+
<entity name="SimpleProductNotVisibleIndividually" type="product">
182+
<data key="sku" unique="suffix">simple_product_not_visible_individually</data>
183+
<data key="type_id">simple</data>
184+
<data key="attribute_set_id">4</data>
185+
<data key="name" unique="suffix">Simple Product Not Visible Individually</data>
186+
<data key="price">123.00</data>
187+
<data key="visibility">1</data>
188+
<data key="status">1</data>
189+
<data key="quantity">1000</data>
190+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
191+
</entity>
170192
<entity name="NewSimpleProduct" type="product">
171193
<data key="price">321.00</data>
172194
</entity>
@@ -446,6 +468,10 @@
446468
<var key="sku" entityType="product" entityKey="sku" />
447469
<requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
448470
</entity>
471+
<entity name="productWithDropdownOption" type="product">
472+
<var key="sku" entityType="product" entityKey="sku" />
473+
<requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>
474+
</entity>
449475
<entity name="ProductWithTextFieldAndAreaOptions" type="product">
450476
<var key="sku" entityType="product" entityKey="sku" />
451477
<requiredEntity type="product_option">ProductOptionField</requiredEntity>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<data key="from">10</data>
1313
<data key="to">100</data>
1414
</entity>
15+
<entity name="ProductPerPage">
16+
<data key="productCount">1</data>
17+
</entity>
1518
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@
8888
<requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle1</requiredEntity>
8989
<requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle2</requiredEntity>
9090
</entity>
91+
<entity name="ProductOptionValueDropdown" type="product_option">
92+
<var key="product_sku" entityType="product" entityKey="sku" />
93+
<data key="title">OptionDropDown</data>
94+
<data key="type">drop_down</data>
95+
<data key="sort_order">4</data>
96+
<data key="is_require">true</data>
97+
<requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown1</requiredEntity>
98+
<requiredEntity type="product_option_value">ProductOptionValueWithSkuDropdown2</requiredEntity>
99+
</entity>
91100
<entity name="ProductOptionRadiobutton" type="product_option">
92101
<var key="product_sku" entityType="product" entityKey="sku" />
93102
<data key="title">OptionRadioButtons</data>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,18 @@
8787
<data key="price_type">percent</data>
8888
<data key="sku">sku_drop_down_row_1</data>
8989
</entity>
90+
<entity name="ProductOptionValueWithSkuDropdown1" type="product_option_value">
91+
<data key="title">ProductOptionValueWithSkuDropdown1</data>
92+
<data key="sort_order">1</data>
93+
<data key="price">10</data>
94+
<data key="price_type">fixed</data>
95+
<data key="sku">product_option_value_sku_dropdown_1_</data>
96+
</entity>
97+
<entity name="ProductOptionValueWithSkuDropdown2" type="product_option_value">
98+
<data key="title">ProductOptionValueWithSkuDropdown2</data>
99+
<data key="sort_order">1</data>
100+
<data key="price">10</data>
101+
<data key="price_type">fixed</data>
102+
<data key="sku">product_option_value_sku_dropdown_2_</data>
103+
</entity>
90104
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,12 @@
5656
<data key="quantity">2</data>
5757
<var key="sku" entityType="product2" entityKey="sku" />
5858
</entity>
59+
<entity name="tierProductPriceDefault" type="catalogTierPrice">
60+
<data key="price">90.00</data>
61+
<data key="price_type">fixed</data>
62+
<data key="website_id">0</data>
63+
<data key="customer_group">ALL GROUPS</data>
64+
<data key="quantity">30</data>
65+
<var key="sku" entityType="product" entityKey="sku" />
66+
</entity>
5967
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
2323
<element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
2424
<element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>
25+
<element name="msrpType" type="select" selector="//select[@name='product[msrp_display_actual_price_type]']" timeout="30"/>
2526
<element name="save" type="button" selector="#save-button"/>
2627
</section>
2728
</sections>

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminGridPageNumberAfterSaveAndCloseActionTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<title value="Checking Catalog grid page number after Save and Close action"/>
15+
<description value="Checking Catalog grid page number after Save and Close action"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MAGETWO-96164"/>
18+
<useCaseId value="MAGETWO-96127"/>
19+
<group value="Catalog"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
23+
<!--Clear product grid-->
24+
<comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
25+
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
26+
<waitForPageLoad stepKey="waitForProductIndexPage"/>
27+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
28+
dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
29+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
30+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteProductIfTheyExist"/>
31+
<createData stepKey="category1" entity="SimpleSubCategory"/>
32+
<createData stepKey="product1" entity="SimpleProduct">
33+
<requiredEntity createDataKey="category1"/>
34+
</createData>
35+
<createData stepKey="category2" entity="SimpleSubCategory"/>
36+
<createData stepKey="product2" entity="SimpleProduct">
37+
<requiredEntity createDataKey="category2"/>
38+
</createData>
39+
</before>
40+
<after>
41+
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
42+
<waitForPageLoad stepKey="waitForProductIndexPage"/>
43+
<click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
44+
<actionGroup ref="adminDataGridDeleteCustomPerPage" stepKey="deleteCustomAddedPerPage">
45+
<argument name="perPage" value="ProductPerPage.productCount"/>
46+
</actionGroup>
47+
<deleteData stepKey="deleteCategory1" createDataKey="category1"/>
48+
<deleteData stepKey="deleteProduct1" createDataKey="product1"/>
49+
<deleteData stepKey="deleteCategory2" createDataKey="category2"/>
50+
<deleteData stepKey="deleteProduct2" createDataKey="product2"/>
51+
<actionGroup ref="logout" stepKey="logout"/>
52+
</after>
53+
<amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
54+
<waitForPageLoad stepKey="waitForProductIndexPage"/>
55+
<actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage">
56+
<argument name="perPage" value="ProductPerPage.productCount"/>
57+
</actionGroup>
58+
<!--Go to the next page and edit the product-->
59+
<comment userInput="Go to the next page and edit the product" stepKey="commentEdiProduct"/>
60+
<click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid"/>
61+
<waitForPageLoad stepKey="waitForPageLoad"/>
62+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
63+
<argument name="product" value="$$product2$$"/>
64+
</actionGroup>
65+
<actionGroup ref="AdminFormSaveAndClose" stepKey="saveAndCloseProduct"/>
66+
<waitForPageLoad stepKey="waitForPageLoad1"/>
67+
<seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid"/>
68+
</test>
69+
</tests>

‎app/code/Magento/Catalog/etc/frontend/di.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,4 @@
120120
<plugin name="catalog_app_action_dispatch_controller_context_plugin"
121121
type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
122122
</type>
123-
<preference for="Magento\Catalog\Model\Product\Type\Price" type="Magento\Catalog\Model\Product\Type\FrontSpecialPrice" />
124123
</config>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<!-- Open the Minicart and check Summary -->
12+
<actionGroup name="StorefrontCheckCartDiscountAndSummaryActionGroup">
13+
<arguments>
14+
<argument name="total" type="string"/>
15+
<argument name="discount" type="string"/>
16+
</arguments>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
<waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
19+
<see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
20+
<wait time="10" stepKey="waitForTotalPrice"/>
21+
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
<element name="productOptionLabel" type="text" selector="//dl[@class='item-options']"/>
4242
<element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
4343
<element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
44+
<element name="emptyCart" selector=".cart-empty" type="text"/>
4445
</section>
4546
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<element name="shippingMethodForm" type="text" selector="#co-shipping-method-form"/>
1515
<element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
1616
<element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
17-
<element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
17+
<element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']" timeout="10"/>
1818
<element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
1919
<element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
2020
<element name="shippingHeading" type="button" selector="#block-shipping-heading"/>

‎app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public function process($path, $value, $scope, $scopeCode)
9090
}
9191

9292
try {
93-
$config = $this->configFactory->create([
93+
$config = $this->configFactory->create(['data' => [
9494
'scope' => $scope,
9595
'scope_code' => $scopeCode,
96-
]);
96+
]]);
9797
$config->setDataByPath($path, $value);
9898
$config->save();
9999
} catch (\Exception $exception) {

‎app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function testProcess($path, $value, $scope, $scopeCode)
103103
$config = $this->createMock(Config::class);
104104
$this->configFactory->expects($this->once())
105105
->method('create')
106-
->with(['scope' => $scope, 'scope_code' => $scopeCode])
106+
->with(['data' => ['scope' => $scope, 'scope_code' => $scopeCode]])
107107
->willReturn($config);
108108
$config->expects($this->once())
109109
->method('setDataByPath')

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,11 @@
2121
<entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
2222
<data key="value">0</data>
2323
</entity>
24+
25+
<entity name="CustomerAccountSharingSystemValue" type="customer_account_sharing_config_inherit">
26+
<requiredEntity type="account_share_scope_inherit">CustomerAccountSharingInherit</requiredEntity>
27+
</entity>
28+
<entity name="CustomerAccountSharingInherit" type="account_share_scope_inherit">
29+
<data key="inherit">true</data>
30+
</entity>
2431
</entities>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,17 @@
216216
<data key="store_id">0</data>
217217
<data key="website_id">0</data>
218218
</entity>
219+
<entity name="Retailer_Customer" type="customer">
220+
<data key="group_id">3</data>
221+
<data key="default_billing">true</data>
222+
<data key="default_shipping">true</data>
223+
<data key="email" unique="prefix">[email protected]</data>
224+
<data key="firstname">John</data>
225+
<data key="lastname">Doe</data>
226+
<data key="fullname">John Doe</data>
227+
<data key="password">pwdTest123!</data>
228+
<data key="store_id">0</data>
229+
<data key="website_id">0</data>
230+
<requiredEntity type="address">US_Address_CA</requiredEntity>
231+
</entity>
219232
</entities>

‎app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,16 @@
1818
</object>
1919
</object>
2020
</operation>
21+
<operation name="CustomerAccountShareConfigInherit" dataType="customer_account_sharing_config_inherit" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
22+
method="POST">
23+
<object key="groups" dataType="customer_account_sharing_config_inherit">
24+
<object key="account_share" dataType="customer_account_sharing_config_inherit">
25+
<object key="fields" dataType="customer_account_sharing_config_inherit">
26+
<object key="scope" dataType="account_share_scope_inherit">
27+
<field key="inherit">boolean</field>
28+
</object>
29+
</object>
30+
</object>
31+
</object>
32+
</operation>
2133
</operations>

0 commit comments

Comments
 (0)