Skip to content

Commit f7d801b

Browse files
author
Your Name
committed
Merge remote-tracking branch 'origin/MAGETWO-96246' into 2.2-develop-mftf-pr11
# Conflicts: # app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
2 parents a1c7584 + a5c5bc9 commit f7d801b

File tree

9 files changed

+141
-1
lines changed

9 files changed

+141
-1
lines changed

‎app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
12+
<requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
13+
</entity>
14+
<entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
15+
<data key="value">0</data>
16+
</entity>
17+
18+
<entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
19+
<requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
20+
</entity>
21+
<entity name="WebUrlOptionsYes" type="url_use_store_value">
22+
<data key="value">1</data>
23+
</entity>
24+
</entities>

‎app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
10+
<operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
11+
method="POST" successRegex="/messages-message-success/" returnRegex="">
12+
<object key="groups" dataType="web_url_use_store">
13+
<object key="url" dataType="web_url_use_store">
14+
<object key="fields" dataType="web_url_use_store">
15+
<object key="use_store" dataType="url_use_store_value">
16+
<field key="value">string</field>
17+
</object>
18+
</object>
19+
</object>
20+
</object>
21+
</operation>
22+
</operations>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="CustomerAccountSharingDefault" type="customer_account_sharing_config">
12+
<requiredEntity type="account_share_scope_value">CustomerAccountSharingPerWebsite</requiredEntity>
13+
</entity>
14+
<entity name="CustomerAccountSharingPerWebsite" type="account_share_scope_value">
15+
<data key="value">1</data>
16+
</entity>
17+
18+
<entity name="CustomerAccountSharingGlobal" type="customer_account_sharing_config">
19+
<requiredEntity type="account_share_scope_value">GlobalCustomerAccountSharing</requiredEntity>
20+
</entity>
21+
<entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
22+
<data key="value">0</data>
23+
</entity>
24+
</entities>

‎app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
9+
<operation name="CustomerAccountShareConfig" dataType="customer_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
10+
successRegex="/messages-message-success/" returnRegex="" method="POST">
11+
<object key="groups" dataType="customer_account_sharing_config">
12+
<object key="account_share" dataType="customer_account_sharing_config">
13+
<object key="fields" dataType="customer_account_sharing_config">
14+
<object key="scope" dataType="account_share_scope_value">
15+
<field key="value">string</field>
16+
</object>
17+
</object>
18+
</object>
19+
</object>
20+
</operation>
21+
</operations>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,18 @@
2323
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
2424
<see userInput="You saved the website." stepKey="seeSavedMessage" />
2525
</actionGroup>
26+
27+
<!--Get Website_id-->
28+
<actionGroup name="AdminGetWebsiteIdActionGroup">
29+
<arguments>
30+
<argument name="website"/>
31+
</arguments>
32+
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
33+
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
34+
<fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
35+
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
36+
<see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
37+
<click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
38+
<grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
39+
</actionGroup>
2640
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="ProductAssignToWebsite" type="product_website_link">
12+
<var key="sku" entityKey="sku" entityType="product"/>
13+
</entity>
14+
</entities>

‎app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<data key="name" unique="suffix">website</data>
1717
<data key="code" unique="suffix">website</data>
1818
<data key="sort_order">2</data>
19+
<data key="store_action">add</data>
20+
<data key="store_type">website</data>
21+
<data key="website_id">null</data>
1922
</entity>
2023
<entity name="SecondWebsite" type="website">
2124
<data key="name" unique="suffix">Second Website </data>

‎app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
11+
<operation name="ProductWebsiteLink" dataType="product_website_link" type="create" auth="adminOauth" url="/V1/products/{sku}/websites" method="POST">
12+
<contentType>application/json</contentType>
13+
<object dataType="product_website_link" key="productWebsiteLink">
14+
<field key="sku">string</field>
15+
<field key="websiteId">integer</field>
16+
</object>
17+
</operation>
18+
</operations>

‎app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<page name="StorefrontStoreHomePage" url="/{{store_view}}/" area="storefront" module="Magento_Store" parameterized="true">
1010
<section name="StorefrontHeaderSection"/>
1111
</page>
12-
</pages>
12+
</pages>

0 commit comments

Comments
 (0)