Merge remote-tracking branch 'origin/bugs' into bugs

Author: irenelagno

app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php

@@ -123,6 +123,7 @@ public function testGetTotalsHtml()
 
     public function testGetConfig()
     {
+        $websiteId = 100;
         $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
 
         $shoppingCartUrl = 'http://url.com/cart';
@@ -139,7 +140,8 @@ public function testGetConfig()
             'removeItemUrl' => $removeItemUrl,
             'imageTemplate' => $imageTemplate,
             'baseUrl' => $baseUrl,
-            'minicartMaxItemsVisible' => 3
+            'minicartMaxItemsVisible' => 3,
+            'websiteId' => 100
         ];
 
         $valueMap = [
@@ -167,6 +169,13 @@ public function testGetConfig()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->willReturn(3);
 
+        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
+        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
+
+        $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
 

app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php

@@ -93,14 +93,15 @@ public function testGetSectionData()
         $productRewrite = [$productId => ['rewrite' => 'product']];
         $itemData = ['item' => 'data'];
         $shortcutButtonsHtml = '<span>Buttons</span>';
+        $websiteId = 100;
 
         $subtotalMock = $this->getMock('\Magento\Framework\DataObject', ['getValue'], [], '', false);
         $subtotalMock->expects($this->once())->method('getValue')->willReturn($subtotalValue);
         $totals = ['subtotal' => $subtotalMock];
 
         $quoteMock = $this->getMock(
             '\Magento\Quote\Model\Quote',
-            ['getTotals', 'getHasError', 'getAllVisibleItems'],
+            ['getTotals', 'getHasError', 'getAllVisibleItems', 'getStore'],
             [],
             '',
             false
@@ -119,6 +120,10 @@ public function testGetSectionData()
         $quoteItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item', ['getProduct', 'getStoreId'], [], '', false);
         $quoteMock->expects($this->once())->method('getAllVisibleItems')->willReturn([$quoteItemMock]);
 
+        $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
         $productMock = $this->getMock(
             '\Magento\Catalog\Model\Product',
             ['isVisibleInSiteVisibility', 'getId', 'setUrlDataObject'],
@@ -166,7 +171,8 @@ public function testGetSectionData()
                 ['item' => 'data']
             ],
             'extra_actions' => '<span>Buttons</span>',
-            'isGuestCheckoutAllowed' => 1
+            'isGuestCheckoutAllowed' => 1,
+            'website_id' => $websiteId
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }
@@ -180,6 +186,7 @@ public function testGetSectionDataWithCompositeProduct()
         $subtotalValue = 200;
         $productId = 10;
         $storeId = 20;
+        $websiteId = 100;
 
         $productRewrite = [$productId => ['rewrite' => 'product']];
         $itemData = ['item' => 'data'];
@@ -190,7 +197,7 @@ public function testGetSectionDataWithCompositeProduct()
 
         $quoteMock = $this->getMock(
             '\Magento\Quote\Model\Quote',
-            ['getTotals', 'getHasError', 'getAllVisibleItems'],
+            ['getTotals', 'getHasError', 'getAllVisibleItems', 'getStore'],
             [],
             '',
             false
@@ -207,6 +214,10 @@ public function testGetSectionDataWithCompositeProduct()
         $quoteMock->expects($this->once())->method('getTotals')->willReturn($totals);
         $quoteMock->expects($this->once())->method('getHasError')->willReturn(false);
 
+        $storeMock = $this->getMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId'], [], '', false);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+
         $this->checkoutCartMock->expects($this->once())->method('getSummaryQty')->willReturn($summaryQty);
         $this->checkoutHelperMock->expects($this->once())
             ->method('formatPrice')
@@ -271,7 +282,8 @@ public function testGetSectionDataWithCompositeProduct()
                 ['item' => 'data']
             ],
             'extra_actions' => '<span>Buttons</span>',
-            'isGuestCheckoutAllowed' => 1
+            'isGuestCheckoutAllowed' => 1,
+            'website_id' => $websiteId
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }