Skip to content

Commit cee3ac1

Browse files
sivaschenkosivaschenko
committed
MAGETWO-34305: Support pull requests until merged
1 parent 0391cdb commit cee3ac1

26 files changed

+63
-63
lines changed

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function getDataFormTab($fields = null, SimpleElement $element = null)
184184
);
185185
}
186186
}
187-
$formData[$fields['attribute_code']][$keyRoot] = $formDataItem;
187+
$formData[$fields['name']][$keyRoot] = $formDataItem;
188188
}
189189

190190
return $formData;

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="AddToCartCrossSellTest">
9+
<testCase name="Magento\Catalog\Test\TestCase\Product\AddToCartCrossSellTest">
1010
<variation name="AddToCartCrossSellTestVariation1" method="test">
1111
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1212
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="NavigateRelatedProductsTest">
9+
<testCase name="Magento\Catalog\Test\TestCase\Product\NavigateRelatedProductsTest">
1010
<variation name="NavigateRelatedProductsTestVariation1" method="test">
1111
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1212
<data name="selectable" xsi:type="string">simple1:yes,simple2:yes,config1:no</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="NavigateUpSellProductsTest">
9+
<testCase name="Magento\Catalog\Test\TestCase\Product\NavigateUpSellProductsTest">
1010
<variation name="NavigateUpSellProductsTestVariation1" method="test">
1111
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1212
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<argument name="severity" xsi:type="string">middle</argument>
4747
</arguments>
4848
</type>
49-
<type name="Magento\Catalog\Test\Constraint\AssertRelatedProductsSection">
49+
<type name="Magento\Catalog\Test\Constraint\AssertProductRelatedProducts">
5050
<arguments>
5151
<argument name="severity" xsi:type="string">middle</argument>
5252
</arguments>
@@ -56,7 +56,7 @@
5656
<argument name="severity" xsi:type="string">high</argument>
5757
</arguments>
5858
</type>
59-
<type name="Magento\Catalog\Test\Constraint\AssertNoRelatedProductsSection">
59+
<type name="Magento\Catalog\Test\Constraint\AssertProductAbsentRelatedProducts">
6060
<arguments>
6161
<argument name="severity" xsi:type="string">middle</argument>
6262
</arguments>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
<data name="productsData" xsi:type="string">catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product</data>
7676
<data name="cart/data/grand_total" xsi:type="string">3249</data>
7777
<data name="issue" xsi:type="string">Bug: MAGETWO-24195</data>
78-
<constraint name="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart" next="Magento\Catalog\Test\Constraint\AssertProductQtyInShoppingCart"/>
79-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductQtyInShoppingCart" next="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" prev="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart"/>
80-
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" next="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" prev="Magento\Catalog\Test\Constraint\AssertProductQtyInShoppingCart"/>
78+
<constraint name="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart" next="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart"/>
79+
<constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" next="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" prev="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart"/>
80+
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" next="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" prev="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart"/>
8181
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" next="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" prev="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart"/>
8282
<constraint name="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" prev="Magento\Checkout\Test\Constraint\AssertCartItemsOptions"/>
8383
</variation>

‎dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="CreateTermEntityTest">
9+
<testCase name="Magento\CheckoutAgreements\Test\TestCase\CreateTermEntityTest">
1010
<variation name="CreateTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
1111
<data name="description" xsi:type="string">Create enabled term entity with text value</data>
1212
<data name="product" xsi:type="string">catalogProductSimple::default</data>

‎dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="DeleteTermEntityTest">
9+
<testCase name="Magento\CheckoutAgreements\Test\TestCase\DeleteTermEntityTest">
1010
<variation name="DeleteTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessDeleteMessage" method="test">
1111
<data name="product" xsi:type="string">catalogProductSimple::default</data>
1212
<data name="agreement/dataSet" xsi:type="string">term_enabled_text</data>

‎dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="UpdateTermEntityTest">
9+
<testCase name="Magento\CheckoutAgreements\Test\TestCase\UpdateTermEntityTest">
1010
<variation name="UpdateTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
1111
<data name="product" xsi:type="string">catalogProductSimple::default</data>
1212
<data name="agreementOrigin/dataSet" xsi:type="string">term_disabled_text</data>

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
<data name="product/data/affected_attribute_set" xsi:type="string">custom_attribute_set_%isolation%</data>
131131
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" next="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
132132
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" next="Magento\Catalog\Test\Constraint\AssertProductInCategory" prev="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
133-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" next="Magento\Configurable\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
134-
<constraint name="Magento\Configurable\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInCategory"/>
133+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" next="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
134+
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInCategory"/>
135135
</variation>
136136
<variation name="CreateConfigurableProductEntityTestVariation6" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" method="test">
137137
<data name="description" xsi:type="string">MAGETWO-13361: Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)</data>
@@ -151,10 +151,10 @@
151151
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">-</data>
152152
<data name="product/data/affected_attribute_set" xsi:type="string">custom_attribute_set_%isolation%</data>
153153
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
154-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" next="Magento\Configurable\Test\Constraint\AssertConfigurableProductForm"/>
155-
<constraint name="Magento\Configurable\Test\Constraint\AssertConfigurableProductForm" next="Magento\Catalog\Test\Constraint\AssertProductInCategory" prev="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
156-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" next="Magento\Configurable\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Configurable\Test\Constraint\AssertConfigurableProductForm"/>
157-
<constraint name="Magento\Configurable\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInCategory"/>
154+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" next="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductForm"/>
155+
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductForm" next="Magento\Catalog\Test\Constraint\AssertProductInCategory" prev="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
156+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" next="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" prev="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductForm"/>
157+
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" prev="Magento\Catalog\Test\Constraint\AssertProductInCategory"/>
158158
</variation>
159159
</testCase>
160160
</config>

0 commit comments

Comments
 (0)