Skip to content

Commit ba41d47

Browse files
imeron2433tomreece
authored andcommitted
MQE-309: [Customizability] Update nested API dependency schema and execution
1 parent 288f345 commit ba41d47

File tree

9 files changed

+23
-39
lines changed

9 files changed

+23
-39
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@
1212
<data key="attribute_code">url_key</data>
1313
<data key="value" unique="suffix">category</data>
1414
</entity>
15+
<entity name="CustomAttributeProductUrlKey" type="custom_attribute">
16+
<data key="attribute_code">url_key</data>
17+
<data key="value" unique="suffix">product</data>
18+
</entity>
19+
<entity name="CustomAttributeCategoryIds" type="custom_attribute_array">
20+
<data key="attribute_code">category_ids</data>
21+
<var key="value" entityType="category" entityKey="id"/>
22+
</entity>
1523
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeProductUrlKeyData.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<data key="status">1</data>
2020
<data key="quantity">100</data>
2121
<required-entity type="product_extension_attribute">EavStockItem</required-entity>
22+
<required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
2223
</entity>
2324
<entity name="SimpleProduct" type="product">
2425
<data key="sku" unique="suffix">SimpleProduct</data>
@@ -29,6 +30,7 @@
2930
<data key="visibility">4</data>
3031
<data key="status">1</data>
3132
<required-entity type="product_extension_attribute">EavStockItem</required-entity>
33+
<required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
3234
<!--required-entity type="custom_attribute">CustomAttributeProductUrlKey</required-entity-->
3335
</entity>
3436
</config>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<value>product_link</value>
2727
</array>
2828
<array key="custom_attributes">
29-
<value>custom_attribute</value>
29+
<value>custom_attribute_array</value>
3030
</array>
3131
<array key="options">
3232
<value>product_option</value>
@@ -52,7 +52,7 @@
5252
<value>product_link</value>
5353
</array>
5454
<array key="custom_attributes">
55-
<value>custom_attribute</value>
55+
<value>custom_attribute_array</value>
5656
</array>
5757
<array key="options">
5858
<value>product_option</value>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontCustomerCheckoutCest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
</annotations>
2020
<before>
2121
<createData entity="SimpleSubCategory" mergeKey="simplecategory"/>
22-
<entity name="categoryLink" type="custom_attribute" mergeKey="categoryLink">
23-
<data key="attribute_code">category_ids</data>
24-
<data key="value">$$simplecategory.id$$</data>
25-
</entity>
2622
<createData entity="SimpleProduct" mergeKey="simpleproduct1">
27-
<required-entity name="categoryLink"/>
23+
<required-entity persistedKey="simplecategory"/>
2824
</createData>
2925
<createData entity="Simple_US_Customer" mergeKey="simpleuscustomer"/>
3026
</before>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Cest/StorefrontGuestCheckoutCest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
</annotations>
2020
<before>
2121
<createData entity="_defaultCategory" mergeKey="createCategory"/>
22-
<entity name="categoryLink" type="custom_attribute" mergeKey="categoryLink">
23-
<data key="attribute_code">category_ids</data>
24-
<data key="value">$$createCategory.id$$</data>
25-
</entity>
2622
<createData entity="_defaultProduct" mergeKey="createProduct">
27-
<required-entity name="categoryLink"/>
23+
<required-entity persistedKey="createCategory"/>
2824
</createData>
2925
</before>
3026
<after>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/custom_attribute-meta.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
<field key="attribute_code">string</field>
1313
<field key="value">string</field>
1414
</operation>
15+
<operation name="CreateCustomAttributeArray" dataType="custom_attribute_array" type="create">
16+
<field key="attribute_code">string</field>
17+
<array key="value">
18+
<value>string</value>
19+
</array>
20+
</operation>
1521
<operation name="UpdateCustomAttribute" dataType="custom_attribute" type="update">
1622
<field key="attribute_code">string</field>
1723
<field key="value">string</field>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Cest/AdminCreateInvoiceCest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
</annotations>
2020
<before>
2121
<createData entity="_defaultCategory" mergeKey="createCategory"/>
22-
<entity name="categoryLink" type="custom_attribute" mergeKey="categoryLink">
23-
<data key="attribute_code">category_ids</data>
24-
<data key="value">$$createCategory.id$$</data>
25-
</entity>
2622
<createData entity="_defaultProduct" mergeKey="createProduct">
27-
<required-entity name="categoryLink"/>
23+
<required-entity persistedKey="createCategory"/>
2824
</createData>
2925
</before>
3026

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/PersistMultipleEntitiesCest.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,11 @@
1515
</annotations>
1616
<before>
1717
<createData entity="simplesubcategory" mergeKey="simplecategory"/>
18-
<entity name="categoryLink" type="custom_attribute" mergeKey="categoryLink">
19-
<data key="attribute_code">category_ids</data>
20-
<data key="value">$$simplecategory.id$$</data>
21-
</entity>
22-
2318
<createData entity="simpleproduct" mergeKey="simpleproduct1">
24-
<required-entity name="categoryLink"/>
19+
<required-entity persistedKey="simplecategory"/>
2520
</createData>
2621
<createData entity="simpleproduct" mergeKey="simpleproduct2">
27-
<required-entity name="categoryLink"/>
22+
<required-entity persistedKey="categoryLink"/>
2823
</createData>
2924
</before>
3025
<after>

0 commit comments

Comments
 (0)