Merge remote-tracking branch 'origin/B2B-2026' into B2B-2069

NadiyaS · NadiyaS · commit 8f7c5119f000 · 2021-11-10T14:58:59.000-06:00
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/HelperTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -315,8 +315,8 @@ private function assertChildProductImages(array $expectedImages): void
                 foreach ($roles as $role) {
                     $this->assertEquals($image, $simpleProduct->getData($role));
                 }
-                $this->assertFileExists(
-                    $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $image)
+                $this->assertTrue(
+                    $this->mediaDirectory->isExist($this->config->getBaseMediaPath() . $image)
                 );
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,8 @@ private function assertChildProductImages(array $expectedImages): void`
`315`	`315`	`foreach ($roles as $role) {`
`316`	`316`	`$this->assertEquals($image, $simpleProduct->getData($role));`
`317`	`317`	`}`
`318`		`- $this->assertFileExists(`
`319`		`- $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $image)`
	`318`	`+ $this->assertTrue(`
	`319`	`+ $this->mediaDirectory->isExist($this->config->getBaseMediaPath() . $image)`
`320`	`320`	`);`
`321`	`321`	`}`
`322`	`322`	`}`