Magento Auto Sync Merge from: magento / magento2ce / develop

Author: magento-team

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php

@@ -18,7 +18,7 @@ class AssertAuthorizationInCommentsHistory extends AbstractConstraint
     /**
      * Pattern of message about authorized amount in order.
      */
-    const AUTHORIZED_AMOUNT_PATTERN = '/(IPN "Pending" )*Authorized amount of \w*\W{1,2}%s. Transaction ID: "[\w\-]*"/';
+    const AUTHORIZED_AMOUNT_PATTERN = '/(IPN "Pending" )*Authorized amount of .+?%s. Transaction ID: "[\w\-]*"/';
 
     /**
      * Assert that comment about authorized amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php

@@ -19,7 +19,7 @@ class AssertCaptureInCommentsHistory extends AbstractConstraint
     /**
      * Pattern of message about captured amount in order.
      */
-    const CAPTURED_AMOUNT_PATTERN = '/^Captured amount of [\W]{1,2}%s online\. Transaction ID: "[\w\-]*"/';
+    const CAPTURED_AMOUNT_PATTERN = '/^Captured amount of .+?%s online\. Transaction ID: "[\w\-]*"/';
 
     /**
      * Assert that comment about captured amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php

@@ -19,7 +19,7 @@ class AssertRefundInCommentsHistory extends AbstractConstraint
     /**
      * Pattern of message about refunded amount in order.
      */
-    const REFUNDED_AMOUNT_PATTERN = '/^We refunded \w*\W{1,2}%s online. Transaction ID: "[\w\-]*"/';
+    const REFUNDED_AMOUNT_PATTERN = '/^We refunded .+?%s online. Transaction ID: "[\w\-]*"/';
 
     /**
      * Assert that comment about refunded amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Invoice.xml

@@ -62,12 +62,6 @@
                     <item name="comment_text" xsi:type="string">Partial Invoice with changed qty = 0</item>
                 </item>
             </field>
-            <field name="1" xsi:type="array">
-                <item name="form_data" xsi:type="array">
-                    <item name="do_shipment" xsi:type="string">No</item>
-                    <item name="comment_text" xsi:type="string">Partial Invoice to the rest of order items</item>
-                </item>
-            </field>
         </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml

@@ -48,7 +48,6 @@
             <constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
         </variation>
         <variation name="CreateTaxRuleEntityTestVariation4">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
             <data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">withZipRange</data>
             <data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-CA-Rate_1</data>

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml

@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest" summary="Test product url rewrites when it is created in several websites">
         <variation name="CreateSimpleProductEntityWithSeveralWebsites" summary="Create product with several websites and check URL Rewites" ticketId="MAGETWO-27238">
-            <data name="issue" xsi:type="string">MAGETWO-63645: [FT] Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest randomly fails on CI</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="tag" xsi:type="string">stable:no</data>
+            <data name="issue" xsi:type="string">MAGETWO-66532: [FT] Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest randomly fails on Jenkins</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>