forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - magento#18559: [Backport] Covering the AssignOrderToCustomerObserver by Unit Test (by @gelanivishal) - magento#18564: [Backport] Empty option Label should always be blank even if attribute is required (by @gelanivishal) - magento#18556: [Backport] Fixed typo from filed to field (by @gelanivishal) - magento#18554: [Backport] throw exception InvalidArgumentException during validate scheme (by @gelanivishal) - magento#18552: [Backport] Added validation on maximum quantity allowed in shopping cart (by @gelanivishal) - magento#18495: [Backport] Checkout - Fix "Cannot read property 'code' on undefined" issue (by @ihor-sviziev) Fixed GitHub Issues: - magento#14555: Communication's component validator does not propagate exceptions, obscuring the cause of the error (reported by @nikita2206) has been fixed in magento#18554 by @gelanivishal in 2.2-develop branch Related commits: 1. 3109909 2. 9afdfee 3. 791609c 4. beeecaf 5. 7e38326 6. a20968d 7. 2f2cafe 8. 72b31c9 9. a7cdae0 10. 74c6bfd - magento#18477: Set maximum Qty Allowed in Shopping Cart is 0 still allow adding to cart (reported by @duongdiep212) has been fixed in magento#18552 by @gelanivishal in 2.2-develop branch Related commits: 1. db4ac89 - magento#18164: Checkout - Cannot read property 'code' of undefined (reported by @bruno-serfe) has been fixed in magento#18495 by @ihor-sviziev in 2.2-develop branch Related commits: 1. e7f70ab 2. 25e3cfe
- Loading branch information
Showing
8 changed files
with
199 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Sales\Test\Unit\Observer; | ||
|
|
||
| use Magento\Customer\Api\Data\CustomerInterface; | ||
| use Magento\Framework\Event; | ||
| use Magento\Framework\Event\Observer; | ||
| use Magento\Sales\Api\Data\OrderInterface; | ||
| use Magento\Sales\Api\OrderRepositoryInterface; | ||
| use Magento\Sales\Observer\AssignOrderToCustomerObserver; | ||
| use PHPUnit\Framework\TestCase; | ||
| use PHPUnit_Framework_MockObject_MockObject; | ||
|
|
||
| /** | ||
| * Class AssignOrderToCustomerObserverTest | ||
| */ | ||
| class AssignOrderToCustomerObserverTest extends TestCase | ||
| { | ||
| /** @var AssignOrderToCustomerObserver */ | ||
| protected $sut; | ||
|
|
||
| /** @var OrderRepositoryInterface|PHPUnit_Framework_MockObject_MockObject */ | ||
| protected $orderRepositoryMock; | ||
|
|
||
| /** | ||
| * Set Up | ||
| */ | ||
| protected function setUp() | ||
| { | ||
| $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock); | ||
| } | ||
|
|
||
| /** | ||
| * Test assigning order to customer after issuing guest order | ||
| * | ||
| * @dataProvider getCustomerIds | ||
| * @param null|int $customerId | ||
| * @return void | ||
| */ | ||
| public function testAssignOrderToCustomerAfterGuestOrder($customerId) | ||
| { | ||
| $orderId = 1; | ||
| /** @var Observer|PHPUnit_Framework_MockObject_MockObject $observerMock */ | ||
| $observerMock = $this->createMock(Observer::class); | ||
| /** @var Event|PHPUnit_Framework_MockObject_MockObject $eventMock */ | ||
| $eventMock = $this->getMockBuilder(Event::class)->disableOriginalConstructor() | ||
| ->setMethods(['getData']) | ||
| ->getMock(); | ||
| /** @var CustomerInterface|PHPUnit_Framework_MockObject_MockObject $customerMock */ | ||
| $customerMock = $this->createMock(CustomerInterface::class); | ||
| /** @var OrderInterface|PHPUnit_Framework_MockObject_MockObject $orderMock */ | ||
| $orderMock = $this->getMockBuilder(OrderInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
| $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock); | ||
| $eventMock->expects($this->any())->method('getData') | ||
| ->willReturnMap([ | ||
| ['delegate_data', null, ['__sales_assign_order_id' => $orderId]], | ||
| ['customer_data_object', null, $customerMock] | ||
| ]); | ||
| $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId); | ||
| $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId) | ||
| ->willReturn($orderMock); | ||
| if (!$customerId) { | ||
| $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock); | ||
| $this->sut->execute($observerMock); | ||
| return ; | ||
| } | ||
|
|
||
| $this->orderRepositoryMock->expects($this->never())->method('save')->with($orderMock); | ||
| $this->sut->execute($observerMock); | ||
| } | ||
|
|
||
| /** | ||
| * Customer id assigned to order | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getCustomerIds() | ||
| { | ||
| return [[null, 1]]; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Framework\Test\Unit\Communication\Config; | ||
|
|
||
| use Magento\Framework\Communication\Config\Validator; | ||
| use Magento\Framework\Reflection\MethodsMap; | ||
| use Magento\Framework\Reflection\TypeProcessor; | ||
|
|
||
| /** | ||
| * Unit test for \Magento\Framework\Communication\Config\Validator class | ||
| */ | ||
| class ValidatorTest extends \PHPUnit\Framework\TestCase | ||
| { | ||
| /** | ||
| * @var TypeProcessor|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| protected $typeProcessor; | ||
|
|
||
| /** | ||
| * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| protected $methodsMap; | ||
|
|
||
| public function setUp() | ||
| { | ||
| $this->methodsMap = $this->createMock(MethodsMap::class); | ||
|
|
||
| $this->methodsMap->expects(static::any()) | ||
| ->method('getMethodsMap') | ||
| ->will($this->throwException(new \InvalidArgumentException('message', 333))); | ||
|
|
||
| $this->typeProcessor = $this->createMock(TypeProcessor::class); | ||
| $this->typeProcessor->expects(static::any()) | ||
| ->method('isTypeSimple') | ||
| ->willReturn(false); | ||
|
|
||
| $this->typeProcessor->expects(static::any()) | ||
| ->method('isTypeSimple') | ||
| ->willReturn(false); | ||
| } | ||
|
|
||
| /** | ||
| * @expectedException \LogicException | ||
| * @expectedExceptionCode 333 | ||
| * @expectedExceptionMessage Response schema definition has service class with wrong annotated methods | ||
| */ | ||
| public function testValidateResponseSchemaType() | ||
| { | ||
| /** @var Validator $validator */ | ||
| $validator = new Validator($this->typeProcessor, $this->methodsMap); | ||
| $validator->validateResponseSchemaType('123', '123'); | ||
| } | ||
|
|
||
| /** | ||
| * @expectedException \LogicException | ||
| * @expectedExceptionCode 333 | ||
| * @expectedExceptionMessage Request schema definition has service class with wrong annotated methods | ||
| */ | ||
| public function testValidateRequestSchemaType() | ||
| { | ||
| /** @var Validator $validator */ | ||
| $validator = new Validator($this->typeProcessor, $this->methodsMap); | ||
| $validator->validateRequestSchemaType('123', '123'); | ||
| } | ||
| } |