MC-18527: Merge release branch into 2.3-develop

- fix webapi tests

Author: krissyhiserote

dev/tests/api-functional/_files/Magento/TestModuleUps/Model/Carrier.php

@@ -7,10 +7,10 @@
 
 namespace Magento\TestModuleUps\Model;
 
-use Magento\Framework\Async\ProxyDeferredFactory;
 use Magento\Framework\HTTP\AsyncClientInterface;
 use Magento\Framework\HTTP\ClientFactory;
 use Magento\Framework\Xml\Security;
+use Magento\Shipping\Model\Rate\Result\ProxyDeferredFactory;
 use Magento\Ups\Helper\Config;
 
 /**

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php

@@ -9,6 +9,11 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Downloadable\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
 
 /**
  * @var \Magento\Catalog\Model\Product $product

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php

@@ -7,6 +7,11 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->removeDomains(['example.com']);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links.php

@@ -9,6 +9,11 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Downloadable\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
 
 /**
  * @var \Magento\Catalog\Model\Product $product

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links_rollback.php

@@ -7,6 +7,11 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->removeDomains(['example.com']);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);