Skip to content

Commit 8d8bf01

Browse files
author
Robert He
committed
Merge branch 'master-2.2-develop' into MAGETWO-69137-upgrade_phpunit-2.2-squash
# Conflicts: # app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php # app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ClearProductUrlsObserverTest.php # app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php # app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php # dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php # dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php # lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php # lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php
2 parents b5d3ec6 + a89d82f commit 8d8bf01

File tree

56 files changed

+2358
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2358
-949
lines changed

‎app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use \Magento\Framework\App\ObjectManager;
1212
use \Magento\Bundle\Model\Product\Price as BundlePrice;
1313
use \Magento\Catalog\Model\Product\Type\AbstractType;
14+
use Magento\CatalogImportExport\Model\Import\Product;
1415

1516
/**
1617
* Class Bundle
@@ -173,7 +174,7 @@ protected function parseSelections($rowData, $entityId)
173174
$rowData['bundle_values']
174175
);
175176
$selections = explode(
176-
\Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR,
177+
Product::PSEUDO_MULTI_LINE_SEPARATOR,
177178
$rowData['bundle_values']
178179
);
179180
foreach ($selections as $selection) {
@@ -343,7 +344,7 @@ public function saveData()
343344
$newSku = $this->_entityModel->getNewSku();
344345
while ($bunch = $this->_entityModel->getNextBunch()) {
345346
foreach ($bunch as $rowNum => $rowData) {
346-
$productData = $newSku[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]];
347+
$productData = $newSku[strtolower($rowData[Product::COL_SKU])];
347348
$productIds[] = $productData[$this->getProductEntityLinkField()];
348349
}
349350
$this->deleteOptionsAndSelections($productIds);
@@ -355,7 +356,7 @@ public function saveData()
355356
if (!$this->_entityModel->isRowAllowedToImport($rowData, $rowNum)) {
356357
continue;
357358
}
358-
$productData = $newSku[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]];
359+
$productData = $newSku[strtolower($rowData[Product::COL_SKU])];
359360
if ($this->_type != $productData['type_id']) {
360361
continue;
361362
}

‎app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,11 @@ public function saveDataProvider()
279279
'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],
280280
'allowImport' => true
281281
],
282+
[
283+
'skus' => ['newSku' => ['sku' => ['sku' => 'SKU', 'entity_id' => 3, 'type_id' => 'bundle']]],
284+
'bunch' => ['bundle_values' => 'value1', 'sku' => 'SKU', 'name' => 'name'],
285+
'allowImport' => true
286+
],
282287
[
283288
'skus' => ['newSku' => ['sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'simple']]],
284289
'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],

‎app/code/Magento/CatalogImportExport/Model/Import/Product.php

Lines changed: 89 additions & 70 deletions
Large diffs are not rendered by default.

‎app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public function reloadOldSkus()
113113
*/
114114
public function addNewSku($sku, $data)
115115
{
116+
$sku = strtolower($sku);
116117
$this->newSkus[$sku] = $data;
117118
return $this;
118119
}
@@ -125,6 +126,7 @@ public function addNewSku($sku, $data)
125126
*/
126127
public function setNewSkuData($sku, $key, $data)
127128
{
129+
$sku = strtolower($sku);
128130
if (isset($this->newSkus[$sku])) {
129131
$this->newSkus[$sku][$key] = $data;
130132
}
@@ -138,6 +140,7 @@ public function setNewSkuData($sku, $key, $data)
138140
public function getNewSku($sku = null)
139141
{
140142
if ($sku !== null) {
143+
$sku = strtolower($sku);
141144
return isset($this->newSkus[$sku]) ? $this->newSkus[$sku] : null;
142145
}
143146
return $this->newSkus;
@@ -157,7 +160,7 @@ protected function _getSkus()
157160
}
158161
foreach ($this->productFactory->create()->getProductEntitiesInfo($columns) as $info) {
159162
$typeId = $info['type_id'];
160-
$sku = $info['sku'];
163+
$sku = strtolower($info['sku']);
161164
$oldSkus[$sku] = [
162165
'type_id' => $typeId,
163166
'attr_set_id' => $info['attribute_set_id'],

‎app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
77

88
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
9+
use Magento\CatalogImportExport\Model\Import\Product\SkuProcessor;
910

1011
class SuperProductsSku extends AbstractImportValidator implements RowValidatorInterface
1112
{
1213
/**
13-
* @var \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor
14+
* @var SkuProcessor
1415
*/
1516
protected $skuProcessor;
1617

1718
/**
18-
* @param \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor $skuProcessor
19+
* @param SkuProcessor $skuProcessor
1920
*/
2021
public function __construct(
21-
\Magento\CatalogImportExport\Model\Import\Product\SkuProcessor $skuProcessor
22+
SkuProcessor $skuProcessor
2223
) {
2324
$this->skuProcessor = $skuProcessor;
2425
}
@@ -30,13 +31,14 @@ public function isValid($value)
3031
{
3132
$this->_clearMessages();
3233
$oldSku = $this->skuProcessor->getOldSkus();
33-
if (!empty($value['_super_products_sku']) && (!isset(
34-
$oldSku[$value['_super_products_sku']]
35-
) && $this->skuProcessor->getNewSku($value['_super_products_sku']) === null
36-
)
37-
) {
38-
$this->_addMessages([self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND]);
39-
return false;
34+
if (!empty($value['_super_products_sku'])) {
35+
$superSku = strtolower($value['_super_products_sku']);
36+
if (!isset($oldSku[$superSku])
37+
&& $this->skuProcessor->getNewSku($superSku) === null
38+
) {
39+
$this->_addMessages([self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND]);
40+
return false;
41+
}
4042
}
4143
return true;
4244
}

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/SuperProductsSkuTest.php

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
7+
8+
use Magento\CatalogImportExport\Model\Import\Product\SkuProcessor;
9+
use Magento\CatalogImportExport\Model\Import\Product\Validator\SuperProductsSku;
10+
use PHPUnit_Framework_MockObject_MockObject as Mock;
11+
12+
/**
13+
* Test for SuperProductsSku
14+
*
15+
* @see SuperProductsSku
16+
*/
17+
class SuperProductsSkuTest extends \PHPUnit\Framework\TestCase
18+
{
19+
/**
20+
* @var SkuProcessor|Mock
21+
*/
22+
private $skuProcessorMock;
23+
24+
/**
25+
* @var SuperProductsSku
26+
*/
27+
private $model;
28+
29+
protected function setUp()
30+
{
31+
$this->skuProcessorMock = $this->getMockBuilder(SkuProcessor::class)
32+
->disableOriginalConstructor()
33+
->getMock();
34+
35+
$this->model = new SuperProductsSku($this->skuProcessorMock);
36+
}
37+
38+
/**
39+
* @param array $value
40+
* @param array $oldSkus
41+
* @param bool $hasNewSku
42+
* @param bool $expectedResult
43+
* @dataProvider isValidDataProvider
44+
*/
45+
public function testIsValid(array $value, array $oldSkus, $hasNewSku = false, $expectedResult = true)
46+
{
47+
$this->skuProcessorMock->expects($this->once())
48+
->method('getOldSkus')
49+
->willReturn($oldSkus);
50+
51+
if ($hasNewSku) {
52+
$this->skuProcessorMock->expects($this->once())
53+
->method('getNewSku')
54+
->willReturn('someNewSku');
55+
}
56+
57+
$this->assertEquals($expectedResult, $this->model->isValid($value));
58+
}
59+
60+
/**
61+
* @return array
62+
*/
63+
public function isValidDataProvider()
64+
{
65+
return [
66+
[
67+
[],
68+
[],
69+
],
70+
[
71+
[],
72+
['sku1' => []]
73+
],
74+
[
75+
['_super_products_sku' => 'SKU1'],
76+
['sku2' => []],
77+
false,
78+
false
79+
],
80+
[
81+
['_super_products_sku' => 'SKU1'],
82+
['sku2' => []],
83+
true,
84+
true
85+
],
86+
[
87+
['_super_products_sku' => 'SKU1'],
88+
['sku1' => []],
89+
false,
90+
true
91+
],
92+
];
93+
}
94+
}

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

Lines changed: 2 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ protected function _initSkus()
492492
{
493493
$this->skuProcessor->expects($this->once())->method('setTypeModels');
494494
$this->skuProcessor->expects($this->once())->method('reloadOldSkus')->willReturnSelf();
495-
$this->skuProcessor->expects($this->once())->method('getOldSkus');
495+
$this->skuProcessor->expects($this->once())->method('getOldSkus')->willReturn([]);
496496
return $this;
497497
}
498498

@@ -943,44 +943,6 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
943943
$importProduct->validateRow($rowData, $rowNum);
944944
}
945945

946-
public function testValidateRowValidateExistingProductTypeResetSku()
947-
{
948-
$sku = 'sku';
949-
$rowNum = 0;
950-
$rowData = [
951-
\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
952-
];
953-
$oldSku = [
954-
$sku => [
955-
'type_id' => 'type_id_val',
956-
],
957-
];
958-
$importProduct = $this->createModelMockWithErrorAggregator(['getOptionEntity']);
959-
960-
$this->setPropertyValue($importProduct, '_oldSku', $oldSku);
961-
962-
//suppress option validation
963-
$this->_rewriteGetOptionEntityInImportProduct($importProduct);
964-
//suppress validator
965-
$this->_setValidatorMockInImportProduct($importProduct);
966-
967-
$expectedSku = false;
968-
$newSku = [
969-
'attr_set_code' => 'new_attr_set_code',
970-
'type_id' => 'new_type_id_val',
971-
];
972-
$this->skuProcessor->expects($this->once())->method('getNewSku')->with($expectedSku)->willReturn($newSku);
973-
$this->setPropertyValue($importProduct, 'skuProcessor', $this->skuProcessor);
974-
$productType = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class)
975-
->disableOriginalConstructor()
976-
->getMock();
977-
$this->setPropertyValue($importProduct, '_productTypeModels', [
978-
$newSku['type_id'] => $productType
979-
]);
980-
981-
$importProduct->validateRow($rowData, $rowNum);
982-
}
983-
984946
/**
985947
* @dataProvider validateRowValidateNewProductTypeAddRowErrorCallDataProvider
986948
*/
@@ -1073,110 +1035,13 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
10731035
$importProduct->validateRow($rowData, $rowNum);
10741036
}
10751037

1076-
public function testValidateRowValidateNewProductTypeResetSku()
1077-
{
1078-
$sku = 'sku';
1079-
$rowNum = 0;
1080-
$rowData = [
1081-
\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
1082-
\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
1083-
\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
1084-
];
1085-
1086-
$oldSku = [
1087-
$sku => [
1088-
'type_id' => 'type_id_val',
1089-
],
1090-
];
1091-
$_productTypeModels = [
1092-
$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
1093-
];
1094-
$_attrSetNameToId = [
1095-
$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
1096-
];
1097-
1098-
$importProduct = $this->createModelMockWithErrorAggregator(
1099-
['addRowError', 'getOptionEntity'],
1100-
['isRowInvalid' => false]
1101-
);
1102-
1103-
$this->setPropertyValue($importProduct, '_oldSku', $oldSku);
1104-
$this->setPropertyValue($importProduct, '_productTypeModels', $_productTypeModels);
1105-
$this->setPropertyValue($importProduct, '_attrSetNameToId', $_attrSetNameToId);
1106-
1107-
$this->_rewriteGetOptionEntityInImportProduct($importProduct);//suppress option validation
1108-
$this->_setValidatorMockInImportProduct($importProduct);//suppress validator
1109-
1110-
$expectedSku = false;
1111-
$newSku = [
1112-
'attr_set_code' => 'new_attr_set_code',
1113-
'type_id' => 'new_type_id_val',
1114-
];
1115-
$this->skuProcessor->expects($this->once())->method('getNewSku')->with($expectedSku)->willReturn($newSku);
1116-
$this->setPropertyValue($importProduct, 'skuProcessor', $this->skuProcessor);
1117-
$productType = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class)
1118-
->disableOriginalConstructor()
1119-
->getMock();
1120-
$this->setPropertyValue($importProduct, '_productTypeModels', [
1121-
$newSku['type_id'] => $productType
1122-
]);
1123-
1124-
$importProduct->validateRow($rowData, $rowNum);
1125-
}
1126-
11271038
public function testValidateDefaultScopeNotValidAttributesResetSku()
11281039
{
1129-
$sku = 'sku';
1130-
$rowNum = 0;
1131-
$attrCode = 'code';
1132-
$stringUtilsMock = $this->getMockBuilder(\Magento\Framework\Stdlib\StringUtils::class)
1133-
->setMethods(null)
1134-
->getMock();
1135-
$this->setPropertyValue($this->importProduct, 'string', $stringUtilsMock);
1136-
1137-
$scopeMock = $this->createPartialMock(
1138-
\Magento\CatalogImportExport\Model\Import\Product::class,
1139-
['getRowScope']
1140-
);
1141-
1142-
$colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
1143-
$scopeRowData = [
1144-
$sku => 'sku',
1145-
$colStore => null,
1146-
];
1147-
$scopeResult = \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT;
1148-
$scopeMock->expects($this->any())->method('getRowScope')->with($scopeRowData)->willReturn($scopeResult);
1149-
$oldSku = [
1150-
$sku => [
1151-
'type_id' => 'type_id_val',
1152-
],
1153-
];
1154-
1155-
$this->setPropertyValue($this->importProduct, '_oldSku', $oldSku);
1156-
1157-
$expectedSku = false;
1158-
$newSku = [
1159-
'attr_set_code' => 'new_attr_set_code',
1160-
'type_id' => 'new_type_id_val',
1161-
];
1162-
$this->skuProcessor->expects($this->any())->method('getNewSku')->with($expectedSku)->willReturn($newSku);
1163-
$this->setPropertyValue($this->importProduct, 'skuProcessor', $this->skuProcessor);
1164-
1165-
$attrParams = [
1166-
'type' => 'varchar',
1167-
];
1168-
$attrRowData = [
1169-
'code' => str_repeat(
1170-
'a',
1171-
\Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
1172-
),
1173-
];
1174-
11751040
$this->validator->expects($this->once())->method('isAttributeValid')->willReturn(false);
11761041
$messages = ['validator message'];
11771042
$this->validator->expects($this->once())->method('getMessages')->willReturn($messages);
11781043

1179-
$result = $this->importProduct->isAttributeValid($attrCode, $attrParams, $attrRowData, $rowNum);
1044+
$result = $this->importProduct->isAttributeValid('code', ['attribute params'], ['row data'], 1);
11801045
$this->assertFalse($result);
11811046
}
11821047

0 commit comments

Comments
 (0)