Merge remote-tracking branch 'origin/MC-35058' into 2.4-develop-pr31

Author: serhii-balko

app/code/Magento/GoogleOptimizer/Observer/AbstractSave.php

@@ -5,12 +5,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\GoogleOptimizer\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
 /**
+ * Abstract entity for saving codes
+ *
  * @api
  * @since 100.0.2
  */
@@ -96,7 +100,9 @@ protected function _processCode()
         $this->_initRequestParams();
 
         if ($this->_isNewCode()) {
-            $this->_saveCode();
+            if (!$this->_isEmptyCode()) {
+                $this->_saveCode();
+            }
         } else {
             $this->_loadCode();
             if ($this->_isEmptyCode()) {
@@ -185,6 +191,8 @@ protected function _deleteCode()
     }
 
     /**
+     * Check data availability
+     *
      * @return bool
      */
     private function isDataAvailable()
@@ -194,6 +202,8 @@ private function isDataAvailable()
     }
 
     /**
+     * Get request data
+     *
      * @return mixed
      */
     private function getRequestData()

app/code/Magento/GoogleOptimizer/Test/Unit/Observer/Product/SaveGoogleExperimentScriptObserverTest.php

@@ -127,6 +127,39 @@ public function testCreatingCodeIfRequestIsValid()
         $this->_modelObserver->execute($this->_eventObserverMock);
     }
 
+    /**
+     * Test that code is not saving when request is empty
+     *
+     * @return void
+     */
+    public function testCreatingCodeIfRequestIsEmpty(): void
+    {
+        $this->_helperMock->expects(
+            $this->once()
+        )->method(
+            'isGoogleExperimentActive'
+        )->with(
+            $this->_storeId
+        )->willReturn(
+            true
+        );
+
+        $this->_requestMock->expects(
+            $this->exactly(3)
+        )->method(
+            'getParam'
+        )->with(
+            'google_experiment'
+        )->willReturn(
+            ['code_id' => '', 'experiment_script' => '']
+        );
+
+        $this->_codeMock->expects($this->never())->method('addData');
+        $this->_codeMock->expects($this->never())->method('save');
+
+        $this->_modelObserver->execute($this->_eventObserverMock);
+    }
+
     /**
      * @param array $params
      * @dataProvider dataProviderWrongRequestForCreating