Skip to content

Commit 960a94f

Browse files
committed
MAGETWO-60483: Catalog broken when all child products of configurable are disabled
- Static test fix;
1 parent a5d64a8 commit 960a94f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ interface SalableResolverInterface
1919
* @return boolean
2020
*/
2121
public function isSalable($salableItem);
22-
}
22+
}

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
6161
protected $price;
6262

6363
/**
64-
* @var \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface | \PHPUnit_Framework_MockObject_MockObject
64+
* @var \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface
65+
* | \PHPUnit_Framework_MockObject_MockObject
6566
*/
6667
private $salableResolverMock;
6768

@@ -98,12 +99,9 @@ protected function setUp()
9899
->disableOriginalConstructor()
99100
->getMock();
100101

101-
$urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
102-
->getMockForAbstractClass();
103-
104-
$store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
105-
->getMockForAbstractClass();
102+
$urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)->getMockForAbstractClass();
106103

104+
$store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
107105
$storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
108106
->setMethods(['getStore', 'getCode'])
109107
->getMockForAbstractClass();

0 commit comments

Comments
 (0)