MC-29188: Storefront: Create configurable product on (multiple websites/multiple storeviews)

Author: ysapiga

dev/tests/integration/framework/Magento/TestFramework/Store/ExecuteInStoreContext.php

@@ -29,19 +29,29 @@ public function __construct(StoreManagerInterface $storeManager)
     /**
      * Execute callback in store context
      *
+     * @param null|string|bool|int|StoreInterface $store
      * @param callable $method
      * @param array $arguments
-     * @param null|string|bool|int|StoreInterface $store
-     * @return void
+     * @return mixed
      */
-    public function execute(callable $method, array $arguments, $store = 'default'): void
+    public function execute($store, callable $method, ...$arguments)
     {
+        $storeCode = $store instanceof StoreInterface
+            ? $store->getCode()
+            : $this->storeManager->getStore($store)->getCode();
         $currentStore = $this->storeManager->getStore();
+
         try {
-            $this->storeManager->setCurrentStore($store);
-            $method(...$arguments);
+            if ($currentStore->getCode() !== $storeCode) {
+                $this->storeManager->setCurrentStore($storeCode);
+            }
+            $result = $method(...array_values($arguments));
         } finally {
-            $this->storeManager->setCurrentStore($currentStore);
+            if ($currentStore->getCode() !== $storeCode) {
+                $this->storeManager->setCurrentStore($currentStore);
+            }
         }
+
+        return $result;
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/MultiStoreConfigurableViewOnProductPageTest.php

@@ -75,12 +75,8 @@ protected function setUp()
      */
     public function testMultiStoreLabelView(array $expectedStoreData, array $expectedSecondStoreData): void
     {
-        $this->executeInStoreContext->execute([$this, 'assertProductLabel'], [$expectedStoreData]);
-        $this->executeInStoreContext->execute(
-            [$this, 'assertProductLabel'],
-            [$expectedSecondStoreData],
-            'fixturestore'
-        );
+        $this->executeInStoreContext->execute('default', [$this, 'assertProductLabel'], $expectedStoreData);
+        $this->executeInStoreContext->execute('fixturestore', [$this, 'assertProductLabel'], $expectedSecondStoreData);
     }
 
     /**
@@ -142,11 +138,11 @@ public function assertProductLabel($expectedStoreData): void
     public function testMultiStoreOptionsView(array $expectedProducts, array $expectedSecondStoreProducts): void
     {
         $this->prepareConfigurableProduct('configurable', 'fixture_second_store');
-        $this->executeInStoreContext->execute([$this, 'assertProductConfig'], [$expectedProducts]);
+        $this->executeInStoreContext->execute('default', [$this, 'assertProductConfig'], $expectedProducts);
         $this->executeInStoreContext->execute(
+            'fixture_second_store',
             [$this, 'assertProductConfig'],
-            [$expectedSecondStoreProducts],
-            'fixture_second_store'
+            $expectedSecondStoreProducts
         );
     }
 
@@ -190,7 +186,7 @@ private function prepareConfigurableProduct(string $sku, string $storeCode): voi
         $productToUpdate = $product->getTypeInstance()->getUsedProductCollection($product)
             ->setPageSize(1)->getFirstItem();
         $this->assertNotEmpty($productToUpdate->getData(), 'Configurable product does not have a child');
-        $this->executeInStoreContext->execute([$this, 'setProductDisabled'], [$productToUpdate], $storeCode);
+        $this->executeInStoreContext->execute($storeCode, [$this, 'setProductDisabled'], $productToUpdate);
     }
 
     /**