MC-20668: Edit custom options of simple product

IvanPletnyov · IvanPletnyov · commit 29ea40d04cd4 · 2019-10-15T09:32:46.000+03:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractBase.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractBase.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 /**
  * Base custom options data provider.
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractSelect.php
@@ -5,9 +5,9 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Abstract data provider for options from select group.
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractText.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractText.php
@@ -5,9 +5,9 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Abstract data provider for options from text group.
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Area.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Area.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\AbstractText;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractText;
 
 /**
  * Data provider for custom options from text group with type "area".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Checkbox.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Checkbox.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
 
 /**
  * Data provider for custom options from select group with type "Checkbox".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Date.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Date.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Data provider for custom options from date group with type "date".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DateTime.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DateTime.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Data provider for custom options from date group with type "date & time".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DropDown.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DropDown.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
 
 /**
  * Data provider for custom options from select group with type "Drop-down".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Field.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Field.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\AbstractText;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractText;
 
 /**
  * Data provider for custom options from text group with type "field".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\File;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Data provider for options from file group with type "file".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/MultipleSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/MultipleSelect.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
 
 /**
  * Data provider for custom options from select group with type "Drop-down".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/RadioButtons.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/RadioButtons.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\AbstractSelect;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
 
 /**
  * Data provider for custom options from select group with type "Radio Buttons".
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Time.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Time.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option\Create\DataProvider\AbstractBase;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Data provider for custom options from date group with type "time".
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php
@@ -57,7 +57,7 @@ protected function setUp()
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\Field::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Field::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php
@@ -100,7 +100,7 @@ protected function tearDown()
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Text\Area::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Area::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
@@ -116,7 +116,7 @@ public function testUpdateAreaCustomOption(array $optionData, array $updateData)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\File\File::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\File::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
@@ -132,7 +132,7 @@ public function testUpdateFileCustomOption(array $optionData, array $updateData)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date\Date::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Date::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
@@ -148,7 +148,7 @@ public function testUpdateDateCustomOption(array $optionData, array $updateData)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date\DateTime::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DateTime::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
@@ -164,7 +164,7 @@ public function testUpdateDateTimeCustomOption(array $optionData, array $updateD
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Date\Time::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Time::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $updateData
@@ -180,7 +180,7 @@ public function testUpdateTimeCustomOption(array $optionData, array $updateData)
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\DropDown::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DropDown::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $optionValueData
@@ -207,7 +207,7 @@ public function testUpdateDropDownCustomOption(
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\RadioButtons::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\RadioButtons::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $optionValueData
@@ -234,7 +234,7 @@ public function testUpdateRadioButtonsCustomOption(
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\Checkbox::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Checkbox::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $optionValueData
@@ -261,7 +261,7 @@ public function testUpdateCheckboxCustomOption(
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      *
-     * @dataProvider \Magento\Catalog\Model\Product\Option\Create\DataProvider\Type\Select\MultipleSelect::getDataForUpdateOptions
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\MultipleSelect::getDataForUpdateOptions
      *
      * @param array $optionData
      * @param array $optionValueData
