Merge remote-tracking branch 'l3/MC-38575' into PR-01-21

Author: dhorytskyi

app/code/Magento/Catalog/Model/Product.php

@@ -877,15 +877,17 @@ public function getAttributes($groupId = null, $skipSuper = false)
      */
     public function beforeSave()
     {
-        $this->setTypeHasOptions(false);
-        $this->setTypeHasRequiredOptions(false);
-        $this->setHasOptions(false);
-        $this->setRequiredOptions(false);
+        if ($this->getData('has_options') === null) {
+            $this->setHasOptions(false);
+        }
+        if ($this->getData('required_options') === null) {
+            $this->setRequiredOptions(false);
+        }
 
         $this->getTypeInstance()->beforeSave($this);
 
-        $hasOptions = false;
-        $hasRequiredOptions = false;
+        $hasOptions = $this->getData('has_options') === "1";
+        $hasRequiredOptions = $this->getData('required_options') === "1";
 
         /**
          * $this->_canAffectOptions - set by type instance only

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1095,6 +1095,35 @@ public function testSaveAndDuplicate()
         $this->model->afterSave();
     }
 
+    /**
+     * Test for save method behavior with type options
+     */
+    public function testSaveWithoutTypeOptions()
+    {
+        $this->model->setCanSaveCustomOptions(false);
+        $this->model->setTypeHasOptions(true);
+        $this->model->setTypeHasRequiredOptions(true);
+        $this->configureSaveTest();
+        $this->model->beforeSave();
+        $this->model->afterSave();
+        $this->assertTrue($this->model->getTypeHasOptions());
+        $this->assertTrue($this->model->getTypeHasRequiredOptions());
+    }
+
+    /**
+     * Test for save method with provided options data
+     */
+    public function testSaveWithProvidedRequiredOptions()
+    {
+        $this->model->setData("has_options", "1");
+        $this->model->setData("required_options", "1");
+        $this->configureSaveTest();
+        $this->model->beforeSave();
+        $this->model->afterSave();
+        $this->assertTrue($this->model->getHasOptions());
+        $this->assertTrue($this->model->getRequiredOptions());
+    }
+
     public function testGetIsSalableSimple()
     {
         $typeInstanceMock =