From 2064e2417b53232257a4a49db18980f0d0c34d12 Mon Sep 17 00:00:00 2001
From: Vasilii Burlacu <v.burlacu@atwix.com>
Date: Fri, 19 Oct 2018 22:03:15 +0300
Subject: [PATCH 1/2] Cover \Magento\GiftMessage\Observer\SalesEventQuoteMerge
 with Unit test

---
 .../Observer/SalesEventQuoteMergeTest.php     | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php

diff --git a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
new file mode 100644
index 0000000000000..f82bc01c485e9
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Test\Unit\Observer;
+
+use Magento\GiftMessage\Observer\SalesEventQuoteMerge;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Magento\Framework\Event\Observer;
+use Magento\Quote\Model\Quote;
+
+/**
+ *  SalesEventQuoteMergeTest
+ */
+class SalesEventQuoteMergeTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var SalesEventQuoteMerge
+     */
+    private $salesEventQuoteMerge;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManger = new ObjectManager($this);
+        $this->salesEventQuoteMerge = $objectManger->getObject(SalesEventQuoteMerge::class);
+    }
+
+    /**
+     * @dataProvider dataProviderGiftMessageId
+     *
+     * @param null|int $giftMessageId
+     *
+     * @return void
+     */
+    public function testExecute($giftMessageId): void
+    {
+        $sourceQuoteMock = $this->createPartialMock(Quote::class, ['getGiftMessageId']);
+        $sourceQuoteMock->expects($this->once())
+            ->method('getGiftMessageId')
+            ->willReturn($giftMessageId);
+
+        $targetQuoteMock = $this->createPartialMock(Quote::class, ['setGiftMessageId']);
+
+        if ($giftMessageId) {
+            $targetQuoteMock->expects($this->once())
+                ->method('setGiftMessageId');
+        } else {
+            $targetQuoteMock->expects($this->never())
+                ->method('setGiftMessageId');
+        }
+
+        $observer = $this->createMock(Observer::class);
+        $observer->expects($this->exactly(2))
+            ->method('getData')
+            ->willReturnMap([
+                ['quote', null, $targetQuoteMock],
+                ['source', null, $sourceQuoteMock]
+            ]);
+
+        $this->salesEventQuoteMerge->execute($observer);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderGiftMessageId(): array
+    {
+        return [
+            [null],
+            [1]
+        ];
+    }
+}

From fe600f2d231ef8146837cc6172b8f92e96234ffd Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 22 Oct 2018 15:34:12 +0200
Subject: [PATCH 2/2] Minor code style fixes

---
 .../GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
index f82bc01c485e9..7a3000f7c0743 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventQuoteMergeTest.php
@@ -10,7 +10,7 @@
 
 use Magento\GiftMessage\Observer\SalesEventQuoteMerge;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \Magento\Framework\Event\Observer;
+use Magento\Framework\Event\Observer;
 use Magento\Quote\Model\Quote;
 
 /**