-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jquery-upgrade' of github.com:magento-lynx/magento2ce i…
…nto MC-42049_fix_keydown_and_keyup
- Loading branch information
Showing
58 changed files
with
874 additions
and
135 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
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
163 changes: 163 additions & 0 deletions
163
...igurableProductGraphQl/Test/Unit/Model/Cart/BuyRequest/SuperAttributeDataProviderTest.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,163 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\ConfigurableProductGraphQl\Test\Unit\Model\Cart\BuyRequest; | ||
|
|
||
| use Magento\Catalog\Api\ProductRepositoryInterface; | ||
| use Magento\Catalog\Model\Product; | ||
| use Magento\CatalogInventory\Api\StockStateInterface; | ||
| use Magento\ConfigurableProductGraphQl\Model\Cart\BuyRequest\SuperAttributeDataProvider; | ||
| use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection; | ||
| use Magento\Framework\EntityManager\MetadataPool; | ||
| use Magento\Framework\Stdlib\ArrayManager; | ||
| use Magento\Quote\Model\Quote; | ||
| use Magento\Store\Api\Data\StoreInterface; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * Test for SuperAttributeDataProvider | ||
| */ | ||
| class SuperAttributeDataProviderTest extends TestCase | ||
| { | ||
| /** | ||
| * @var ArrayManager|MockObject | ||
| */ | ||
| private $arrayManager; | ||
|
|
||
| /** | ||
| * @var ProductRepositoryInterface|MockObject | ||
| */ | ||
| private $productRepository; | ||
|
|
||
| /** | ||
| * @var OptionCollection|MockObject | ||
| */ | ||
| private $optionCollection; | ||
|
|
||
| /** | ||
| * @var MetadataPool|MockObject | ||
| */ | ||
| private $metadataPool; | ||
|
|
||
| /** | ||
| * @var StockStateInterface|MockObject | ||
| */ | ||
| private $stockState; | ||
|
|
||
| /** | ||
| * @var SuperAttributeDataProvider|MockObject | ||
| */ | ||
| private $superAttributeDataProvider; | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| protected function setUp(): void | ||
| { | ||
| $this->arrayManager = $this->getMockBuilder(ArrayManager::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
| $this->optionCollection = $this->createMock(OptionCollection::class); | ||
| $this->metadataPool = $this->getMockBuilder(MetadataPool::class) | ||
| ->disableOriginalConstructor() | ||
| ->onlyMethods(['getMetadata']) | ||
| ->addMethods(['getLinkField']) | ||
| ->getMock(); | ||
| $this->stockState = $this->getMockBuilder(StockStateInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->addMethods(['getHasError']) | ||
| ->getMockForAbstractClass(); | ||
|
|
||
| $this->superAttributeDataProvider = new SuperAttributeDataProvider( | ||
| $this->arrayManager, | ||
| $this->productRepository, | ||
| $this->optionCollection, | ||
| $this->metadataPool, | ||
| $this->stockState | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Check that website id is correctly retrieved | ||
| */ | ||
| public function testExecute(): void | ||
| { | ||
| $quoteMock = $this->getMockBuilder(Quote::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| $cartItemData = [ | ||
| 'data' => [ | ||
| 'quantity' => 2.0, | ||
| 'sku' => 'simple1', | ||
| ], | ||
| 'parent_sku' => 'configurable', | ||
| 'model' => $quoteMock, | ||
| ]; | ||
|
|
||
| $this->arrayManager->method('get') | ||
| ->withConsecutive( | ||
| ['parent_sku', $cartItemData], | ||
| ['data/sku', $cartItemData], | ||
| ['data/quantity', $cartItemData], | ||
| ['model', $cartItemData], | ||
| ) | ||
| ->willReturnOnConsecutiveCalls( | ||
| 'configurable', | ||
| 'simple1', | ||
| 2.0, | ||
| $quoteMock, | ||
| ); | ||
|
|
||
| $storeMock = $this->getMockBuilder(StoreInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->addMethods(['getWebsite']) | ||
| ->getMockForAbstractClass(); | ||
| $storeMock->expects($this->once())->method('getWebsiteId')->willReturn(1); | ||
| $storeMock->expects($this->never())->method('getWebsite'); | ||
| $quoteMock->expects($this->atLeastOnce()) | ||
| ->method('getStore') | ||
| ->willReturn($storeMock); | ||
|
|
||
| $productMock = $this->getMockBuilder(Product::class) | ||
| ->disableOriginalConstructor() | ||
| ->onlyMethods(['getId', 'getExtensionAttributes', 'getData']) | ||
| ->addMethods(['getConfigurableProductLinks']) | ||
| ->getMock(); | ||
| $productMock->method('getId') | ||
| ->willReturn(1); | ||
| $productMock->method('getExtensionAttributes') | ||
| ->willReturnSelf(); | ||
| $productMock->method('getConfigurableProductLinks') | ||
| ->willReturn([1]); | ||
| $productMock->method('getData') | ||
| ->willReturn(1); | ||
| $this->productRepository->method('get') | ||
| ->willReturn($productMock); | ||
| $this->stockState->method('checkQuoteItemQty') | ||
| ->willReturnSelf(); | ||
| $this->stockState->method('getHasError') | ||
| ->willReturn(false); | ||
| $this->metadataPool->method('getMetadata') | ||
| ->willReturnSelf(); | ||
| $this->metadataPool->method('getLinkField') | ||
| ->willReturnSelf(); | ||
| $this->optionCollection->method('getAttributesByProductId') | ||
| ->willReturn([ | ||
| [ | ||
| 'attribute_code' => 'code', | ||
| 'attribute_id' => 1, | ||
| 'values' => [['value_index' => 1]], | ||
| ] | ||
| ]); | ||
|
|
||
| $this->assertEquals(['super_attribute' => [1 => 1]], $this->superAttributeDataProvider->execute($cartItemData)); | ||
| } | ||
| } |
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
17 changes: 17 additions & 0 deletions
17
app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetRealtimeModeActionGroup.xml
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,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="CliIndexerSetRealtimeModeActionGroup"> | ||
| <annotations> | ||
| <description>Set indexers to realtime mode.</description> | ||
| </annotations> | ||
|
|
||
| <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeIndexerMode"/> | ||
| </actionGroup> | ||
| </actionGroups> |
17 changes: 17 additions & 0 deletions
17
app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetScheduleModeActionGroup.xml
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,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="CliIndexerSetScheduleModeActionGroup"> | ||
| <annotations> | ||
| <description>Set indexers to schedule mode.</description> | ||
| </annotations> | ||
|
|
||
| <magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setScheduleIndexerMode"/> | ||
| </actionGroup> | ||
| </actionGroups> |
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
Oops, something went wrong.