Merge branch 'MC-20668' into 2.3-develop-com-pr2

Author: IvanPletnyov

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php

@@ -47,9 +47,9 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-        $this->optionRepository = $this->_objectManager->create(ProductCustomOptionRepositoryInterface::class);
-        $this->optionRepositoryFactory = $this->_objectManager->create(ProductCustomOptionInterfaceFactory::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->_objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->optionRepositoryFactory = $this->_objectManager->get(ProductCustomOptionInterfaceFactory::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php

@@ -25,8 +25,6 @@
  * Testing option types: "Area", "File", "Drop-down", "Radio-Buttons",
  * "Checkbox", "Multiple Select", "Date", "Date & Time" and "Time".
  *
- * @magentoAppArea adminhtml
- * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
  */
 class UpdateCustomOptionsTest extends TestCase
@@ -72,11 +70,11 @@ class UpdateCustomOptionsTest extends TestCase
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-        $this->optionRepository = $this->objectManager->create(ProductCustomOptionRepositoryInterface::class);
-        $this->customOptionFactory = $this->objectManager->create(ProductCustomOptionInterfaceFactory::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->customOptionFactory = $this->objectManager->get(ProductCustomOptionInterfaceFactory::class);
         $this->customOptionValueFactory = $this->objectManager
-            ->create(ProductCustomOptionValuesInterfaceFactory::class);
+            ->get(ProductCustomOptionValuesInterfaceFactory::class);
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->currentStoreId = $this->storeManager->getStore()->getId();
         $adminStoreId = $this->storeManager->getStore('admin')->getId();