Skip to content

Commit 52b8883

Browse files
sivaschenkosivaschenko
committed
MAGETWO-34305: Support pull requests until merged
1 parent f5ddb29 commit 52b8883

12 files changed

+98
-102
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,16 @@ protected function getSearchGridBlock()
138138
/**
139139
* Get data of tab
140140
*
141-
* @param array|null $fields
141+
* @param array|null $tabFields
142142
* @param SimpleElement|null $element
143143
* @return array
144144
*
145145
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
146146
*/
147-
public function getDataFormTab($fields = null, SimpleElement $element = null)
147+
public function getDataFormTab($tabFields = null, SimpleElement $element = null)
148148
{
149-
$fields = reset($fields);
149+
$fields = reset($tabFields);
150+
$name = key($tabFields);
150151
$formData = [];
151152
if (empty($fields['value'])) {
152153
return $formData;
@@ -184,7 +185,7 @@ public function getDataFormTab($fields = null, SimpleElement $element = null)
184185
);
185186
}
186187
}
187-
$formData[$fields['name']][$keyRoot] = $formDataItem;
188+
$formData[$name][$keyRoot] = $formDataItem;
188189
}
189190

190191
return $formData;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<argument name="severity" xsi:type="string">high</argument>
3232
</arguments>
3333
</type>
34-
<type name="Magento\Catalog\Test\Constraint\AssertCrossSellsProductsSection">
34+
<type name="Magento\Catalog\Test\Constraint\AssertProductCrossSells">
3535
<arguments>
3636
<argument name="severity" xsi:type="string">middle</argument>
3737
</arguments>
@@ -41,7 +41,7 @@
4141
<argument name="severity" xsi:type="string">high</argument>
4242
</arguments>
4343
</type>
44-
<type name="Magento\Catalog\Test\Constraint\AssertNoCrossSellsProductsSection">
44+
<type name="Magento\Catalog\Test\Constraint\AssertProductAbsentCrossSells">
4545
<arguments>
4646
<argument name="severity" xsi:type="string">middle</argument>
4747
</arguments>
@@ -61,7 +61,7 @@
6161
<argument name="severity" xsi:type="string">middle</argument>
6262
</arguments>
6363
</type>
64-
<type name="Magento\Catalog\Test\Constraint\AssertUpSellsProductsSection">
64+
<type name="Magento\Catalog\Test\Constraint\AssertProductUpSells">
6565
<arguments>
6666
<argument name="severity" xsi:type="string">middle</argument>
6767
</arguments>
@@ -71,7 +71,7 @@
7171
<argument name="severity" xsi:type="string">high</argument>
7272
</arguments>
7373
</type>
74-
<type name="Magento\Catalog\Test\Constraint\AssertNoUpSellsProductsSection">
74+
<type name="Magento\Catalog\Test\Constraint\AssertProductAbsentUpSells">
7575
<arguments>
7676
<argument name="severity" xsi:type="string">middle</argument>
7777
</arguments>

‎dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\GiftMessage\Test\TestCase\CheckoutWithGiftMessagesTest">
10-
<variation name="CheckoutWithGiftMessagesTestVariation1" firstConstraint="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage" method="test">
10+
<variation name="CheckoutWithGiftMessagesTestVariation1" firstConstraint="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" method="test">
1111
<data name="products" xsi:type="string">catalogProductSimple::default, catalogProductVirtual::default</data>
1212
<data name="customer/dataSet" xsi:type="string">customer_US</data>
1313
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
@@ -22,10 +22,10 @@
2222
<data name="giftMessage/data/message" xsi:type="string">text_gift_message</data>
2323
<data name="payment/method" xsi:type="string">cashondelivery</data>
2424
<data name="issue" xsi:type="string">Bug: MAGETWO-33079</data>
25-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage" next="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrder"/>
26-
<constraint name="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrder" prev="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" next="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrder"/>
26+
<constraint name="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrder" prev="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
2727
</variation>
28-
<variation name="CheckoutWithGiftMessagesTestVariation2" firstConstraint="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage" method="test">
28+
<variation name="CheckoutWithGiftMessagesTestVariation2" firstConstraint="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" method="test">
2929
<data name="products" xsi:type="string">catalogProductSimple::default, catalogProductVirtual::default</data>
3030
<data name="customer/dataSet" xsi:type="string">customer_US</data>
3131
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
@@ -39,8 +39,8 @@
3939
<data name="giftMessage/data/recipient" xsi:type="string">Jane Doe</data>
4040
<data name="giftMessage/data/message" xsi:type="string">text_gift_message</data>
4141
<data name="payment/method" xsi:type="string">cashondelivery</data>
42-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage" next="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrderItems"/>
43-
<constraint name="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrderItems" prev="Magento\Sales\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
42+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" next="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrderItems"/>
43+
<constraint name="Magento\GiftMessage\Test\Constraint\AssertGiftMessageInFrontendOrderItems" prev="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
4444
</variation>
4545
</testCase>
4646
</config>

‎dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@
99
<testCase name="Magento\Wishlist\Test\TestCase\AddProductToWishlistEntityTest">
1010
<variation name="AddProductToWishlistEntityTestVariation1" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
1111
<data name="product" xsi:type="string">catalogProductSimple::default</data>
12-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
13-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
14-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
12+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
13+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
14+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
1515
</variation>
1616
<variation name="AddProductToWishlistEntityTestVariation2" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
1717
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
18-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
19-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
20-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
18+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
19+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
20+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
2121
</variation>
2222
<variation name="AddProductToWishlistEntityTestVariation3" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
2323
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links</data>
24-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
25-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
26-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
24+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
25+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
26+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
2727
</variation>
2828
<variation name="AddProductToWishlistEntityTestVariation4" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
2929
<data name="product" xsi:type="string">groupedProduct::three_simple_products</data>
30-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
31-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
32-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
30+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
31+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
32+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
3333
</variation>
3434
<variation name="AddProductToWishlistEntityTestVariation5" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
3535
<data name="product" xsi:type="string">configurableProduct::default</data>
36-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
37-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
38-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductIsPresentInWishlist"/>
36+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
37+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
38+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
3939
</variation>
4040
<variation name="AddProductToWishlistEntityTestVariation6" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
4141
<data name="product" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
4242
<data name="issue" xsi:type="string">Bug: MAGETWO-33952</data>
43-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist"/>
44-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
45-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist"/>
43+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist"/>
44+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
45+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist"/>
4646
</variation>
4747
<variation name="AddProductToWishlistEntityTestVariation7" firstConstraint="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" method="test">
4848
<data name="product" xsi:type="string">bundleProduct::bundle_fixed_product</data>
4949
<data name="issue" xsi:type="string">Bug: MAGETWO-33952</data>
50-
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist"/>
51-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist" next="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
52-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Catalog\Test\Constraint\AssertProductDetailsInWishlist"/>
50+
<constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage" next="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist"/>
51+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" next="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
52+
<constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist" prev="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist"/>
5353
</variation>
5454
</testCase>
5555
</config>

0 commit comments

Comments
 (0)