MAGETWO-33343: Wrong "customer_id" value for GiftMessages created using API service

 - Unit tests fix

Author: Ievgen Shakhsuvarov

dev/tests/unit/testsuite/Magento/GiftMessage/Model/GiftMessageManagerTest.php

@@ -70,7 +70,9 @@ protected function setUp()
                 'getAddressById',
                 'getBillingAddress',
                 'getShippingAddress',
-                '__wakeup'],
+                '__wakeup',
+                'getCustomerId'
+            ],
             [],
             '',
             false);
@@ -114,6 +116,7 @@ protected function setUp()
                 'setSender',
                 'setRecipient',
                 'setMessage',
+                'setCustomerId',
                 'getSender',
                 'getRecipient',
                 'getMessage',
@@ -182,6 +185,7 @@ public function testAddWithSaveMessageIdException()
                     ],
                 ],
         ];
+        $customerId = 42;
 
         $this->messageFactoryMock->expects($this->once())
             ->method('create')
@@ -199,6 +203,11 @@ public function testAddWithSaveMessageIdException()
             ->method('setRecipient')
             ->with('recipient')
             ->will($this->returnValue($this->giftMessageMock));
+        $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->giftMessageMock->expects($this->once())
+            ->method('setCustomerId')
+            ->with($customerId)
+            ->will($this->returnValue($this->giftMessageMock));
         $this->giftMessageMock->expects($this->once())
             ->method('setMessage')
             ->with('message')
@@ -227,6 +236,7 @@ public function testAddWithQuoteAddress()
                 ],
             ],
         ];
+        $customerId = 42;
 
         $this->messageFactoryMock->expects($this->once())
             ->method('create')
@@ -248,6 +258,11 @@ public function testAddWithQuoteAddress()
             ->method('setMessage')
             ->with('message')
             ->will($this->returnValue($this->giftMessageMock));
+        $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->giftMessageMock->expects($this->once())
+            ->method('setCustomerId')
+            ->with($customerId)
+            ->will($this->returnValue($this->giftMessageMock));
         $this->giftMessageMock->expects($this->once())->method('save');
         $this->giftMessageMock->expects($this->once())->method('getId')->will($this->returnValue(33));
         $this->quoteAddressMock->expects($this->once())
@@ -271,6 +286,7 @@ public function testAddWithQuoteAddressItem()
                 ],
             ],
         ];
+        $customerId = 42;
 
         $this->messageFactoryMock->expects($this->once())
             ->method('create')
@@ -296,6 +312,11 @@ public function testAddWithQuoteAddressItem()
             ->method('setMessage')
             ->with('message')
             ->will($this->returnValue($this->giftMessageMock));
+        $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->giftMessageMock->expects($this->once())
+            ->method('setCustomerId')
+            ->with($customerId)
+            ->will($this->returnValue($this->giftMessageMock));
         $this->giftMessageMock->expects($this->once())->method('save');
         $this->giftMessageMock->expects($this->once())->method('getId')->will($this->returnValue(33));
         $this->quoteAddressItemMock->expects($this->once())