Skip to content

Commit 79dbde9

Browse files
tomreecetomreece
committed
Merge branch 'RE-develop' into RE-develop-pr
2 parents a70dff1 + 656f03a commit 79dbde9

12 files changed

+554
-10
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,25 @@
9494
<data key="used_for_sort_by">true</data>
9595
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
9696
</entity>
97+
<entity name="productAttributeMultiselectTwoOptions" type="ProductAttribute">
98+
<data key="attribute_code" unique="suffix">attribute</data>
99+
<data key="frontend_input">multiselect</data>
100+
<data key="scope">global</data>
101+
<data key="is_required">false</data>
102+
<data key="is_unique">false</data>
103+
<data key="is_searchable">true</data>
104+
<data key="is_visible">true</data>
105+
<data key="is_visible_in_advanced_search">true</data>
106+
<data key="is_visible_on_front">true</data>
107+
<data key="is_filterable">true</data>
108+
<data key="is_filterable_in_search">true</data>
109+
<data key="used_in_product_listing">true</data>
110+
<data key="is_used_for_promo_rules">true</data>
111+
<data key="is_comparable">true</data>
112+
<data key="is_used_in_grid">true</data>
113+
<data key="is_visible_in_grid">true</data>
114+
<data key="is_filterable_in_grid">true</data>
115+
<data key="used_for_sort_by">true</data>
116+
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
117+
</entity>
97118
</entities>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,38 @@
2424
<requiredEntity type="StoreLabel">Option2Store0</requiredEntity>
2525
<requiredEntity type="StoreLabel">Option2Store1</requiredEntity>
2626
</entity>
27+
<entity name="productAttributeOption3" type="ProductAttributeOption">
28+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
29+
<data key="label" unique="suffix">option3</data>
30+
<data key="is_default">false</data>
31+
<data key="sort_order">2</data>
32+
<requiredEntity type="StoreLabel">Option3Store0</requiredEntity>
33+
<requiredEntity type="StoreLabel">Option3Store1</requiredEntity>
34+
</entity>
35+
<entity name="productAttributeOption4" type="ProductAttributeOption">
36+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
37+
<data key="label" unique="suffix">option4</data>
38+
<data key="is_default">false</data>
39+
<data key="sort_order">3</data>
40+
<requiredEntity type="StoreLabel">Option4Store0</requiredEntity>
41+
<requiredEntity type="StoreLabel">Option4Store1</requiredEntity>
42+
</entity>
43+
<entity name="productAttributeOption5" type="ProductAttributeOption">
44+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
45+
<data key="label" unique="suffix">option5</data>
46+
<data key="is_default">false</data>
47+
<data key="sort_order">4</data>
48+
<requiredEntity type="StoreLabel">Option5Store0</requiredEntity>
49+
<requiredEntity type="StoreLabel">Option5Store1</requiredEntity>
50+
</entity>
51+
<entity name="productAttributeOption6" type="ProductAttributeOption">
52+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
53+
<data key="label" unique="suffix">option6</data>
54+
<data key="is_default">false</data>
55+
<data key="sort_order">5</data>
56+
<requiredEntity type="StoreLabel">Option6Store0</requiredEntity>
57+
<requiredEntity type="StoreLabel">Option6Store1</requiredEntity>
58+
</entity>
2759
<entity name="ProductAttributeOptionGetter" type="ProductAttributeOption">
2860
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
2961
</entity>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,19 @@
119119
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
120120
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
121121
</entity>
122+
<entity name="ApiSimpleOneHidden" type="product2">
123+
<data key="sku" unique="suffix">api-simple-product</data>
124+
<data key="type_id">simple</data>
125+
<data key="attribute_set_id">4</data>
126+
<data key="visibility">1</data>
127+
<data key="name" unique="suffix">Api Simple Product</data>
128+
<data key="price">123.00</data>
129+
<data key="urlKey" unique="suffix">api-simple-product</data>
130+
<data key="status">1</data>
131+
<data key="quantity">100</data>
132+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
133+
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
134+
</entity>
122135
<entity name="ApiSimpleTwo" type="product2">
123136
<data key="sku" unique="suffix">api-simple-product-two</data>
124137
<data key="type_id">simple</data>
@@ -132,6 +145,19 @@
132145
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
133146
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
134147
</entity>
148+
<entity name="ApiSimpleTwoHidden" type="product2">
149+
<data key="sku" unique="suffix">api-simple-product-two</data>
150+
<data key="type_id">simple</data>
151+
<data key="attribute_set_id">4</data>
152+
<data key="visibility">1</data>
153+
<data key="name" unique="suffix">Api Simple Product Two</data>
154+
<data key="price">234.00</data>
155+
<data key="urlKey" unique="suffix">api-simple-product-two</data>
156+
<data key="status">1</data>
157+
<data key="quantity">100</data>
158+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
159+
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
160+
</entity>
135161
<entity name="VirtualProduct" type="product">
136162
<data key="sku" unique="suffix">virtualproduct</data>
137163
<data key="type_id">virtual</data>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,36 @@
2424
<data key="store_id">1</data>
2525
<data key="label">option2</data>
2626
</entity>
27+
<entity name="Option3Store0" type="StoreLabel">
28+
<data key="store_id">0</data>
29+
<data key="label">option3</data>
30+
</entity>
31+
<entity name="Option3Store1" type="StoreLabel">
32+
<data key="store_id">1</data>
33+
<data key="label">option3</data>
34+
</entity>
35+
<entity name="Option4Store0" type="StoreLabel">
36+
<data key="store_id">0</data>
37+
<data key="label">option4</data>
38+
</entity>
39+
<entity name="Option4Store1" type="StoreLabel">
40+
<data key="store_id">1</data>
41+
<data key="label">option4</data>
42+
</entity>
43+
<entity name="Option5Store0" type="StoreLabel">
44+
<data key="store_id">0</data>
45+
<data key="label">option5</data>
46+
</entity>
47+
<entity name="Option5Store1" type="StoreLabel">
48+
<data key="store_id">1</data>
49+
<data key="label">option5</data>
50+
</entity>
51+
<entity name="Option6Store0" type="StoreLabel">
52+
<data key="store_id">0</data>
53+
<data key="label">option6</data>
54+
</entity>
55+
<entity name="Option6Store1" type="StoreLabel">
56+
<data key="store_id">1</data>
57+
<data key="label">option6</data>
58+
</entity>
2759
</entities>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!--Create Store view -->
3838
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
3939
<waitForPageLoad stepKey="waitForSystemStorePage"/>
40-
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="clickCreateStoreViewButton"/>
40+
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4141
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4242
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
4343
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11+
<test name="StorefrontInactiveCatalogRuleTest">
12+
<annotations>
13+
<features value="CatalogRule"/>
14+
<stories value="Customer view catalog price rule"/>
15+
<title value="Customer should not see the catalog price rule promotion if status is inactive"/>
16+
<description value="Customer should not see the catalog price rule promotion if status is inactive"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-79"/>
19+
<group value="CatalogRule"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
23+
<createData entity="ApiCategory" stepKey="createCategory"/>
24+
<createData entity="ApiSimpleProduct" stepKey="createProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<actionGroup ref="newCatalogPriceRuleByUI" stepKey="createNewPriceRule"/>
28+
<selectOption selector="{{AdminNewCatalogPriceRule.status}}" userInput="Inactive" stepKey="setInactive"/>
29+
<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
30+
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="seeSuccess"/>
31+
</before>
32+
<after>
33+
<deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
34+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
35+
<amOnPage url="admin/catalog_rule/promo_catalog/" stepKey="goToPriceRulePage"/>
36+
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
37+
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
38+
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
39+
</actionGroup>
40+
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
41+
</after>
42+
43+
<!-- Verify price is not discounted on category page -->
44+
<amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory"/>
45+
<waitForPageLoad stepKey="waitForCategory"/>
46+
<see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="seePrice1"/>
47+
48+
<!-- Verify price is not discounted on the product page -->
49+
<amOnPage url="$$createProduct.sku$$.html" stepKey="goToProduct"/>
50+
<waitForPageLoad stepKey="waitForProduct"/>
51+
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seePrice2"/>
52+
53+
<!-- Verify price is not discounted in the cart -->
54+
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
55+
<waitForPageLoad stepKey="waitForCart"/>
56+
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
57+
<waitForPageLoad stepKey="waitForCheckout"/>
58+
<see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$$createProduct.price$$" stepKey="seePrice3"/>
59+
</test>
60+
</tests>

0 commit comments

Comments
 (0)