Merge remote-tracking branch 'magento2/2.3-develop' into MPI-PR-23

Author: viktym

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php

@@ -50,15 +50,17 @@ public function testAddProductIfQuantityIsNotAvailable()
      * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @magentoConfigFixture default_store cataloginventory/item_options/max_sale_qty 5
-     * @expectedException \Exception
-     * @expectedExceptionMessage The most you may purchase is 5.
      */
     public function testAddMoreProductsThatAllowed()
     {
         $sku = 'custom-design-simple-product';
         $quantity = 7;
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
+        $this->expectExceptionMessageRegExp(
+            '/The most you may purchase is 5|The requested qty exceeds the maximum qty allowed in shopping cart/'
+        );
+
         $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
         $this->graphQlMutation($query);
     }