MAGETWO-47017: [Github] Add Configurable Product To Cart from Category Page #2574 #5850 #5882 #6572 #5558

- CR changes

Author: Palamar, Mykola

app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php

@@ -154,9 +154,9 @@ public function testGetAddToCartPostParams()
         ];
 
         $this->typeInstanceMock->expects($this->once())
-            ->method('hasRequiredOptions')
+            ->method('isPossibleBuyFromList')
             ->with($this->equalTo($this->productMock))
-            ->will($this->returnValue(false));
+            ->will($this->returnValue(true));
         $this->cartHelperMock->expects($this->any())
             ->method('getAddUrl')
             ->with($this->equalTo($this->productMock), $this->equalTo([]))

app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml

@@ -7,15 +7,17 @@
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
 <div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
 <script>
-    require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer", "Magento_Swatches/js/catalog-add-to-cart"], function ($) {
-        $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
-            selectorProduct: '.product-item-details',
-            onlySwatches: true,
-            enableControlLabel: false,
-            numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
-            jsonConfig: <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>,
-            jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
-            mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
-        });
+    require(
+        ["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer", "Magento_Swatches/js/catalog-add-to-cart"],
+        function ($) {
+            $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
+                selectorProduct: '.product-item-details',
+                onlySwatches: true,
+                enableControlLabel: false,
+                numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
+                jsonConfig: <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>,
+                jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
+                mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
+            });
     });
 </script>

app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js

@@ -10,7 +10,8 @@ require([
     $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
         $(data.form).find('[name*="super"]').each(function (index, item) {
             var $item = $(item);
+
             data.redirectParameters.push($item.attr('data-attr-name') + '=' + $item.val());
         });
-    })
+    });
 });

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -639,12 +639,13 @@ define([
         /**
          * Get human readable attribute code (eg. size, color) by it ID from configuration
          *
-         * @param attributeId
+         * @param {Number} attributeId
          * @returns {*}
          * @private
          */
         _getAttributeCodeById: function (attributeId) {
             var attribute = this.options.jsonConfig.mappedAttributes[attributeId];
+
             return attribute ? attribute.code : attributeId;
         },
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php

@@ -118,7 +118,8 @@ public function persist(FixtureInterface $fixture = null)
      * @param array $data
      * @return array
      */
-    protected function changeStructureOfTheData(array $data) {
+    protected function changeStructureOfTheData(array $data)
+    {
         return $data;
     }
 }

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php

@@ -172,7 +172,7 @@ protected function prepareConfigurableMatrix(FixtureInterface $product)
                 $keyIds[] = $attribute['options'][$optionKey]['id'];
                 $configurableAttribute[] = sprintf(
                     '"%s":"%s"',
-                    isset($attribute['attribute_code']) ? $attribute['attribute_code'] : $attribute['frontend_label'] ,
+                    isset($attribute['attribute_code']) ? $attribute['attribute_code'] : $attribute['frontend_label'],
                     $attribute['options'][$optionKey]['id']
                 );
             }

dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php

@@ -27,7 +27,8 @@ class ProductItem extends CatalogProductItem
      * @param \Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct $product
      * @return void
      */
-    public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct $product) {
+    public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct $product)
+    {
         $checkoutData = $product->getCheckoutData();
         $options = $checkoutData['options']['configurable_options'];
         $confAttrData = $product->getDataFieldConfig('configurable_attributes_data');
@@ -52,7 +53,8 @@ public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableP
      *
      * @param $optionId
      */
-    private function clickOnSwatch($optionId) {
+    private function clickOnSwatch($optionId)
+    {
         $selector = sprintf($this->swatchSelector, $optionId);
         $this->_rootElement->find($selector, Locator::SELECTOR_CSS)->click();
     }

dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchConfigurableProductPage.php

@@ -17,22 +17,17 @@
 class AssertSwatchConfigurableProductPage extends AssertProductPage
 {
    /**
-     * Assert that configurable product with swatches displays correctly.
-     *
-     * @param BrowserInterface $browser
-     * @param CatalogProductView $catalogProductView
-     * @param FixtureInterface  $product
-     */
+    * {@inheritdoc}
+    */
     public function processAssert(
         BrowserInterface $browser,
         CatalogProductView $catalogProductView,
         FixtureInterface $product
-    )
-    {
+    ) {
         $this->product = $product;
         $this->productView = $catalogProductView->getProductViewWithSwatchesBlock();
         $this->objectManager->create(
-            \Magento\Swatches\Test\TestStep\AddProductToCartFromCatalogCategoryPageStep ::class,
+            \Magento\Swatches\Test\TestStep\AddProductToCartFromCatalogCategoryPageStep::class,
             [
                 'product' => $product
             ]

dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php

@@ -36,7 +36,8 @@ public function __construct(DataInterface $configuration, EventManagerInterface
      * @param array $data
      * @return array
      */
-    protected function changeStructureOfTheData(array $data) {
+    protected function changeStructureOfTheData(array $data)
+    {
         $data = parent::changeStructureOfTheData($data);
         $data['optiontext'] = $data['option'];
         $data['swatchtext'] = [

dev/tests/functional/tests/app/Magento/Swatches/Test/TestStep/AddProductToCartFromCatalogCategoryPageStep.php

@@ -46,7 +46,6 @@ class AddProductToCartFromCatalogCategoryPageStep implements TestStepInterface
      */
     private $cmsIndex;
 
-
     /**
      * @constructor
      * @param FixtureFactory $fixtureFactory
@@ -59,8 +58,7 @@ public function __construct(
         CmsIndex $cmsIndex,
         CatalogCategoryView $categoryView,
         InjectableFixture $product
-    )
-    {
+    ) {
         $this->fixtureFactory = $fixtureFactory;
         $this->cmsIndex = $cmsIndex;
         $this->categoryView = $categoryView;