MDVA-140: Product images not switching when clicking on swatch

Author: Anna Bukatar

app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php

@@ -390,6 +390,6 @@ protected function getHtmlOutput()
      */
     public function getMediaCallback()
     {
-        return $this->getBaseUrl() . self::MEDIA_CALLBACK_ACTION;
+        return $this->getUrl(self::MEDIA_CALLBACK_ACTION, ['_secure' => $this->getRequest()->isSecure()]);
     }
 }

app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php

@@ -311,7 +311,13 @@ public function testGetJsonSwatchConfigWithoutVisualImageType()
 
     public function testGetMediaCallback()
     {
-        $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('http://magento.com/');
-        $this->assertContains(Configurable::MEDIA_CALLBACK_ACTION, $this->configurable->getMediaCallback());
+        $url = 'http://localhost/' . Configurable::MEDIA_CALLBACK_ACTION;
+
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with(Configurable::MEDIA_CALLBACK_ACTION)
+            ->willReturn($url);
+
+        $this->assertEquals($url, $this->configurable->getMediaCallback());
     }
 }