Skip to content

Commit 16f43be

Browse files
jilu1jilu1
committed
MQE-472: resolved array data input in MFTF; updated configurable test.
1 parent 063c74f commit 16f43be

File tree

8 files changed

+78
-17
lines changed

8 files changed

+78
-17
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
<data key="status">1</data>
3232
<required-entity type="product_extension_attribute">EavStockItem</required-entity>
3333
<required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
34-
<!--required-entity type="custom_attribute">CustomAttributeProductUrlKey</required-entity-->
3534
</entity>
3635
<entity name="NewSimpleProduct" type="product">
3736
<data key="price">321.00</data>
3837
</entity>
39-
<entity name="SimpleOne" type="product">
38+
<entity name="SimpleOne" type="product2">
4039
<data key="sku" unique="suffix">SimpleOne</data>
4140
<data key="type_id">simple</data>
4241
<data key="attribute_set_id">4</data>
@@ -45,7 +44,6 @@
4544
<data key="visibility">4</data>
4645
<data key="status">1</data>
4746
<required-entity type="product_extension_attribute">EavStockItem</required-entity>
48-
<!--required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity-->
4947
<required-entity type="custom_attribute">CustomAttributeProductAttribute</required-entity>
5048
</entity>
5149
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
</array>
2828
<array key="custom_attributes">
2929
<value>custom_attribute_array</value>
30-
<value>custom_attribute</value>
3130
</array>
3231
<array key="options">
3332
<value>product_option</value>
@@ -54,7 +53,6 @@
5453
</array>
5554
<array key="custom_attributes">
5655
<value>custom_attribute_array</value>
57-
<value>custom_attribute</value>
5856
</array>
5957
<array key="options">
6058
<value>product_option</value>
@@ -65,4 +63,59 @@
6563
<operation name="deleteProduct" dataType="product" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
6664
<contentType>application/json</contentType>
6765
</operation>
66+
<operation name="CreateProduct2" dataType="product2" type="create" auth="adminOauth" url="/V1/products" method="POST">
67+
<contentType>application/json</contentType>
68+
<object dataType="product2" key="product">
69+
<field key="sku">string</field>
70+
<field key="name">string</field>
71+
<field key="attribute_set_id">integer</field>
72+
<field key="price">integer</field>
73+
<field key="status">integer</field>
74+
<field key="visibility">integer</field>
75+
<field key="type_id">string</field>
76+
<field key="created_at">string</field>
77+
<field key="updated_at">string</field>
78+
<field key="weight">integer</field>
79+
<field key="extension_attributes">product_extension_attribute</field>
80+
<array key="product_links">
81+
<value>product_link</value>
82+
</array>
83+
<array key="custom_attributes">
84+
<value>custom_attribute</value>
85+
</array>
86+
<array key="options">
87+
<value>product_option</value>
88+
</array>
89+
</object>
90+
</operation>
91+
<operation name="UpdateProduct2" dataType="product2" type="update" auth="adminOauth" url="/V1/products/{sku}" method="PUT">
92+
<contentType>application/json</contentType>
93+
<object dataType="product2" key="product">
94+
<field key="id">integer</field>
95+
<field key="sku">string</field>
96+
<field key="name">string</field>
97+
<field key="attribute_set_id">integer</field>
98+
<field key="price">integer</field>
99+
<field key="status">integer</field>
100+
<field key="visibility">integer</field>
101+
<field key="type_id">string</field>
102+
<field key="created_at">string</field>
103+
<field key="updated_at">string</field>
104+
<field key="weight">integer</field>
105+
<field key="extension_attributes">product_extension_attribute</field>
106+
<array key="product_links">
107+
<value>product_link</value>
108+
</array>
109+
<array key="custom_attributes">
110+
<value>custom_attribute</value>
111+
</array>
112+
<array key="options">
113+
<value>product_option</value>
114+
</array>
115+
</object>
116+
<field key="saveOptions">boolean</field>
117+
</operation>
118+
<operation name="deleteProduct2" dataType="product2" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
119+
<contentType>application/json</contentType>
120+
</operation>
68121
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</array>
5959
</object>
6060
</operation>
61-
<operation name="UpdateProductAttribute" dataType="ProductAttribute" type="update" auth="adminOauth" url="/V1/products/attributes/{attributeCode}" method="PUT">
61+
<operation name="UpdateProductAttribute" dataType="ProductAttribute" type="update" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="PUT">
6262
<contentType>application/json</contentType>
6363
<object dataType="ProductAttribute" key="attribute">
6464
<field key="attribute_code">string</field>
@@ -109,7 +109,7 @@
109109
</array>
110110
</object>
111111
</operation>
112-
<operation name="DeleteProductAttribute" dataType="ProductAttribute" type="delete" auth="adminOauth" url="/V1/products/attributes/{attributeCode}" method="DELETE">
112+
<operation name="DeleteProductAttribute" dataType="ProductAttribute" type="delete" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="DELETE">
113113
<contentType>application/json</contentType>
114114
</operation>
115115
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@
1515
<field key="attributeCode">string</field>
1616
<field key="sortOrder">integer</field>
1717
</operation>
18-
<operation name="DeleteProductAttributeFromAttributeSet" dataType="ProductAttributeSet" type="delete" auth="adminOauth" url="/V1/products/attribute-sets/{attributeSetId}/attributes/{attributeCode}" method="DELETE">
18+
<operation name="DeleteProductAttributeFromAttributeSet" dataType="ProductAttributeSet" type="delete" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}/attributes/{attribute_code}" method="DELETE">
19+
<contentType>application/json</contentType>
20+
</operation>
21+
<operation name="GetProductAttributesFromDefaultSet" dataType="DefaultProductAttributeSet1" type="get" auth="adminOauth" url="/V1/products/attribute-sets/4/attributes" method="GET">
22+
<contentType>application/json</contentType>
23+
</operation>
24+
<operation name="GetDefaultProductAttributeSetInfo" dataType="DefaultProductAttributeSet2" type="get" auth="adminOauth" url="/V1/products/attribute-sets/4" method="GET">
1925
<contentType>application/json</contentType>
2026
</operation>
2127
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</object>
2626
</operation>
2727

28-
<operation name="DeleteCoupon" dataType="coupon" type="delete" auth="adminOauth" url="/rest/V1/coupons/{couponId}" method="DELETE">
28+
<operation name="DeleteCoupon" dataType="coupon" type="delete" auth="adminOauth" url="/rest/V1/coupons/{coupon_id}" method="DELETE">
2929
<header param="Content-Type">application/json</header>
3030
</operation>
3131
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
</entity>
2424
<entity name="ConfigurableProductAddChild" type="ConfigurableProductAddChild">
2525
<var key="sku" entityKey="sku" entityType="product" />
26-
<var key="childSku" entityKey="sku" entityType="product"/>
26+
<var key="childSku" entityKey="sku" entityType="product2"/>
2727
</entity>
2828
</config>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateConfigurableProductByApiCest.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,18 @@
5858
<required-entity createDataKey="childProductHandle1"/>
5959
<required-entity createDataKey="baseConfigProductHandle"/>
6060
</createData>
61-
<!--Uncomment this when MQE-472 is fixed-->
62-
<!--createData mergeKey="configProductHandle2" entity="ConfigurableProductAddChild">
61+
<createData mergeKey="configProductHandle2" entity="ConfigurableProductAddChild">
6362
<required-entity createDataKey="childProductHandle2"/>
6463
<required-entity createDataKey="baseConfigProductHandle"/>
65-
</createData-->
64+
</createData>
6665
</before>
66+
<after>
67+
<deleteData mergeKey="d2" createDataKey="childProductHandle1"/>
68+
<deleteData mergeKey="d3" createDataKey="childProductHandle2"/>
69+
<deleteData mergeKey="d7" createDataKey="baseConfigProductHandle"/>
70+
<deleteData mergeKey="d8" createDataKey="categoryHandle"/>
71+
<deleteData mergeKey="d6" createDataKey="productAttributeHandle"/>
72+
</after>
6773
<test name="CreateConfigurableProductByApiTest">
6874
</test>
6975
</cest>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
<createData mergeKey="productHandle" entity="SimpleProduct" >
2323
<required-entity createDataKey="categoryHandle"/>
2424
</createData>
25-
<updateData mergeKey="productHandle" entity="NewSimpleProduct" createDataKey="originalProductHandle">
26-
</updateData>
27-
<updateData mergeKey="update" entity="NewSimpleProduct" createDataKey="productHandle"/>
25+
<updateData mergeKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
2826
</before>
2927
<after>
30-
<deleteData mergeKey="delete" createDataKey="productHandle"/>
28+
<deleteData mergeKey="delete" createDataKey="updateProduct"/>
3129
</after>
3230
<test name="UpdateSimpleProductByApiTest">
3331
</test>

0 commit comments

Comments
 (0)