Skip to content

Commit 53216d5

Browse files
committed
MAGETWO-61960: Fails to save configurable product with specific product option
1 parent 2a68f5d commit 53216d5

File tree

1 file changed

+10
-5
lines changed
  • app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin

1 file changed

+10
-5
lines changed

app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/ConfigurableTest.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
4444
protected function setUp()
4545
{
4646
$this->productTypeMock = $this->getMock(
47-
'Magento\ConfigurableProduct\Model\Product\Type\Configurable',
47+
\Magento\ConfigurableProduct\Model\Product\Type\Configurable::class,
4848
[],
4949
[],
5050
'',
5151
false
5252
);
5353
$this->variationHandler = $this->getMock(
54-
'Magento\ConfigurableProduct\Model\Product\VariationHandler',
54+
\Magento\ConfigurableProduct\Model\Product\VariationHandler::class,
5555
[],
5656
[],
5757
'',
5858
false
5959
);
60-
$this->requestMock = $this->getMock('\Magento\Framework\App\Request\Http', [], [], '', false);
60+
$this->requestMock = $this->getMock(\Magento\Framework\App\Request\Http::class, [], [], '', false);
6161
$methods = [
6262
'setNewVariationsAttributeSetId',
6363
'setAssociatedProductIds',
@@ -66,9 +66,9 @@ protected function setUp()
6666
'getResource',
6767
'__wakeup',
6868
];
69-
$this->productMock = $this->getMock('Magento\Catalog\Model\Product', $methods, [], '', false);
69+
$this->productMock = $this->getMock(\Magento\Catalog\Model\Product::class, $methods, [], '', false);
7070
$this->subjectMock = $this->getMock(
71-
'Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper',
71+
\Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::class,
7272
[],
7373
[],
7474
'',
@@ -190,6 +190,11 @@ public function testAfterInitializeForNotConfigurableProduct()
190190
$this->plugin->afterInitialize($this->subjectMock, $this->productMock);
191191
}
192192

193+
/**
194+
* generate product resource model mock
195+
* @param $postValue
196+
* @return \PHPUnit_Framework_MockObject_MockObject
197+
*/
193198
private function getProductResource($postValue)
194199
{
195200
$productResourceMock = $this->getMockBuilder(Product::class)

0 commit comments

Comments
 (0)