Skip to content

Commit 0294817

Browse files
committed
MAGETWO-87467: Fix modularity of \Magento\Catalog\Block\Adminhtml\Product\Edit\JsTest
1 parent 7366763 commit 0294817

File tree

1 file changed

+4
-9
lines changed
  • dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit

1 file changed

+4
-9
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,18 @@ public function testGetAllRatesByProductClassJson()
2929
/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
3030
$block = $objectManager->create(\Magento\Catalog\Block\Adminhtml\Product\Edit\Js::class);
3131
$jsonResult = $block->getAllRatesByProductClassJson();
32-
$decodedResult = json_decode($jsonResult);
33-
$this->assertNotEmpty($decodedResult, 'Resulting JSON is invalid.');
34-
$taxClassesArray = (array)$decodedResult;
32+
$this->assertJson($jsonResult, 'Resulting JSON is invalid.');
33+
$decodedResult = json_decode($jsonResult, true);
34+
$this->assertNotNull($decodedResult, 'Cannot decode resulting JSON.');
3535
$noneTaxClass = 0;
3636
$defaultProductTaxClass = 2;
3737
$expectedProductTaxClasses = array_unique(
3838
array_merge($fixtureTaxRule->getProductTaxClasses(), [$defaultProductTaxClass, $noneTaxClass])
3939
);
40-
$this->assertCount(
41-
count($expectedProductTaxClasses),
42-
$taxClassesArray,
43-
'Invalid quantity of rates for tax classes.'
44-
);
4540
foreach ($expectedProductTaxClasses as $taxClassId) {
4641
$this->assertArrayHasKey(
4742
"value_{$taxClassId}",
48-
$taxClassesArray,
43+
$decodedResult,
4944
"Rates for tax class with ID '{$taxClassId}' is missing."
5045
);
5146
}

0 commit comments

Comments
 (0)