Merge branch 'FearlessKiwis-MAGETWO-43189-fpt-based-on-billing-addr' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Author: Robert He

app/code/Magento/Weee/Model/Tax.php

@@ -226,11 +226,12 @@ public function getProductWeeeAttributes(
         /** @var \Magento\Tax\Model\Calculation $calculator */
         $calculator = $this->_calculationFactory->create();
 
+        $customerId = $this->_customerSession->getCustomerId();
         if ($shipping && $shipping->getCountryId()) {
             $customerTaxClass = $shipping->getQuote()->getCustomerTaxClassId();
         } else {
             // if customer logged use it default shipping and billing address
-            if ($customerId = $this->_customerSession->getCustomerId()) {
+            if ($customerId) {
                 $shipping = $this->accountManagement->getDefaultShippingAddress($customerId);
                 $billing = $this->accountManagement->getDefaultBillingAddress($customerId);
                 $customerTaxClass = null;
@@ -251,7 +252,8 @@ public function getProductWeeeAttributes(
             $shipping,
             $billing,
             $customerTaxClass,
-            $store
+            $store,
+            $customerId
         );
         $defaultRateRequest = $calculator->getDefaultRateRequest($store);
 

app/code/Magento/Weee/Test/Unit/Model/TaxTest.php

@@ -110,7 +110,17 @@ protected function setUp()
         $this->calculationFactory = $this->getMock($className, ['create'], [], '', false);
 
         $className = '\Magento\Customer\Model\Session';
-        $this->customerSession = $this->getMock($className, [], [], '', false);
+        $this->customerSession = $this->getMock(
+            $className,
+            ['getCustomerId', 'getDefaultTaxShippingAddress', 'getDefaultTaxBillingAddress', 'getCustomerTaxClassId'],
+            [],
+            '',
+            false
+        );
+        $this->customerSession->expects($this->any())->method('getCustomerId')->willReturn(null);
+        $this->customerSession->expects($this->any())->method('getDefaultTaxShippingAddress')->willReturn(null);
+        $this->customerSession->expects($this->any())->method('getDefaultTaxBillingAddress')->willReturn(null);
+        $this->customerSession->expects($this->any())->method('getCustomerTaxClassId')->willReturn(null);
 
         $className = '\Magento\Customer\Api\AccountManagementInterface';
         $this->accountManagement = $this->getMock($className, [], [], '', false);
@@ -165,11 +175,9 @@ public function testGetProductWeeeAttributes()
         $calculation->expects($this->once())
             ->method('getRateRequest')
             ->willReturn($obj);
-
         $calculation->expects($this->once())
             ->method('getDefaultRateRequest')
             ->willReturn($obj);
-
         $calculation->expects($this->any())
             ->method('getRate')
             ->willReturn('10');
@@ -178,10 +186,6 @@ public function testGetProductWeeeAttributes()
             ->method('getAttributeCodesByFrontendType')
             ->willReturn(['0'=>'fpt']);
 
-        $website->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-
         $store->expects($this->any())
             ->method('getId')
             ->willReturn(1);
@@ -190,6 +194,9 @@ public function testGetProductWeeeAttributes()
             ->method('getId')
             ->willReturn(1);
 
+        $website->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
         $website->expects($this->any())
             ->method('getDefaultGroup')
             ->willReturn($group);