Merge remote-tracking branch 'origin/MAGETWO-60377' into 2.3-develop-pr32

zakdma · zakdma · commit 070a715b6b56 · 2018-08-16T12:13:50.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
@@ -16,6 +16,11 @@
  */
 abstract class AbstractAssertWishlistProductDetails extends AbstractAssertForm
 {
+    /**
+     * @inheritdoc
+     */
+    protected $skippedFields = ['sku'];
+
     /**
      * Assert product details.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
@@ -37,15 +37,13 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation5">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation6">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@`
`16`	`16`	`*/`
`17`	`17`	`abstract class AbstractAssertWishlistProductDetails extends AbstractAssertForm`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @inheritdoc`
	`21`	`+ */`
	`22`	`+ protected $skippedFields = ['sku'];`
	`23`	`+`
`19`	`24`	`/**`
`20`	`25`	`* Assert product details.`
`21`	`26`	`*`