Merge remote-tracking branch 'origin/MAGETWO-87467' into PANDA-FIXES-2.2

Author: RuslanKostiv1

app/code/Magento/Tax/Model/ResourceModel/Calculation/Rule.php

@@ -6,7 +6,7 @@
 namespace Magento\Tax\Model\ResourceModel\Calculation;
 
 /**
- * Tax rate resource model
+ * Tax rule resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */

dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php

@@ -102,6 +102,7 @@ protected function _getFixtures($scope, \PHPUnit\Framework\TestCase $test)
      * Execute single fixture script
      *
      * @param string|array $fixture
+     * @throws \Exception
      */
     protected function _applyOneFixture($fixture)
     {
@@ -112,9 +113,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            echo 'Exception occurred when running the '
-            . (is_array($fixture) || is_scalar($fixture) ? json_encode($fixture) : 'callback')
-            . ' fixture: ', PHP_EOL, $e;
+            throw new \Exception(
+                sprintf(
+                    "Exception occurred when running the %s fixture: \n%s",
+                    (\is_array($fixture) || is_scalar($fixture) ? json_encode($fixture) : 'callback'),
+                    $e->getMessage()
+                )
+            );
         }
         $this->_appliedFixtures[] = $fixture;
     }

dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/JsTest.php

@@ -29,23 +29,18 @@ public function testGetAllRatesByProductClassJson()
         /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
         $block = $objectManager->create(\Magento\Catalog\Block\Adminhtml\Product\Edit\Js::class);
         $jsonResult = $block->getAllRatesByProductClassJson();
-        $decodedResult = json_decode($jsonResult);
-        $this->assertNotEmpty($decodedResult, 'Resulting JSON is invalid.');
-        $taxClassesArray = (array)$decodedResult;
+        $this->assertJson($jsonResult, 'Resulting JSON is invalid.');
+        $decodedResult = json_decode($jsonResult, true);
+        $this->assertNotNull($decodedResult, 'Cannot decode resulting JSON.');
         $noneTaxClass = 0;
         $defaultProductTaxClass = 2;
         $expectedProductTaxClasses = array_unique(
             array_merge($fixtureTaxRule->getProductTaxClasses(), [$defaultProductTaxClass, $noneTaxClass])
         );
-        $this->assertCount(
-            count($expectedProductTaxClasses),
-            $taxClassesArray,
-            'Invalid quantity of rates for tax classes.'
-        );
         foreach ($expectedProductTaxClasses as $taxClassId) {
             $this->assertArrayHasKey(
                 "value_{$taxClassId}",
-                $taxClassesArray,
+                $decodedResult,
                 "Rates for tax class with ID '{$taxClassId}' is missing."
             );
         }

dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes.php

@@ -38,6 +38,15 @@
     \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT
 )->save();
 
+// Tax class created but not used in the rule to ensure that unused tax classes are handled properly
+$productTaxClass3 = $objectManager->create(
+    \Magento\Tax\Model\ClassModel::class
+)->setClassName(
+    'ProductTaxClass3'
+)->setClassType(
+    \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT
+)->save();
+
 $taxRate = [
     'tax_country_id' => 'US',
     'tax_region_id' => '12',

dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_rollback.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$taxRules = [
+    'Test Rule',
+    'Test Rule Duplicate',
+];
+$taxClasses = [
+    'ProductTaxClass1',
+    'ProductTaxClass2',
+    'ProductTaxClass3',
+    'CustomerTaxClass1',
+    'CustomerTaxClass2',
+];
+
+
+$taxRuleResource = $objectManager->get(\Magento\Tax\Model\ResourceModel\Calculation\Rule::class);
+foreach ($taxRules as $taxRuleCode) {
+    $taxRule = $objectManager->create(\Magento\Tax\Model\Calculation\Rule::class);
+    $taxRuleResource->load($taxRule, $taxRuleCode, 'code');
+    $taxRuleResource->delete($taxRule);
+}
+
+/** @var \Magento\Tax\Model\ResourceModel\TaxClass $resourceModel */
+$resourceModel = $objectManager->get(\Magento\Tax\Model\ResourceModel\TaxClass::class);
+
+foreach ($taxClasses as $taxClass) {
+    try {
+        /** @var \Magento\Tax\Model\ClassModel $taxClassEntity */
+        $taxClassEntity = $objectManager->create(\Magento\Tax\Model\ClassModel::class);
+        $resourceModel->load($taxClassEntity, $taxClass, 'class_name');
+        $resourceModel->delete($taxClassEntity);
+    } catch (\Magento\Framework\Exception\CouldNotDeleteException $couldNotDeleteException) {
+        // It's okay if the entity already wiped from the database
+    }
+}