MAGETWO-51008: Unable to process data upgrade when Google Analytics's "Content Experiments" enabled

Author: igrybkov

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

@@ -58,7 +58,7 @@ public function execute(Observer $observer)
     {
         $this->_initEntity($observer);
 
-        if ($this->_isGoogleExperimentActive()) {
+        if ($this->_isGoogleExperimentActive() && $this->isDataAvailable()) {
             $this->_processCode();
         }
 
@@ -112,11 +112,10 @@ protected function _processCode()
      */
     protected function _initRequestParams()
     {
-        $params = $this->_request->getParam('google_experiment');
-        if (!is_array($params) || !isset($params['experiment_script']) || !isset($params['code_id'])) {
+        if (!$this->isDataAvailable()) {
             throw new \InvalidArgumentException('Wrong request parameters');
         }
-        $this->_params = $params;
+        $this->_params = $this->getRequestData();
     }
 
     /**
@@ -181,4 +180,21 @@ protected function _deleteCode()
     {
         $this->_modelCode->delete();
     }
+
+    /**
+     * @return array
+     */
+    private function isDataAvailable()
+    {
+        $params = $this->getRequestData();
+        return is_array($params) && isset($params['experiment_script']) && isset($params['code_id']);
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getRequestData()
+    {
+        return $this->_request->getParam('google_experiment');
+    }
 }

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

@@ -85,7 +85,7 @@ public function testCreatingCodeIfRequestIsValid()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -113,8 +113,6 @@ public function testCreatingCodeIfRequestIsValid()
 
     /**
      * @param array $params
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Wrong request parameters
      * @dataProvider dataProviderWrongRequestForCreating
      */
     public function testCreatingCodeIfRequestIsNotValid($params)
@@ -174,7 +172,7 @@ public function testEditingCodeIfRequestIsValid()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -223,7 +221,7 @@ public function testEditingCodeIfCodeModelIsNotFound()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -254,7 +252,7 @@ public function testRemovingCode()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(

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

@@ -70,7 +70,7 @@ public function testCreatingCodeIfRequestIsValid()
         $this->_helperMock->expects($this->once())->method('isGoogleExperimentActive')->will($this->returnValue(true));
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -98,8 +98,6 @@ public function testCreatingCodeIfRequestIsValid()
 
     /**
      * @param array $params
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Wrong request parameters
      * @dataProvider dataProviderWrongRequestForCreating
      */
     public function testCreatingCodeIfRequestIsNotValid($params)
@@ -143,7 +141,7 @@ public function testEditingCodeIfRequestIsValid()
         $this->_helperMock->expects($this->once())->method('isGoogleExperimentActive')->will($this->returnValue(true));
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -184,7 +182,7 @@ public function testEditingCodeIfCodeModelIsNotFound()
         $this->_helperMock->expects($this->once())->method('isGoogleExperimentActive')->will($this->returnValue(true));
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -215,7 +213,7 @@ public function testRemovingCode()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(

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

@@ -85,7 +85,7 @@ public function testCreatingCodeIfRequestIsValid()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -113,8 +113,6 @@ public function testCreatingCodeIfRequestIsValid()
 
     /**
      * @param array $params
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Wrong request parameters
      * @dataProvider dataProviderWrongRequestForCreating
      */
     public function testCreatingCodeIfRequestIsNotValid($params)
@@ -174,7 +172,7 @@ public function testEditingCodeIfRequestIsValid()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -223,7 +221,7 @@ public function testEditingCodeIfCodeModelIsNotFound()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(
@@ -254,7 +252,7 @@ public function testRemovingCode()
         );
 
         $this->_requestMock->expects(
-            $this->once()
+            $this->exactly(3)
         )->method(
             'getParam'
         )->with(