MAGETWO-65466: [Backport] - Issue when deleting item from Product options grid containing more than 20 options - for 2.1

Oleksandr Gorkun · Oleksandr Gorkun · commit ef061e68410b · 2017-11-06T16:41:24.000+02:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -293,10 +293,10 @@ private function assembleProductMock($links = [])
             ->method('create')
             ->willReturnMap([
                 [
-                    ['data' => array_merge($optionsData['option2'], ['option_id' => null])],
+                    ['data' => $optionsData['option2']],
                     $customOptionMockClone1->setData($optionsData['option2'])
                 ], [
-                    ['data' => array_merge($optionsData['option3'], ['option_id' => null])],
+                    ['data' => $optionsData['option3']],
                     $customOptionMockClone2->setData($optionsData['option3'])
                 ]
             ]);

Original file line number	Diff line number	Diff line change
`@@ -293,10 +293,10 @@ private function assembleProductMock($links = [])`
`293`	`293`	`->method('create')`
`294`	`294`	`->willReturnMap([`
`295`	`295`	`[`
`296`		`- ['data' => array_merge($optionsData['option2'], ['option_id' => null])],`
	`296`	`+ ['data' => $optionsData['option2']],`
`297`	`297`	`$customOptionMockClone1->setData($optionsData['option2'])`
`298`	`298`	`], [`
`299`		`- ['data' => array_merge($optionsData['option3'], ['option_id' => null])],`
	`299`	`+ ['data' => $optionsData['option3']],`
`300`	`300`	`$customOptionMockClone2->setData($optionsData['option3'])`
`301`	`301`	`]`
`302`	`302`	`]);`