🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #17710: Sales Rule: Add unit tests for model classes (by @dmytro-ch)
 - #17701: Message list component fix: the message type is always error when parameters specified (by @dmytro-ch)


Fixed GitHub Issues:
 - #17700: Message list component: the message type is always error when parameters specified (reported by @dmytro-ch) has been fixed in #17701 by @dmytro-ch in 2.2-develop branch
   Related commits:
     1. d438e9b

Author: magento-engcom-team

app/code/Magento/SalesRule/Test/Unit/Model/CouponGeneratorTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model;
+
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterface;
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
+use Magento\SalesRule\Model\CouponGenerator;
+use Magento\SalesRule\Model\Service\CouponManagementService;
+
+/**
+ * @covers \Magento\SalesRule\Model\CouponGenerator
+ */
+class CouponGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var CouponGenerator
+     */
+    private $couponGenerator;
+
+    /**
+     * @var CouponManagementService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $couponManagementServiceMock;
+
+    /**
+     * @var CouponGenerationSpecInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $generationSpecFactoryMock;
+
+    /**
+     * @var CouponGenerationSpecInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $generationSpecMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->generationSpecFactoryMock = $this->getMockBuilder(CouponGenerationSpecInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+        $this->couponManagementServiceMock = $this->createMock(CouponManagementService::class);
+        $this->generationSpecMock = $this->createMock(CouponGenerationSpecInterface::class);
+        $this->couponGenerator = new CouponGenerator(
+            $this->couponManagementServiceMock,
+            $this->generationSpecFactoryMock
+        );
+    }
+
+    /**
+     * Test beforeSave method
+     *
+     * @return void
+     */
+    public function testBeforeSave()
+    {
+        $expected = ['test'];
+        $this->generationSpecFactoryMock->expects($this->once())->method('create')
+            ->willReturn($this->generationSpecMock);
+        $this->couponManagementServiceMock->expects($this->once())->method('generate')
+            ->with($this->generationSpecMock)->willReturn($expected);
+        $actual = $this->couponGenerator->generateCodes([]);
+        self::assertEquals($expected, $actual);
+    }
+}

app/code/Magento/SalesRule/Test/Unit/Model/Quote/ChildrenValidationLocatorTest.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model\Quote;
+
+use Magento\Catalog\Model\Product;
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
+use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
+use Magento\SalesRule\Model\Quote\ChildrenValidationLocator;
+
+/**
+ * @covers \Magento\SalesRule\Model\Quote\ChildrenValidationLocator
+ */
+class ChildrenValidationLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testable Object
+     *
+     * @var ChildrenValidationLocator
+     */
+    private $childrenValidationLocator;
+
+    /**
+     * @var QuoteItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemMock;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var array
+     */
+    private $productTypeChildrenValidationMap = [
+        'simple' => false,
+        'bundle' => true,
+    ];
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->itemMock = $this->createMock(QuoteItem::class);
+        $this->productMock = $this->createMock(Product::class);
+        $this->childrenValidationLocator = new ChildrenValidationLocator($this->productTypeChildrenValidationMap);
+    }
+
+    /**
+     * Test isChildrenValidationRequired method
+     *
+     * @dataProvider childrenValidationDataProvider
+     *
+     * @param string $typeId
+     * @param bool $isValidationRequired
+     *
+     * @return void
+     */
+    public function testIsChildrenValidationRequired($typeId, $isValidationRequired)
+    {
+        $this->productMock->expects($this->once())->method('getTypeId')->willReturn($typeId);
+        $this->itemMock->expects($this->once())->method('getProduct')->willReturn($this->productMock);
+        $actual = $this->childrenValidationLocator->isChildrenValidationRequired($this->itemMock);
+        $expected = $isValidationRequired;
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function childrenValidationDataProvider()
+    {
+        return [
+            ['simple', $this->productTypeChildrenValidationMap['simple']],
+            ['bundle', $this->productTypeChildrenValidationMap['bundle']],
+            ['configurable', true],
+        ];
+    }
+}

app/code/Magento/Ui/view/frontend/web/js/model/messages.js

@@ -55,7 +55,7 @@ define([
                 return messageObj.parameters.shift();
             });
             this.clear();
-            this.errorMessages.push(message);
+            type.push(message);
 
             return true;
         },