Merge pull request #1195 from magento-troll/TrollPR

MAGETWO-54066: [GITHUB] Invalid event prefix for catalog inventory #4857

Author: rganin

app/code/Magento/CatalogInventory/Model/Stock.php

@@ -32,7 +32,7 @@ class Stock extends AbstractExtensibleModel implements StockInterface
      *
      * @var string
      */
-    protected $eventObject = 'stock';
+    protected $_eventObject = 'stock';
 
     const BACKORDERS_NO = 0;
 

app/code/Magento/CatalogInventory/Model/Stock/Item.php

@@ -43,7 +43,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      *
      * @var string
      */
-    protected $eventObject = 'item';
+    protected $_eventObject = 'item';
 
     /**
      * Store model manager

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php

@@ -477,33 +477,37 @@ public function getQtyIncrementsDataProvider()
      *
      * @param $eventName
      * @param $methodName
+     * @param $objectName
      *
      * @dataProvider eventsDataProvider
      */
-    public function testDispatchEvents($eventName, $methodName)
+    public function testDispatchEvents($eventName, $methodName, $objectName)
     {
         $isCalledWithRightPrefix = 0;
+        $isObjectNameRight = 0;
         $this->eventDispatcher->expects($this->any())->method('dispatch')->with(
             $this->callback(function ($arg) use (&$isCalledWithRightPrefix, $eventName) {
                 $isCalledWithRightPrefix |= ($arg === $eventName);
                 return true;
             }),
-            $this->anything()
+            $this->callback(function ($data) use (&$isObjectNameRight, $objectName) {
+                $isObjectNameRight |= isset($data[$objectName]);
+                return true;
+            })
         );
 
         $this->item->$methodName();
-        $this->assertEquals(
-            1,
-            (int) $isCalledWithRightPrefix,
-            sprintf("Event %s doesn't dispatched", $eventName)
+        $this->assertTrue(
+            ($isCalledWithRightPrefix && $isObjectNameRight),
+            sprintf('Event "%s" with object name "%s" doesn\'t dispatched properly', $eventName, $objectName)
         );
     }
 
     public function eventsDataProvider()
     {
         return [
-            ['cataloginventory_stock_item_save_before', 'beforeSave'],
-            ['cataloginventory_stock_item_save_after', 'afterSave'],
+            ['cataloginventory_stock_item_save_before', 'beforeSave', 'item'],
+            ['cataloginventory_stock_item_save_after', 'afterSave', 'item'],
         ];
     }
 }

app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php

@@ -100,33 +100,37 @@ public function setUp()
      *
      * @param $eventName
      * @param $methodName
+     * @param $objectName
      *
      * @dataProvider eventsDataProvider
      */
-    public function testDispatchEvents($eventName, $methodName)
+    public function testDispatchEvents($eventName, $methodName, $objectName)
     {
         $isCalledWithRightPrefix = 0;
+        $isObjectNameRight = 0;
         $this->eventDispatcher->expects($this->any())->method('dispatch')->with(
             $this->callback(function ($arg) use (&$isCalledWithRightPrefix, $eventName) {
                 $isCalledWithRightPrefix |= ($arg === $eventName);
                 return true;
             }),
-            $this->anything()
+            $this->callback(function ($data) use (&$isObjectNameRight, $objectName) {
+                $isObjectNameRight |= isset($data[$objectName]);
+                return true;
+            })
         );
 
         $this->stockModel->$methodName();
-        $this->assertEquals(
-            1,
-            (int) $isCalledWithRightPrefix,
-            sprintf("Event %s doesn't dispatched", $eventName)
+        $this->assertTrue(
+            ($isCalledWithRightPrefix && $isObjectNameRight),
+            sprintf('Event "%s" with object name "%s" doesn\'t dispatched properly', $eventName, $objectName)
         );
     }
 
     public function eventsDataProvider()
     {
         return [
-            ['cataloginventory_stock_save_before', 'beforeSave'],
-            ['cataloginventory_stock_save_after', 'afterSave'],
+            ['cataloginventory_stock_save_before', 'beforeSave', 'stock'],
+            ['cataloginventory_stock_save_after', 'afterSave', 'stock'],
         ];
     }
 }