Merge remote-tracking branch 'origin/ACP2E-3763' into PR_2025_05_16

Author: katmoon

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/CustomOptionsTest.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import\ProductTest;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\CatalogImportExport\Model\Import\ProductTestBase;
+use Magento\ImportExport\Model\Import;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
+ * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
+ */
+class CustomOptionsTest extends ProductTestBase
+{
+    /**
+     * Test for custom options based on AC-3637
+     *
+     * @dataProvider productsWithCustomOptionsDataProvider
+     * @param string $filename
+     * @param string $sku
+     * @param int $numOfCustomOptions
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     *
+     * @return void
+     */
+    public function testImportDifferentCustomOptions(string $filename, string $sku, int $numOfCustomOptions): void
+    {
+        $pathToFile = __DIR__ . '/../_files/' . $filename;
+        $importModel = $this->createImportModel($pathToFile, Import::BEHAVIOR_ADD_UPDATE);
+        $errors = $importModel->validateData();
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $importModel->importData();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+
+        $this->assertInstanceOf(Product::class, $product);
+        $options = $product->getOptionInstance()->getProductOptions($product);
+        $this->assertCount($numOfCustomOptions, $options);
+
+        try {
+            $this->productRepository->delete($product);
+        } catch (NoSuchEntityException $e) {
+            //already deleted
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public static function productsWithCustomOptionsDataProvider(): array
+    {
+        return [
+            [
+                'filename' => '001_simple1_no_custom_options.csv',
+                'sku' => 'simple1',
+                'numOfCustomOptions' => 0,
+            ],
+            [
+                'filename' => '002_simple1_4_custom_options.csv',
+                'sku' => 'simple1',
+                'numOfCustomOptions' => 4,
+            ],
+            [
+                'filename' => '003_simple1_5_custom_options.csv',
+                'sku' => 'simple1',
+                'numOfCustomOptions' => 5,
+            ],
+            [
+                'filename' => '004_simple1_5_custom_options_1_updated.csv',
+                'sku' => 'simple1',
+                'numOfCustomOptions' => 5,
+            ],
+            [
+                'filename' => '005_simple1_no_custom_options.csv',
+                'sku' => 'simple1',
+                'numOfCustomOptions' => 0,
+            ],
+        ];
+    }
+}

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved
  */
 declare(strict_types=1);
 

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/001_simple1_no_custom_options.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+simple1,,Default,simple,"Default Category/cat1",base,simple1,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple1,simple1,simple1,"simple1 ",,,,,,,,,"5/20/21, 12:03 AM","5/20/21, 12:03 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,"gift_wrapping_available=Use config",1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,,,

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/002_simple1_4_custom_options.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+simple1,,Default,simple,"Default Category/cat1",base,simple1,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple1,simple1,simple1,"simple1 ",,,,,,,,,"5/20/21, 12:03 AM","5/20/21, 12:15 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,"gift_wrapping_available=Use config",1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,0,1,,,,,,,,,,"name=Option1,type=drop_down,required=1,price=11.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value11|name=Option1,type=drop_down,required=1,price=12.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value12|name=Option2,type=drop_down,required=1,price=21.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value21|name=Option2,type=drop_down,required=1,price=22.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value22|name=Option3,type=drop_down,required=1,price=31.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value31|name=Option3,type=drop_down,required=1,price=32.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value32|name=Option4,type=drop_down,required=1,price=41.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value41|name=Option4,type=drop_down,required=1,price=42.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value42",,,,,,,,,,,

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/003_simple1_5_custom_options.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+simple1,,Default,simple,"Default Category/cat1",base,simple1,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple1,simple1,simple1,"simple1 ",,,,,,,,,"5/20/21, 12:03 AM","5/20/21, 12:15 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,"gift_wrapping_available=Use config",1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,0,1,,,,,,,,,,"name=Option1,type=drop_down,required=1,price=11.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value11|name=Option1,type=drop_down,required=1,price=12.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value12|name=Option2,type=drop_down,required=1,price=21.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value21|name=Option2,type=drop_down,required=1,price=22.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value22|name=Option3,type=drop_down,required=1,price=31.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value31|name=Option3,type=drop_down,required=1,price=32.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value32|name=Option4,type=drop_down,required=1,price=41.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value41|name=Option4,type=drop_down,required=1,price=42.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value42|name=Option5,type=drop_down,required=1,price=51.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value51|name=Option5,type=drop_down,required=1,price=52.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value52",,,,,,,,,,,

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/004_simple1_5_custom_options_1_updated.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+simple1,,Default,simple,"Default Category/cat1",base,simple1,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple1,simple1,simple1,"simple1 ",,,,,,,,,"5/20/21, 12:03 AM","5/20/21, 12:15 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,"gift_wrapping_available=Use config",1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,0,1,,,,,,,,,,"name=Option1,type=drop_down,required=1,price=11.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value11|name=Option1,type=drop_down,required=1,price=12.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value12|name=Option2,type=drop_down,required=1,price=21.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value21|name=Option2,type=drop_down,required=1,price=22.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value22|name=Option3,type=drop_down,required=1,price=31.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value31|name=Option3,type=drop_down,required=1,price=32.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value32|name=Option4,type=drop_down,required=1,price=41.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value41|name=Option4,type=drop_down,required=1,price=42.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value42|name=Option5,type=drop_down,required=1,price=953.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value953|name=Option5,type=drop_down,required=1,price=954.000000,sku=,max_characters=0,file_extension=,image_size_x=0,image_size_y=0,price_type=fixed,option_title=Value954",,,,,,,,,,,

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/005_simple1_no_custom_options.csv

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+simple1,,Default,simple,"Default Category/cat1",base,simple1,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple1,simple1,simple1,"simple1 ",,,,,,,,,"5/20/21, 12:03 AM","5/20/21, 12:03 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,"gift_wrapping_available=Use config",1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,,,