Merge remote-tracking branch 'mainline/2.3-develop' into MC-17868

Author: adifucan

app/code/Magento/Braintree/view/frontend/requirejs-config.js

@@ -6,11 +6,11 @@
 var config = {
     map: {
         '*': {
-            braintreeClient: 'https://js.braintreegateway.com/web/3.46.0-beta-3ds.8/js/client.min.js',
-            braintreeHostedFields: 'https://js.braintreegateway.com/web/3.46.0-beta-3ds.8/js/hosted-fields.min.js',
-            braintreePayPal: 'https://js.braintreegateway.com/web/3.46.0-beta-3ds.8/js/paypal-checkout.min.js',
-            braintree3DSecure: 'https://js.braintreegateway.com/web/3.46.0-beta-3ds.8/js/three-d-secure.min.js',
-            braintreeDataCollector: 'https://js.braintreegateway.com/web/3.46.0-beta-3ds.8/js/data-collector.min.js'
+            braintreeClient: 'https://js.braintreegateway.com/web/3.48.0/js/client.min.js',
+            braintreeHostedFields: 'https://js.braintreegateway.com/web/3.48.0/js/hosted-fields.min.js',
+            braintreePayPal: 'https://js.braintreegateway.com/web/3.48.0/js/paypal-checkout.min.js',
+            braintree3DSecure: 'https://js.braintreegateway.com/web/3.48.0/js/three-d-secure.min.js',
+            braintreeDataCollector: 'https://js.braintreegateway.com/web/3.48.0/js/data-collector.min.js'
         }
     },
     paths: {

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);
     }