MC-29332: Storefront: Custom options on configurable product page

IvanPletnyov · IvanPletnyov · commit a232197ac9a1 · 2020-01-29T11:24:45.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/Options/RenderOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/Options/RenderOptionsTest.php
@@ -19,7 +19,7 @@ class RenderOptionsTest extends AbstractRenderCustomOptionsTest
      * Check that options from text group(field, area) render as expected.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\TextGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\TextGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray
@@ -34,7 +34,7 @@ public function testRenderCustomOptionsFromTextGroup(array $optionData, array $c
      * Check that options from file group(file) render as expected.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\FileGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\FileGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray
@@ -49,7 +49,7 @@ public function testRenderCustomOptionsFromFileGroup(array $optionData, array $c
      * Check that options from select group(drop-down, radio buttons, checkbox, multiple select) render as expected.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\SelectGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\SelectGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $optionValueData
@@ -68,7 +68,7 @@ public function testRenderCustomOptionsFromSelectGroup(
      * Check that options from date group(date, date & time, time) render as expected.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php
-     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\DateGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\DateGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/CustomOptions/RenderOptionsTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/CustomOptions/RenderOptionsTest.php
@@ -21,7 +21,7 @@ class RenderOptionsTest extends AbstractRenderCustomOptionsTest
      * Check that options from text group(field, area) render on configurable product as expected.
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
-     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\TextGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\TextGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray
@@ -36,7 +36,7 @@ public function testRenderCustomOptionsFromTextGroup(array $optionData, array $c
      * Check that options from file group(file) render on configurable product as expected.
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
-     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\FileGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\FileGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray
@@ -52,7 +52,7 @@ public function testRenderCustomOptionsFromFileGroup(array $optionData, array $c
      * on configurable product as expected.
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
-     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\SelectGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\SelectGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $optionValueData
@@ -71,7 +71,7 @@ public function testRenderCustomOptionsFromSelectGroup(
      * Check that options from date group(date, date & time, time) render on configurable product as expected.
      *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
-     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\DateGroupDataProvider::getData()
+     * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\DateGroupDataProvider::getData
      *
      * @param array $optionData
      * @param array $checkArray

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class RenderOptionsTest extends AbstractRenderCustomOptionsTest`
`19`	`19`	`* Check that options from text group(field, area) render as expected.`
`20`	`20`	`*`
`21`	`21`	`* @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php`
`22`		`- * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\TextGroupDataProvider::getData()`
	`22`	`+ * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\TextGroupDataProvider::getData`
`23`	`23`	`*`
`24`	`24`	`* @param array $optionData`
`25`	`25`	`* @param array $checkArray`
`@@ -34,7 +34,7 @@ public function testRenderCustomOptionsFromTextGroup(array $optionData, array $c`
`34`	`34`	`* Check that options from file group(file) render as expected.`
`35`	`35`	`*`
`36`	`36`	`* @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php`
`37`		`- * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\FileGroupDataProvider::getData()`
	`37`	`+ * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\FileGroupDataProvider::getData`
`38`	`38`	`*`
`39`	`39`	`* @param array $optionData`
`40`	`40`	`* @param array $checkArray`
`@@ -49,7 +49,7 @@ public function testRenderCustomOptionsFromFileGroup(array $optionData, array $c`
`49`	`49`	`* Check that options from select group(drop-down, radio buttons, checkbox, multiple select) render as expected.`
`50`	`50`	`*`
`51`	`51`	`* @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php`
`52`		`- * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\SelectGroupDataProvider::getData()`
	`52`	`+ * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\SelectGroupDataProvider::getData`
`53`	`53`	`*`
`54`	`54`	`* @param array $optionData`
`55`	`55`	`* @param array $optionValueData`
`@@ -68,7 +68,7 @@ public function testRenderCustomOptionsFromSelectGroup(`
`68`	`68`	`* Check that options from date group(date, date & time, time) render as expected.`
`69`	`69`	`*`
`70`	`70`	`* @magentoDataFixture Magento/Catalog/_files/product_without_options_with_stock_data.php`
`71`		`- * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\DateGroupDataProvider::getData()`
	`71`	`+ * @dataProvider \Magento\TestFramework\Catalog\Block\Product\View\Options\DateGroupDataProvider::getData`
`72`	`72`	`*`
`73`	`73`	`* @param array $optionData`
`74`	`74`	`* @param array $checkArray`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class RenderOptionsTest extends AbstractRenderCustomOptionsTest`
`21`	`21`	`* Check that options from text group(field, area) render on configurable product as expected.`
`22`	`22`	`*`
`23`	`23`	`* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php`
`24`		`- * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\TextGroupDataProvider::getData()`
	`24`	`+ * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\TextGroupDataProvider::getData`
`25`	`25`	`*`
`26`	`26`	`* @param array $optionData`
`27`	`27`	`* @param array $checkArray`
`@@ -36,7 +36,7 @@ public function testRenderCustomOptionsFromTextGroup(array $optionData, array $c`
`36`	`36`	`* Check that options from file group(file) render on configurable product as expected.`
`37`	`37`	`*`
`38`	`38`	`* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php`
`39`		`- * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\FileGroupDataProvider::getData()`
	`39`	`+ * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\FileGroupDataProvider::getData`
`40`	`40`	`*`
`41`	`41`	`* @param array $optionData`
`42`	`42`	`* @param array $checkArray`
`@@ -52,7 +52,7 @@ public function testRenderCustomOptionsFromFileGroup(array $optionData, array $c`
`52`	`52`	`* on configurable product as expected.`
`53`	`53`	`*`
`54`	`54`	`* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php`
`55`		`- * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\SelectGroupDataProvider::getData()`
	`55`	`+ * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\SelectGroupDataProvider::getData`
`56`	`56`	`*`
`57`	`57`	`* @param array $optionData`
`58`	`58`	`* @param array $optionValueData`
`@@ -71,7 +71,7 @@ public function testRenderCustomOptionsFromSelectGroup(`
`71`	`71`	`* Check that options from date group(date, date & time, time) render on configurable product as expected.`
`72`	`72`	`*`
`73`	`73`	`* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php`
`74`		`- * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\DateGroupDataProvider::getData()`
	`74`	`+ * @dataProvider \Magento\TestFramework\ConfigurableProduct\Block\CustomOptions\DateGroupDataProvider::getData`
`75`	`75`	`*`
`76`	`76`	`* @param array $optionData`
`77`	`77`	`* @param array $checkArray`