Merge remote-tracking branch 'austin/MAGETWO-70603' into bugs

Author: irenelagno

app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php

@@ -119,9 +119,7 @@ public function getConfig()
         $configuration['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $configuration['formKey'] = $this->formKey->getFormKey();
         $store = $this->storeManager->getStore();
-        $configuration['baseUrl'] = $store->isFrontUrlSecure()
-                ? $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)
-                : $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, false);
+        $configuration['baseUrl'] = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK);
         return $configuration;
     }
 

app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php

@@ -104,7 +104,7 @@ public function testGetConfig()
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
-            ['isFrontUrlSecure', 'getBaseUrl', 'getCode']
+            ['getBaseUrl', 'getCode']
         );
         $quoteMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote::class,
@@ -142,8 +142,7 @@ public function testGetConfig()
             ->willReturn($isCustomerLoggedIn);
         $this->formKeyMock->expects($this->once())->method('getFormKey')->willReturn($formKey);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->once())->method('isFrontUrlSecure')->willReturn($isFrontUrlSecure);
-        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK, $isFrontUrlSecure)
+        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK)
             ->willReturn($baseUrl);
 
         $expectedResult = [