Skip to content

Commit 87ebf9d

Browse files
serhii-balkoserhii-balko
committed
Merge remote-tracking branch 'origin/MAGETWO-96227' into 2.2-develop-pr17
2 parents e9025e3 + e3fe6d2 commit 87ebf9d

File tree

7 files changed

+92
-7
lines changed

7 files changed

+92
-7
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@
113113
<argument name="website" value="SecondWebsite"/>
114114
</actionGroup>
115115

116+
<!--Flush cache-->
117+
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
118+
116119
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
117120
<waitForPageLoad stepKey="waitForProductsIndexPageToLoad"/>
118121
<actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetProductsGrid"/>
@@ -327,13 +330,12 @@
327330
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
328331

329332
<createData entity="DefaultConfigCatalogPrice" stepKey="resetPriceScopeConfiguration"/>
330-
331-
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
332-
<argument name="websiteName" value="{{SecondWebsite.name}}"/>
333-
</actionGroup>
334333
<actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
335334
<argument name="ruleName" value="ship"/>
336335
</actionGroup>
336+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
337+
<argument name="websiteName" value="{{SecondWebsite.name}}"/>
338+
</actionGroup>
337339
<actionGroup ref="logout" stepKey="logout"/>
338340
</after>
339341
</test>

‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminEditCartPriceRuleActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ChangeCartPriceRuleWebsiteActionGroup">
11+
<arguments>
12+
<argument name="websiteLabel" type="string"/>
13+
</arguments>
14+
<waitForPageLoad stepKey="waitForPriceList"/>
15+
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{websiteLabel}}" stepKey="selectWebsites"/>
16+
<click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/dataProfileSchema.xsd">
1111
<entity name="ApiSalesRule" type="SalesRule">
1212
<data key="name" unique="suffix">salesRule</data>
1313
<data key="description">Sales Rule Descritpion</data>
@@ -113,4 +113,32 @@
113113
<data key="uses_per_coupon">0</data>
114114
<data key="simple_free_shipping">0</data>
115115
</entity>
116+
<entity name="ApiCartRule" type="SalesRule">
117+
<data key="name" unique="suffix">salesRule</data>
118+
<data key="description">Sales Rule Descritpion</data>
119+
<array key="website_ids">
120+
<item>1</item>
121+
</array>
122+
<array key="customer_group_ids">
123+
<item>0</item>
124+
<item>1</item>
125+
<item>3</item>
126+
</array>
127+
<data key="uses_per_customer">0</data>
128+
<data key="is_active">true</data>
129+
<data key="stop_rules_processing">true</data>
130+
<data key="is_advanced">true</data>
131+
<data key="sort_order">0</data>
132+
<data key="simple_action">by_percent</data>
133+
<data key="discount_amount">50</data>
134+
<data key="discount_qty">0</data>
135+
<data key="discount_step">0</data>
136+
<data key="apply_to_shipping">false</data>
137+
<data key="times_used">0</data>
138+
<data key="is_rss">true</data>
139+
<data key="coupon_type">NO_COUPON</data>
140+
<data key="use_auto_generation">false</data>
141+
<data key="uses_per_coupon">0</data>
142+
<data key="simple_free_shipping">0</data>
143+
</entity>
116144
</entities>

‎app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/PageObject.xsd">
10+
<page name="AdminCartPriceRuleEditPage" url="sales_rule/promo_quote/edit/id/{{ruleId}}/" area="admin" module="Magento_SalesRule" parameterized="true"/>
11+
</pages>

‎app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesLimitPage.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/PageObject.xsd">
9+
<page name="AdminCartPriceRulesLimitPage" url="sales_rule/promo_quote/index/limit/{{count}}" area="admin" module="Magento_SalesRule" parameterized="true"/>
10+
</pages>

‎app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/SectionObject.xsd">
1010
<section name="AdminCartPriceRulesSection">
1111
<element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
1212
<element name="messages" type="text" selector=".messages"/>
@@ -15,5 +15,9 @@
1515
<element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
1616
<element name="nameColumns" type="text" selector="td[data-column='name']"/>
1717
<element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
18+
<element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
19+
<element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
20+
<element name="countPages" type="text" selector="//label[@for='promo_quote_grid_page-current']//span"/>
21+
<element name="totalCount" type="text" selector="span[data-ui-id*='grid-total-count']"/>
1822
</section>
1923
</sections>

‎app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/dataProfileSchema.xsd">
1111
<entity name="adminProductInWebsiteRole" type="user_role">
1212
<data key="rolename" unique="suffix">restrictedWebsiteRole</data>
1313
<data key="current_password">123123q</data>
@@ -34,4 +34,16 @@
3434
<data key="rolename" unique="suffix">RoleTest</data>
3535
<data key="current_password">123123q</data>
3636
</entity>
37+
<entity name="adminMarketingInWebsiteRole" type="user_role">
38+
<data key="rolename" unique="suffix">restrictedWebsiteRole</data>
39+
<data key="current_password">123123q</data>
40+
<data key="gws_is_all">0</data>
41+
<array key="gws_websites">
42+
<item>1</item>
43+
</array>
44+
<array key="resource">
45+
<item>Magento_Backend::marketing</item>
46+
<item>Magento_SalesRule::quote</item>
47+
</array>
48+
</entity>
3749
</entities>

0 commit comments

Comments
 (0)