Merge pull request #1233 from magento-tango/MAGETWO-69859

[Tango] Bugfixes delivery
magento · Jun 29, 2017 · 3eb0183 · 3eb0183
2 parents d902e08 + 72fb58e
commit 3eb0183
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -80,6 +80,9 @@ protected function isValidOptionPrice($priceType, $price, $storeId)
         if ($storeId > \Magento\Store\Model\Store::DEFAULT_STORE_ID && $priceType === null && $price === null) {
             return true;
         }
+        if (!$priceType && !$price) {
+            return true;
+        }
         if (!$this->isInRange($priceType, $this->priceTypes) || $this->isNegative($price)) {
             return false;
         }

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -54,40 +54,45 @@ protected function setUp()
     }
 
     /**
+     * @param bool $expectedResult
      * @param array $value
      * @dataProvider isValidSuccessDataProvider
      */
-    public function testIsValidSuccess($value)
+    public function testIsValidSuccess($expectedResult, array $value)
     {
-        $value = [
-            'price_type' => 'fixed',
-            'price' => '10',
-            'title' => 'Some Title',
-        ];
         $this->valueMock->expects($this->once())->method('getTitle')->will($this->returnValue('option_title'));
         $this->valueMock->expects($this->exactly(2))->method('getType')->will($this->returnValue('name 1.1'));
         $this->valueMock->expects($this->never())->method('getPriceType');
         $this->valueMock->expects($this->never())->method('getPrice');
         $this->valueMock->expects($this->any())->method('getData')->with('values')->will($this->returnValue([$value]));
-        $this->assertTrue($this->validator->isValid($this->valueMock));
-        $this->assertEmpty($this->validator->getMessages());
+        $this->assertEquals($expectedResult, $this->validator->isValid($this->valueMock));
     }
 
     public function isValidSuccessDataProvider()
     {
-        $value = [
-            'price_type' => 'fixed',
-            'price' => '10',
-            'title' => 'Some Title',
-        ];
-
-        $valueWithoutAllData = [
-            'some_data' => 'data',
-        ];
-
         return [
-            'all_data' => [$value],
-            'not_all_data' => [$valueWithoutAllData]
+            [
+                true,
+                [
+                    'price_type' => 'fixed',
+                    'price' => '10',
+                    'title' => 'Some Title',
+                ]
+            ],
+            [
+                true,
+                [
+                    'title' => 'Some Title',
+                ]
+            ],
+            [
+                false,
+                [
+                    'title' => 'Some Title',
+                    'price_type' => 'fixed',
+                    'price' => -10,
+                ]
+            ],
         ];
     }