Merge pull request #3 from magento-nord/MAGETWO-44704

MAGETWO-44704: Swatches attributes: empty value is missing, although "Values Required" = No

Author: Slabko,Michael(mslabko)

app/code/Magento/Sales/Model/Rss/OrderStatus.php

@@ -113,7 +113,11 @@ public function getRssData()
     public function getCacheKey()
     {
         $order = $this->getOrder();
-        return 'rss_order_status_data_' . md5($order->getId() . $order->getIncrementId() . $order->getCustomerId());
+        $key = '';
+        if ($order !== null) {
+            $key = md5($order->getId() . $order->getIncrementId() . $order->getCustomerId());
+        }
+        return 'rss_order_status_data_' . $key;
     }
 
     /**
@@ -150,7 +154,7 @@ protected function getOrder()
         $order = $this->orderFactory->create();
         $order->load($data['order_id']);
 
-        if ($order->getIncrementId() != $data['increment_id'] || $order->getCustomerId() != $data['customer_id']) {
+        if ($order->getIncrementId() !== $data['increment_id'] || $order->getCustomerId() !== $data['customer_id']) {
             $order = null;
         }
         $this->order = $order;

app/code/Magento/Sales/Test/Unit/Model/Rss/OrderStatusTest.php

@@ -132,12 +132,14 @@ protected function setUp()
             ]
         );
     }
-    public function testGetData()
+
+    public function testGetRssData()
     {
-        $this->orderFactory->expects($this->once())->method('create')->will($this->returnValue($this->order));
-        $this->requestInterface->expects($this->any())->method('getParam')
-            ->with('data')
-            ->will($this->returnValue('eyJvcmRlcl9pZCI6MSwiaW5jcmVtZW50X2lkIjoiMTAwMDAwMDAxIiwiY3VzdG9tZXJfaWQiOjF9'));
+        $this->orderFactory->expects($this->once())->method('create')->willReturn($this->order);
+        $requestData = base64_encode('{"order_id":1,"increment_id":"100000001","customer_id":1}');
+
+        $this->requestInterface->expects($this->any())->method('getParam')->with('data')->willReturn($requestData);
+
         $resource = $this->getMockBuilder('\Magento\Sales\Model\ResourceModel\Order\Rss\OrderStatus')
             ->setMethods(['getAllCommentCollection'])
             ->disableOriginalConstructor()
@@ -148,15 +150,34 @@ public function testGetData()
             'created_at' => '2014-10-09 18:25:50',
             'comment' => 'Some comment',
         ];
-        $resource->expects($this->once())->method('getAllCommentCollection')->will($this->returnValue([$comment]));
-        $this->orderStatusFactory->expects($this->once())->method('create')->will($this->returnValue($resource));
+        $resource->expects($this->once())->method('getAllCommentCollection')->willReturn([$comment]);
+        $this->orderStatusFactory->expects($this->once())->method('create')->willReturn($resource);
         $this->urlInterface->expects($this->any())->method('getUrl')
             ->with('sales/order/view', ['order_id' => 1])
             ->will($this->returnValue('http://magento.com/sales/order/view/order_id/1'));
 
         $this->assertEquals($this->feedData, $this->model->getRssData());
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Order not found.
+     */
+    public function testGetRssDataWithError()
+    {
+        $this->orderFactory->expects($this->once())->method('create')->willReturn($this->order);
+
+        $requestData = base64_encode('{"order_id":"1","increment_id":true,"customer_id":true}');
+
+        $this->requestInterface->expects($this->any())->method('getParam')->with('data')->willReturn($requestData);
+
+        $this->orderStatusFactory->expects($this->never())->method('create');
+
+        $this->urlInterface->expects($this->never())->method('getUrl');
+
+        $this->assertEquals($this->feedData, $this->model->getRssData());
+    }
+
     public function testIsAllowed()
     {
         $this->scopeConfigInterface->expects($this->once())->method('getValue')
@@ -165,13 +186,29 @@ public function testIsAllowed()
         $this->assertTrue($this->model->isAllowed());
     }
 
-    public function testGetCacheKey()
+    /**
+     * @param string $requestData
+     * @param string $result
+     * @dataProvider getCacheKeyDataProvider
+     */
+    public function testGetCacheKey($requestData, $result)
     {
         $this->requestInterface->expects($this->any())->method('getParam')
             ->with('data')
-            ->will($this->returnValue('eyJvcmRlcl9pZCI6MSwiaW5jcmVtZW50X2lkIjoiMTAwMDAwMDAxIiwiY3VzdG9tZXJfaWQiOjF9'));
+            ->will($this->returnValue($requestData));
         $this->orderFactory->expects($this->once())->method('create')->will($this->returnValue($this->order));
-        $this->assertEquals('rss_order_status_data_' . md5('11000000011'), $this->model->getCacheKey());
+        $this->assertEquals('rss_order_status_data_' . $result, $this->model->getCacheKey());
+    }
+
+    /**
+     * @return array
+     */
+    public function getCacheKeyDataProvider()
+    {
+        return [
+            [base64_encode('{"order_id":1,"increment_id":"100000001","customer_id":1}'), md5('11000000011')],
+            [base64_encode('{"order_id":"1","increment_id":true,"customer_id":true}'), '']
+        ];
     }
 
     public function testGetCacheLifetime()

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -265,7 +265,7 @@ require([
                 setRowVisibility('is_unique', false);
                 setRowVisibility('frontend_class', false);
             break;
-        <?php $hiddenFields = $block->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() ?>
+        <?php $hiddenFields = $this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() ?>
         <?php foreach ($hiddenFields as $type => $fields): ?>
         <?php if (in_array($type, array('swatch_visual', 'swatch_text'))) continue ?>
             case '<?php echo $block->escapeHtml($type); ?>':

app/code/Magento/Swatches/view/adminhtml/web/js/text.js

@@ -44,18 +44,8 @@ define([
                         data: data
                     });
 
-                    if (isNewOption) {
-                        visibleRadio = $$('#swatch-text-options-panel [name="defaulttext[]"]').findAll(function (el) {
-                            return el.up().up().visible();
-                        });
-
-                        if (visibleRadio.length === 1) {
-                            visibleRadio[0].checked = true;
-                        }
-
-                        if (!this.isReadOnly) {
-                            this.enableNewOptionDeleteButton(data.id);
-                        }
+                    if (isNewOption && !this.isReadOnly) {
+                        this.enableNewOptionDeleteButton(data.id);
                     }
                     this.itemCount++;
                     this.totalItems++;

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

@@ -46,20 +46,8 @@ define([
                         data: data
                     });
 
-                    if (isNewOption) {
-                        visibleRadio = $$('#swatch-visual-options-panel [name="defaultvisual[]"]').findAll(
-                            function (el) {
-                                return el.up().up().visible();
-                            }
-                        );
-
-                        if (visibleRadio.length === 1) {
-                            visibleRadio[0].checked = true;
-                        }
-
-                        if (!this.isReadOnly) {
-                            this.enableNewOptionDeleteButton(data.id);
-                        }
+                    if (isNewOption && !this.isReadOnly) {
+                        this.enableNewOptionDeleteButton(data.id);
                     }
                     this.itemCount++;
                     this.totalItems++;