Merge remote-tracking branch 'origin/MAGETWO-73062' into 2.2-develop-pr36

Author: OlgaVasyltsun

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

@@ -248,10 +248,20 @@ public function getProductWeeeAttributes(
         $round = true
     ) {
         $result = [];
-
-        $websiteId = $this->_storeManager->getWebsite($website)->getId();
+        $websiteId = null;
         /** @var \Magento\Store\Model\Store $store */
-        $store = $this->_storeManager->getWebsite($website)->getDefaultGroup()->getDefaultStore();
+        $store = null;
+        if (!$website) {
+            $store = $product->getStore();
+            if ($store) {
+                $websiteId = $store->getWebsiteId();
+            }
+        }
+        if (!$websiteId) {
+            $websiteObject = $this->_storeManager->getWebsite($website);
+            $websiteId = $websiteObject->getId();
+            $store = $websiteObject->getDefaultGroup()->getDefaultStore();
+        }
 
         $allWeee = $this->getWeeeTaxAttributeCodes($store);
         if (!$allWeee) {

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

@@ -157,13 +157,17 @@ protected function setUp()
     }
 
     /**
-     * test GetProductWeeeAttributes
      * @dataProvider getProductWeeeAttributesDataProvider
      * @param array $weeeTaxCalculationsByEntity
-     * @param array $expectedFptLabel
+     * @param mixed $websitePassed
+     * @param string $expectedFptLabel
+     * @return void
      */
-    public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expectedFptLabel)
-    {
+    public function testGetProductWeeeAttributes(
+        array $weeeTaxCalculationsByEntity,
+        $websitePassed,
+        string $expectedFptLabel
+    ) {
         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
         $website = $this->createMock(\Magento\Store\Model\Website::class);
         $store = $this->createMock(\Magento\Store\Model\Store::class);
@@ -187,28 +191,38 @@ public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expe
             ->method('getAttributeCodesByFrontendType')
             ->willReturn(['0'=>'fpt']);
 
-        $store->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-
-        $product->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-
+        $this->storeManager->expects($this->any())
+            ->method('getWebsite')
+            ->willReturn($website);
         $website->expects($this->any())
             ->method('getId')
-            ->willReturn(1);
+            ->willReturn($websitePassed);
         $website->expects($this->any())
             ->method('getDefaultGroup')
             ->willReturn($group);
-
         $group->expects($this->any())
             ->method('getDefaultStore')
             ->willReturn($store);
+        $store->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
 
-        $this->storeManager->expects($this->any())
-            ->method('getWebsite')
-            ->willReturn($website);
+        if ($websitePassed) {
+            $product->expects($this->never())
+                ->method('getStore')
+                ->willReturn($store);
+        } else {
+            $product->expects($this->once())
+                ->method('getStore')
+                ->willReturn($store);
+            $store->expects($this->once())
+                ->method('getWebsiteId')
+                ->willReturn(1);
+        }
+
+        $product->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
 
         $this->weeeConfig->expects($this->any())
             ->method('isEnabled')
@@ -237,7 +251,7 @@ public function testGetProductWeeeAttributes($weeeTaxCalculationsByEntity, $expe
                 0 => $weeeTaxCalculationsByEntity
             ]);
 
-        $result = $this->model->getProductWeeeAttributes($product, null, null, null, true);
+        $result = $this->model->getProductWeeeAttributes($product, null, null, $websitePassed, true);
         $this->assertTrue(is_array($result));
         $this->assertArrayHasKey(0, $result);
         $obj = $result[0];
@@ -312,7 +326,8 @@ public function getProductWeeeAttributesDataProvider()
                     'frontend_label' => 'fpt_label_frontend',
                     'attribute_code' => 'fpt_code',
                 ],
-                'expectedFptLabel' => 'fpt_label'
+                'websitePassed' => 1,
+                'expectedFptLabel' => 'fpt_label',
             ],
             'store_label_not_defined' => [
                 'weeeTaxCalculationsByEntity' => [
@@ -321,8 +336,19 @@ public function getProductWeeeAttributesDataProvider()
                     'frontend_label' => 'fpt_label_frontend',
                     'attribute_code' => 'fpt_code',
                 ],
-                'expectedFptLabel' => 'fpt_label_frontend'
-            ]
+                'websitePassed' => 1,
+                'expectedFptLabel' => 'fpt_label_frontend',
+            ],
+            'website_not_passed' => [
+                'weeeTaxCalculationsByEntity' => [
+                    'weee_value' => 1,
+                    'label_value' => '',
+                    'frontend_label' => 'fpt_label_frontend',
+                    'attribute_code' => 'fpt_code',
+                ],
+                'websitePassed' => null,
+                'expectedFptLabel' => 'fpt_label_frontend',
+            ],
         ];
     }