@@ -458,20 +458,30 @@ protected function _getSuperAttributes(): array
458
458
public function testSaveData ()
459
459
{
460
460
$ newSkus = array_change_key_case ([
461
- 'configurableskuI22 ' => [$ this ->productEntityLinkField => 1 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
462
- 'testconf2-attr2val1-testattr3v1 ' => [$ this ->productEntityLinkField => 2 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
463
- 'testconf2-attr2val1-testattr30v1 ' => [$ this ->productEntityLinkField => 20 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
464
- 'testconf2-attr2val1-testattr3v2 ' => [$ this ->productEntityLinkField => 3 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
465
- 'testSimple ' => [$ this ->productEntityLinkField => 4 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
466
- 'testSimpleToSkip ' => [$ this ->productEntityLinkField => 5 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
467
- 'configurableskuI22withoutLabels ' => [$ this ->productEntityLinkField => 6 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
468
- 'configurableskuI22withoutVariations ' => [$ this ->productEntityLinkField => 7 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
469
- 'configurableskuI22Duplicated ' => [$ this ->productEntityLinkField => 8 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
470
- 'configurableskuI22BadPrice ' => [$ this ->productEntityLinkField => 9 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
461
+ 'configurableskuI22 ' =>
462
+ [$ this ->productEntityLinkField => 1 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
463
+ 'testconf2-attr2val1-testattr3v1 ' =>
464
+ [$ this ->productEntityLinkField => 2 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
465
+ 'testconf2-attr2val1-testattr30v1 ' =>
466
+ [$ this ->productEntityLinkField => 20 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
467
+ 'testconf2-attr2val1-testattr3v2 ' =>
468
+ [$ this ->productEntityLinkField => 3 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
469
+ 'testSimple ' =>
470
+ [$ this ->productEntityLinkField => 4 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
471
+ 'testSimpleToSkip ' =>
472
+ [$ this ->productEntityLinkField => 5 , 'type_id ' => 'simple ' , 'attr_set_code ' => 'Default ' ],
473
+ 'configurableskuI22withoutLabels ' =>
474
+ [$ this ->productEntityLinkField => 6 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
475
+ 'configurableskuI22withoutVariations ' =>
476
+ [$ this ->productEntityLinkField => 7 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
477
+ 'configurableskuI22Duplicated ' =>
478
+ [$ this ->productEntityLinkField => 8 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
479
+ 'configurableskuI22BadPrice ' =>
480
+ [$ this ->productEntityLinkField => 9 , 'type_id ' => 'configurable ' , 'attr_set_code ' => 'Default ' ],
471
481
]);
472
482
$ this ->_entityModel ->expects ($ this ->any ())
473
- ->method ('getNewSku ' )
474
- ->will ($ this ->returnValue ($ newSkus ));
483
+ ->method ('getNewSku ' )
484
+ ->will ($ this ->returnValue ($ newSkus ));
475
485
476
486
// at(0) is select() call, quoteIdentifier() is invoked at(1) and at(2)
477
487
$ this ->_connection ->expects ($ this ->at (1 ))->method ('quoteIdentifier ' )->with ('m.attribute_id ' )->willReturn ('a ' );
@@ -561,7 +571,7 @@ public function testIsRowValid(array $productData): void
561
571
$ productData ['bad_product ' ][\Magento \CatalogImportExport \Model \Import \Product::COL_ATTR_SET ] => [],
562
572
]);
563
573
// Avoiding errors about attributes not being super
564
- $ this ->setPropertyValue ($ this ->configurable ,'_superAttributes ' , $ productData ['super_attributes ' ]);
574
+ $ this ->setPropertyValue ($ this ->configurable , '_superAttributes ' , $ productData ['super_attributes ' ]);
565
575
566
576
foreach ($ bunch as $ rowData ) {
567
577
$ result = $ this ->configurable ->isRowValid ($ rowData , 0 , !isset ($ this ->_oldSku [$ rowData ['sku ' ]]));
@@ -573,6 +583,7 @@ public function testIsRowValid(array $productData): void
573
583
}
574
584
575
585
/**
586
+ *
576
587
* Data provider for isValidRows test.
577
588
*
578
589
* @return array
@@ -621,8 +632,8 @@ public function getProductDataIsValidRow(): array
621
632
'_attribute_set ' => 'Default ' ,
622
633
'_type ' => 'configurable ' ,
623
634
'_product_websites ' => 'website_1 ' ,
624
- ],
625
- 'super_attributes ' =>
635
+ ],
636
+ 'super_attributes ' =>
626
637
[
627
638
'testattr2 ' => ['options ' => ['attr2val1 ' => 1 ]],
628
639
'testattr3 ' => [
0 commit comments